From d01772d0a83535bf45fa43786213a9a0fcb232bc Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Thu, 11 Feb 2016 13:34:46 -0800
Subject: [refactor] cleanup helper usage to adapt to new one

also cleanups build process
---
 pkg/osx/Makefile                    | 51 -------------------------------------
 pkg/osx/bitmask-wrapper             |  3 ---
 pkg/osx/install/tun.kext/Info.plist | 36 --------------------------
 pkg/osx/post-inst.sh                |  4 ++-
 4 files changed, 3 insertions(+), 91 deletions(-)
 delete mode 100644 pkg/osx/Makefile
 delete mode 100755 pkg/osx/bitmask-wrapper
 delete mode 100644 pkg/osx/install/tun.kext/Info.plist

(limited to 'pkg/osx')

diff --git a/pkg/osx/Makefile b/pkg/osx/Makefile
deleted file mode 100644
index 15dfb810..00000000
--- a/pkg/osx/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-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 :  check-env dist tuntap installer dmg
-
-dist :
-	~/pyinstaller/pyinstaller.py -w -s leap-client.spec
-	cp -r /opt/local/Library/Frameworks/QtGui.framework/Versions/4/Resources/qt_menu.nib "dist/LEAP Client.app/Contents/Resources"
-	cp Info.plist "dist/LEAP Client.app/Contents/Info.plist"
-	cp ../../data/images/leap-client.icns "dist/LEAP Client.app/Contents/Resources/icon-windowed.icns"
-
-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)
-	# build tuntaposx kernel extension
-	mkdir $(INSTR)/StartupItems
-	mkdir $(INSTR)/Extensions
-	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) 
-	cp install/client.down.sh $(INSTR)
-	cp install/ProcessNetworkChanges.plist.template $(INSTR) 
-	#Finally, copy application bundle...
-	cp -r "dist/LEAP Client.app" $(INSTR) 
-
-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/
diff --git a/pkg/osx/bitmask-wrapper b/pkg/osx/bitmask-wrapper
deleted file mode 100755
index 240fc186..00000000
--- a/pkg/osx/bitmask-wrapper
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-exec $DIR/bitmask-app --debug --danger
diff --git a/pkg/osx/install/tun.kext/Info.plist b/pkg/osx/install/tun.kext/Info.plist
deleted file mode 100644
index fb69ba85..00000000
--- a/pkg/osx/install/tun.kext/Info.plist
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>tun</string>
-	<key>CFBundleIdentifier</key>
-	<string>leap.tun</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>tun</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>20120120</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.unsupported</key>
-		<string>8.0</string>
-	</dict>
-</dict>
-</plist>
-
diff --git a/pkg/osx/post-inst.sh b/pkg/osx/post-inst.sh
index 2fc719f0..03dc4d2f 100755
--- a/pkg/osx/post-inst.sh
+++ b/pkg/osx/post-inst.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
-# Post-Instalation script
+# Bitmask Post-Instalation script
 
 cp se.leap.bitmask-helper.plist /Library/LaunchDaemons/
 launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist
+cp tuntap_20150118.pkg /tmp/ 
+open /tmp/tuntap_20150118.pkg
-- 
cgit v1.2.3