[pkg] packaging hacks + update osx bundling notes

8 files changed, 28 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index 7d26a7ae..7bf5d273 100644
--- a/Makefile
+++ b/Makefile
@@ -150,5 +150,13 @@ include pkg/sumo-tarballs.mk
 include pkg/pyinst/pyinst-build.mk
 include pkg/branding/branding.mk
 
+pyinst_osx: pyinst
+	mv dist/Bitmask.app/Contents/MacOS/bitmask dist/Bitmask.app/Contents/MacOS/bitmask-app
+	cp pkg/osx/bitmask-wrapper dist/Bitmask.app/Contents/MacOS/bitmask
+	# XXX hack... this contains the gpg binary (brew), but we need to build it from sources.
+	cp -r src/leap/bitmask/util/apps dist/Bitmask.app/Contents/MacOS/
+	# XXX this should be taken care of by pyinstaller data collector
+	cp $(VIRTUAL_ENV)/lib/python2.7/site-packages/leap/common/cacert.pem dist/Bitmask.app/Contents/MacOS/
+
 clean :
 	$(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc)
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
index 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')
diff --git a/src/leap/bitmask/_components.py b/src/leap/bitmask/_components.py
index 9be0e6bc..9d6f3f59 100644
--- a/src/leap/bitmask/_components.py
+++ b/src/leap/bitmask/_components.py
@@ -2,5 +2,5 @@
 Enabled Modules in Bitmask.
 Change these values for builds of the client with only one module enabled.
 """
-HAS_EIP = True
+HAS_EIP = False
 HAS_MAIL = True
diff --git a/src/leap/bitmask/_version.py b/src/leap/bitmask/_version.py
index f032a17a..d64032a7 100644
--- a/src/leap/bitmask/_version.py
+++ b/src/leap/bitmask/_version.py
@@ -1,4 +1,3 @@
-
 # This file helps to compute a version number in source trees obtained from
 # git-archive tarball (such as those provided by githubs download-from-tag
 # feature). Distribution tarballs (built by setup.py sdist) and build
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index 193bd80a..e8d48e4a 100644
--- a/src/leap/bitmask/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -368,6 +368,9 @@ def DarwinInitializer():
     Raise a dialog in case that the osx tuntap driver has not been found
     in the registry, asking the user for permission to install the driver
     """
+    logger.debug("Skipping darwin initialization, only-mail build")
+    return True
+
     # XXX split this function into several
 
     TUNTAP_NOTFOUND_MSG = NOTFOUND_MSG % (