From abe441f6f0e48d0dd20d5e8f60dd7cbeba647102 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 21 Mar 2013 21:14:33 +0900
Subject: update pyinstaller install

---
 pkg/osx/Makefile         | 3 ++-
 pkg/osx/README.rst       | 9 ++++++++-
 pkg/osx/leap-client.spec | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'pkg')

diff --git a/pkg/osx/Makefile b/pkg/osx/Makefile
index 8e700cfa..15dfb810 100644
--- a/pkg/osx/Makefile
+++ b/pkg/osx/Makefile
@@ -4,7 +4,7 @@ DMG = "dist/leap-client-$(GITC).dmg"
 INST = "dist/LEAP Client installer.app"
 INSTR = "dist/LEAP Client installer.app/Contents/Resources"
 
-pkg :  check-env dist trim tuntap installer dmg
+pkg :  check-env dist tuntap installer dmg
 
 dist :
 	~/pyinstaller/pyinstaller.py -w -s leap-client.spec
@@ -14,6 +14,7 @@ dist :
 
 trim:
 	#XXX this should go properly in pyinstaller spec excludes, but going quick'n'dirty
+	#XXX adapt to PySide
 	rm $(OSX)QtSvg $(OSX)QtXml $(OSX)QtNetwork $(OSX)QtOpenGL $(OSX)Qt3Support $(OSX)QtSql
 
 tuntap:
diff --git a/pkg/osx/README.rst b/pkg/osx/README.rst
index af5f7668..03aac4f2 100644
--- a/pkg/osx/README.rst
+++ b/pkg/osx/README.rst
@@ -16,10 +16,17 @@ basically you need this to setup your environment:
 # port install py26-virtualenv
 # port install git-core
 # port install platypus
+# port install upx
 
 Requirements
 ============
-pyinstaller (in ~/pyinstaller)
+pyinstaller
+-----------
+Expected in ~/pyinstaller
+
+You need the development version.
+Tested with: 2.0.373
+
 platypus (tested with latest macports)
 
 ... + install environment as usual,
diff --git a/pkg/osx/leap-client.spec b/pkg/osx/leap-client.spec
index 75bf991b..91aa20d6 100644
--- a/pkg/osx/leap-client.spec
+++ b/pkg/osx/leap-client.spec
@@ -2,8 +2,8 @@
 a = Analysis(['../../src/leap/app.py'], 
              pathex=[
 		'../../src/leap',
-		'/Users/kaliy/leap/leap-client-testbuild/src/leap-client/pkg/osx'],
-             hiddenimports=['atexit'],
+		'/Users/kaliy/leap/leap_client/src/leap-client/pkg/osx'],
+             hiddenimports=['atexit', 'leap.common'],
              hookspath=None)
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
@@ -18,7 +18,7 @@ coll = COLLECT(exe,
                a.binaries +
 	       # this will easitly break if we setup the venv
 	       # somewhere else. FIXME
-	       [('cacert.pem', '../../../../lib/python2.6/site-packages/requests/cacert.pem', 'DATA'),
+	       [('cacert.pem', '/Users/kaliy/.Virtualenvs/leap-client/lib/python2.6/site-packages/requests-1.1.0-py2.6.egg/requests/cacert.pem', 'DATA'),
 		],
                a.zipfiles,
                a.datas,
-- 
cgit v1.2.3