diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2010-07-28 01:15:14 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2010-07-28 01:15:14 +0400 |
| commit | 8f63e4d79e0f6d069a9bc2929d9cf303340db810 (patch) | |
| tree | a8ecdafbeca75769a0ca9405c9b3bdb1d39616b4 /macx | |
| parent | b8f14d8b9b25c719ca2cd8db0ad33cb62d4848bf (diff) | |
Check overlay installer for version info instead of the Mumble app bundle.
Diffstat (limited to 'macx')
6 files changed, 10 insertions, 6 deletions
diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist index bc7a98bf1..e99fe3f89 100644 --- a/macx/osax/osax.plist +++ b/macx/osax/osax.plist @@ -35,7 +35,7 @@ </dict> </dict> </dict> - <key>MumbleOverlayLoaderVersion</key> - <integer>6</integer> + <key>MumbleOverlayVersion</key> + <integer>7</integer> </dict> </plist> diff --git a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml index 0aa0fb4bf..739d5af4b 100644 --- a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml +++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/01mumbleoverlay.xml @@ -1 +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 +<pkgref spec="1.12" uuid="187F30C8-1B57-48BA-B32C-6C61164FB836"><config><identifier>net.sourceforge.mumble.mumbleOverlay.MumbleOverlay.pkg</identifier><version>7</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><mod>version</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 index 9968595da..9b446a9aa 100644 --- a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay-contents.xml +++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay-contents.xml @@ -1 +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 +<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>mode</mod><mod>group</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 index a6fc65694..6e9e517e4 100644 --- a/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay.xml +++ b/macx/overlay-installer/MumbleOverlayInstaller.pmdoc/02libmumbleoverlay.xml @@ -1 +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 +<pkgref spec="1.12" uuid="B9BE0474-4A90-4AEE-9870-F70003B4A5C8"><config><identifier>net.sourceforge.mumble.mumbleOverlay.libmumbleoverlay.pkg</identifier><version>7</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><mod>version</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/PackageInfo b/macx/overlay-installer/PackageInfo new file mode 100644 index 000000000..67436fd28 --- /dev/null +++ b/macx/overlay-installer/PackageInfo @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pkg-info> + <mumble minclient="1.2.3"/> +</pkg-info> diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py index eaf6907b0..d72efebd2 100755 --- a/macx/scripts/osxdist.py +++ b/macx/scripts/osxdist.py @@ -35,7 +35,7 @@ def create_overlay_package(sign=None): if sign: codesign(sign, bundle) codesign(sign, overlaylib) - os.system('/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker --doc macx/overlay-installer/MumbleOverlayInstaller.pmdoc --out release/MumbleOverlay.pkg') + os.system('/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker --doc macx/overlay-installer/MumbleOverlayInstaller.pmdoc --info macx/overlay-installer/PackageInfo --out release/MumbleOverlay.pkg') class AppBundle(object): |