diff options
| author | Kali Kaneko <kali@leap.se> | 2015-09-11 07:44:14 -0700 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-18 16:10:28 -0400 |
| commit | 748dea614050dca9d1baf8e6b36900109066b2bb (patch) | |
| tree | 0302776a74994174c9f0c1b14accab9c0740891b /pkg | |
| parent | 6843558ee9effe466b563fc5c3f380774a54d222 (diff) | |
[pkg] packaging hacks + update osx bundling notes
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/osx/README.rst | 48 | ||||
| -rwxr-xr-x | pkg/osx/bitmask-wrapper | 3 | ||||
| -rw-r--r-- | pkg/osx/bitmask.icns | bin | 239193 -> 47303 bytes | |||
| -rw-r--r-- | pkg/pyinst/bitmask.spec | 8 |
4 files changed, 16 insertions, 43 deletions
diff --git a/pkg/osx/README.rst b/pkg/osx/README.rst index 92799ebd..eaf04fa1 100644 --- a/pkg/osx/README.rst +++ b/pkg/osx/README.rst @@ -1,49 +1,19 @@ environment setup in osx ======================== -TODO:: REALLY old notes, adapting to newest flow. - -basically you need this to setup your environment: - -# check and consolidate - -# install xcode and homebrew - -# brew install python2.7 -# brew install python-virtualenwrapper -# brew install qt -# brew install git -# brew install platypus -# brew install upx - Requirements ============ + pyinstaller ----------- +You need at least version 3.0. -You need the development version. do `python setup.py develop` inside your -virtualenv. - -platypus (tested with latest macports) - -... + install environment as usual, - inside virtualenv. - -Building the package -==================== - -Building the binary -------------------- -We use the scripts in openvpn/build.zsh -The packaging Makefile is expecting the final binary in the location:: - - ../../openvpn/build/openvpn.leap - -Running the build ------------------ -IMPORTANT: activate the VIRTUALENV FIRST! -(you will get an import error otherwise) +pyside +---------- +use repo branch kalikaneko/PySide (has --standalone patch) -For running all steps at once:: +python2.7 setup.py bdist_wheel --version=1.2.2 --standalone - make pkg +Blockers +======== +#7321 - requests bug in merge_environment_settings diff --git a/pkg/osx/bitmask-wrapper b/pkg/osx/bitmask-wrapper new file mode 100755 index 00000000..240fc186 --- /dev/null +++ b/pkg/osx/bitmask-wrapper @@ -0,0 +1,3 @@ +#!/bin/sh +DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +exec $DIR/bitmask-app --debug --danger diff --git a/pkg/osx/bitmask.icns b/pkg/osx/bitmask.icns Binary files differindex 74fa0af6..7cc3e752 100644 --- a/pkg/osx/bitmask.icns +++ b/pkg/osx/bitmask.icns diff --git a/pkg/pyinst/bitmask.spec b/pkg/pyinst/bitmask.spec index cd207816..149093eb 100644 --- a/pkg/pyinst/bitmask.spec +++ b/pkg/pyinst/bitmask.spec @@ -33,8 +33,8 @@ exe = EXE(pyz, a.scripts, exclude_binaries=True, name='bitmask', - debug=False, - strip=False, + debug=True, + strip=None, upx=True, console=False, icon='../../data/images/mask-icon.ico') @@ -50,6 +50,6 @@ if sys.platform.startswith("darwin"): name=os.path.join( 'dist', 'Bitmask.app'), appname='Bitmask', - version='0.9.2alpha1', + version='0.9.0rc4', icon='pkg/osx/bitmask.icns', - bundle_identifier='bitmask-0.9.2alpha1') + bundle_identifier='bitmask-0.9.0rc4') |