diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-06-28 14:25:19 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-06-28 14:25:19 -0300 |
| commit | 5b975799ce9b7a6e0a88be4bcb48bdfb90800bb3 (patch) | |
| tree | bda674a79b1aeccb37b67609517bc4761db7ae07 /pkg/osx/Makefile | |
| parent | 9cea9c8a34343f8792d65b96f93ae22bd8685878 (diff) | |
| parent | c088a1544a5f7a51359d2802019c0740aab0cc5b (diff) | |
Merge branch 'release-0.2.2'0.2.2
Diffstat (limited to 'pkg/osx/Makefile')
| -rw-r--r-- | pkg/osx/Makefile | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/pkg/osx/Makefile b/pkg/osx/Makefile index f2520fcf..15dfb810 100644 --- a/pkg/osx/Makefile +++ b/pkg/osx/Makefile @@ -1,12 +1,10 @@ -#WARNING: You need to run this with an activated VIRTUALENV. - OSX = dist/LEAP\ Client.app/Contents/MacOS/ GITC = `git rev-parse --short HEAD` DMG = "dist/leap-client-$(GITC).dmg" INST = "dist/LEAP Client installer.app" INSTR = "dist/LEAP Client installer.app/Contents/Resources" -pkg : dist trim installer dmg +pkg : check-env dist tuntap installer dmg dist : ~/pyinstaller/pyinstaller.py -w -s leap-client.spec @@ -16,20 +14,22 @@ 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: + ./build_tuntaposx clean && ./build_tuntaposx + installer: #XXX need to fix some paths there (binary, etc) platypus -P install/leap-installer.platypus -y $(INST) - #XXX should build tuntap extensions ourselves + # build tuntaposx kernel extension mkdir $(INSTR)/StartupItems mkdir $(INSTR)/Extensions - cp -r /opt/local/Library/StartupItems/tun $(INSTR)/StartupItems - cp -r /opt/local/Library/StartupItems/tap $(INSTR)/StartupItems - cp -r /opt/local/Library/Extensions/tun.kext $(INSTR)/Extensions - cp -r /opt/local/Library/Extensions/tap.kext $(INSTR)/Extensions - #copy the binary that we have previously built - #XXX not building it yet... + cp -r dist/tun.kext $(INSTR)/Extensions + cp -r dist/tuntaposx/StartupItems/* $(INSTR)/StartupItems + cp install/tun.kext/Info.plist $(INSTR)/Extensions/tun.kext/Contents/ + #copy the binary that we have previously built (not yet) cp ../../openvpn/build/openvpn.leap $(INSTR) #copy startup scripts cp install/client.up.sh $(INSTR) @@ -42,5 +42,10 @@ dmg : rm -f $(DMG) hdiutil create -format UDBZ -srcfolder $(INST) $(DMG) +check-env: +ifndef VIRTUAL_ENV + $(error WHAT DO YOU THINK VIRTUALENV IS FOR??!! Please go get into one..) +endif + clean : rm -rf dist/ build/ |