From acb93fb6624bd025eb164e3c5fcf176fa05d5b3d Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sun, 25 Jul 2010 23:53:20 +0200 Subject: Switch Mac OS X overlay installer to a signed Apple .pkg installer. --- macx/overlay-installer/MumbleOverlayBad.pkg | Bin 0 -> 146329 bytes .../01mumbleoverlay-contents.xml | 1 + .../01mumbleoverlay.xml | 1 + .../02libmumbleoverlay-contents.xml | 1 + .../02libmumbleoverlay.xml | 1 + .../MumbleOverlayInstaller.pmdoc/index.xml | 1 + macx/scripts/osxdist.py | 31 +++++---------------- 7 files changed, 12 insertions(+), 24 deletions(-) create mode 100644 macx/overlay-installer/MumbleOverlayBad.pkg create mode 100644 macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay-contents.xml create mode 100644 macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml create mode 100644 macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay-contents.xml create mode 100644 macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay.xml create mode 100644 macx/overlay-installer/MumbleOverlayInstaller.pmdoc/index.xml (limited to 'macx') diff --git a/macx/overlay-installer/MumbleOverlayBad.pkg b/macx/overlay-installer/MumbleOverlayBad.pkg new file mode 100644 index 000000000..1f2b3c283 Binary files /dev/null and b/macx/overlay-installer/MumbleOverlayBad.pkg differ 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 @@ + \ 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 @@ +net.sourceforge.mumble.mumbleOverlay.MumbleOverlay.pkg1.0../../release/MumbleOverlay.osax/Library/ScriptingAdditionsinstallFrom.isRelativeTypeinstallFrom.pathparentinstallTo01mumbleoverlay-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ 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 @@ +groupmodeowner \ 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 @@ +net.sourceforge.mumble.mumbleOverlay.libmumbleoverlay.pkg1.0../../release/libmumbleoverlay.dylib/Library/ScriptingAdditions/MumbleOverlay.osax/Contents/MacOS/installTo.pathinstallFrom.isRelativeTypeinstallFrom.pathparentinstallTo02libmumbleoverlay-contents.xml/CVS$/\.svn$/\.cvsignore$/\.cvspass$/\.DS_Store$ \ 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 @@ +Mumble Overlay/Users/mkrautz/Desktop/Mumble Overlay.pkgMikkel Krautz (171685-Mndwndv9Qc20Tsmi)net.sourceforge.mumble../../icons/mumble.osx.installer.png01mumbleoverlay.xml02libmumbleoverlay.xmlproperties.titleproperties.anywhereDomainproperties.systemDomain \ 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) -- cgit v1.2.3