Switch Mac OS X overlay installer to a signed Apple .pkg installer.

7 files changed, 12 insertions, 24 deletions

diff --git a/macx/overlay-installer/MumbleOverlayBad.pkg b/macx/overlay-installer/MumbleOverlayBad.pkg
new file mode 100644
index 000000000..1f2b3c283
--- /dev/null
+++ b/macx/overlay-installer/MumbleOverlayBad.pkg
diff --git a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay-contents.xml b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay-contents.xml
new file mode 100644
index 000000000..ef9bcfb9c
--- /dev/null
+++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay-contents.xml
@@ -0,0 +1 @@
+<pkg-contents spec="1.12"><f n="MumbleOverlay.osax" o="root" g="admin" p="16893" pt="/Users/mkrautz/build-x86-64/mumble/release/MumbleOverlay.osax" m="true" t="file"><f n="Contents" o="root" g="admin" p="16893"><f n="_CodeSignature" o="root" g="admin" p="16893"><f n="CodeResources" o="root" g="admin" p="33204"/></f><f n="CodeResources" o="root" g="admin" p="33204"/><f n="Info.plist" o="root" g="admin" p="33204"/><f n="MacOS" o="root" g="admin" p="16893"><f n="MumbleOverlay" o="root" g="admin" p="33277"/></f><f n="Resources" o="root" g="admin" p="16893"><f n="MumbleOverlay.sdef" o="root" g="admin" p="33204"/></f></f></f></pkg-contents>
\ No newline at end of file
diff --git a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml
new file mode 100644
index 000000000..0aa0fb4bf
--- /dev/null
+++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml
@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="187F30C8-1B57-48BA-B32C-6C61164FB836"><config><identifier>net.sourceforge.mumble.mumbleOverlay.MumbleOverlay.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">../../release/MumbleOverlay.osax</installFrom><installTo>/Library/ScriptingAdditions</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installFrom.isRelativeType</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod></config><contents><file-list>01mumbleoverlay-contents.xml</file-list><component id="net.sourceforge.mumble.OverlayScriptingAddition" path="/Users/mkrautz/build-x86-64/mumble/release/MumbleOverlay.osax"/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay-contents.xml b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay-contents.xml
new file mode 100644
index 000000000..9968595da
--- /dev/null
+++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay-contents.xml
@@ -0,0 +1 @@
+<pkg-contents spec="1.12"><f n="libmumbleoverlay.dylib" o="root" g="admin" p="33277" pt="/Users/mkrautz/build-x86-64/mumble/release/libmumbleoverlay.dylib" m="true" t="file"><mod>group</mod><mod>mode</mod><mod>owner</mod></f></pkg-contents>
\ No newline at end of file
diff --git a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay.xml b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay.xml
new file mode 100644
index 000000000..a6fc65694
--- /dev/null
+++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay.xml
@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="B9BE0474-4A90-4AEE-9870-F70003B4A5C8"><config><identifier>net.sourceforge.mumble.mumbleOverlay.libmumbleoverlay.pkg</identifier><version>1.0</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../release/libmumbleoverlay.dylib</installFrom><installTo mod="true">/Library/ScriptingAdditions/MumbleOverlay.osax/Contents/MacOS/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installFrom.isRelativeType</mod><mod>installFrom.path</mod><mod>parent</mod><mod>installTo</mod></config><contents><file-list>02libmumbleoverlay-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
diff --git a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/index.xml b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/index.xml
new file mode 100644
index 000000000..8ac074c46
--- /dev/null
+++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/index.xml
@@ -0,0 +1 @@
+<pkmkdoc spec="1.12"><properties><title>Mumble Overlay</title><build>/Users/mkrautz/Desktop/Mumble Overlay.pkg</build><certificate>Mikkel Krautz (171685-Mndwndv9Qc20Tsmi)</certificate><organization>net.sourceforge.mumble</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="MumbleOverlayScriptingAddition" id="net.sourceforge.MumbleOverlayInstaller.MumbleOverlayScriptingAddition" starts_selected="true" starts_enabled="true" starts_hidden="true"><pkgref id="net.sourceforge.mumble.mumbleOverlay.MumbleOverlay.pkg"/></choice><choice title="MumbleOverlayLibrary" id="net.sourceforge.MumbleOverlayInstaller.MumbleOverlayLibrary" starts_selected="true" starts_enabled="true" starts_hidden="true"><pkgref id="net.sourceforge.mumble.mumbleOverlay.libmumbleoverlay.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="background">../../icons/mumble.osx.installer.png</resource></locale></resources><flags/><item type="file">01mumbleoverlay.xml</item><item type="file">02libmumbleoverlay.xml</item><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file
diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py
index d2ed2706f..eaf6907b0 100755
--- a/macx/scripts/osxdist.py
+++ b/macx/scripts/osxdist.py
@@ -27,32 +27,15 @@ def codesign(id, path):
 			return retval
 	return 0
 
-def create_overlay_tarball(sign=None):
-	print '* Creating overlay loader installation tarball'
+def create_overlay_package(sign=None):
+	print '* Creating overlay installer'
 
 	bundle = os.path.join('release', 'MumbleOverlay.osax')
-	overlaylib = os.path.join(bundle, 'Contents', 'MacOS', 'libmumbleoverlay.dylib')
-	shutil.copy('release/libmumbleoverlay.dylib', overlaylib)
+	overlaylib = os.path.join('release', 'libmumbleoverlay.dylib')
 	if sign:
 		codesign(sign, bundle)
 		codesign(sign, overlaylib)
-	contents = []
-	for e in os.walk(bundle):
-		root, dirs, files = e
-		contents.extend([root]+[os.path.join(root, f) for f in files])
-
-	tar = tarfile.open(os.path.join('release', 'MumbleOverlay.tar.bz2'), 'w:bz2')
-	for c in contents:
-		info = tar.gettarinfo(c)
-		info.name = c[len('release/'):]
-		info.uname = 'root'
-		info.gname = 'admin'
-		f = None
-		if info.isfile():
-			f = open(c)
-		tar.addfile(info, f)
-	tar.close()
-
+	os.system('/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker --doc macx/overlay-installer/MumbleOverlayInstaller.pmdoc --out release/MumbleOverlay.pkg')
 
 class AppBundle(object):
 
@@ -254,7 +237,7 @@ class AppBundle(object):
 				shutil.copy(rsrc, os.path.join(rsrcpath, b))
 
 		# Extras
-		shutil.copy('release/MumbleOverlay.tar.bz2', os.path.join(rsrcpath, 'MumbleOverlay.tar.bz2'))
+		shutil.copy('release/MumbleOverlay.pkg', os.path.join(rsrcpath, 'MumbleOverlay.pkg'))
 
 	def copy_codecs(self):
 		'''
@@ -473,8 +456,8 @@ if __name__ == '__main__':
 	# Fix .ini files
 	os.system('cd scripts && sh mkini.sh')
 
-	# Fix overlay 'installer' tarball
-	create_overlay_tarball(options.codesign)
+	# Fix overlay installer package
+	create_overlay_package(options.codesign)
 
 	# Do the finishing touches to our Application bundle before release
 	a = AppBundle('release/Mumble.app', ver)