From 748dea614050dca9d1baf8e6b36900109066b2bb Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Fri, 11 Sep 2015 07:44:14 -0700
Subject: [pkg] packaging hacks + update osx bundling notes

---
 pkg/osx/README.rst      |  48 +++++++++---------------------------------------
 pkg/osx/bitmask-wrapper |   3 +++
 pkg/osx/bitmask.icns    | Bin 239193 -> 47303 bytes
 pkg/pyinst/bitmask.spec |   8 ++++----
 4 files changed, 16 insertions(+), 43 deletions(-)
 create mode 100755 pkg/osx/bitmask-wrapper

(limited to 'pkg')

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
Binary files a/pkg/osx/bitmask.icns and b/pkg/osx/bitmask.icns differ
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')
-- 
cgit v1.2.3