Skip to content
Permalink
Browse files

macx/scripts: fix osxdist.py and build-installer-overlay to work in a…

… source tree path with spaces in it.
  • Loading branch information...
mkrautz committed Jul 20, 2014
1 parent e740ea5 commit 840a31de0e217f7908d3872b7cd76568ad28ccb1
Showing with 14 additions and 5 deletions.
  1. +2 −2 macx/scripts/build-overlay-installer
  2. +12 −3 macx/scripts/osxdist.py
@@ -39,8 +39,8 @@ root=$(mktemp -d -t mumble-overlay-installer)
/usr/bin/xar -f release/synth.pkg -x -C ${root} /usr/bin/xar -f release/synth.pkg -x -C ${root}
mkdir -p ${root}/Resources mkdir -p ${root}/Resources
cp icons/mumble.osx.installer.png ${root}/Resources/bg.png cp icons/mumble.osx.installer.png ${root}/Resources/bg.png
VERSION=`defaults read $(pwd)/macx/osax/osax MumbleOverlayVersion` VERSION=`defaults read "${PWD}/macx/osax/osax" "MumbleOverlayVersion"`
MINCLIENT=`defaults read $(pwd)/macx/osax/osax MumbleOverlayMinMumbleVersion` MINCLIENT=`defaults read "${PWD}/macx/osax/osax" "MumbleOverlayMinMumbleVersion"`
echo "<upgrade version=\"${VERSION}\" minclient=\"${MINCLIENT}\" />" > ${root}/upgrade.xml echo "<upgrade version=\"${VERSION}\" minclient=\"${MINCLIENT}\" />" > ${root}/upgrade.xml


sed -i '' -e 's,<installer-gui-script minSpecVersion="1">,<installer-gui-script minSpecVersion="1"><title>Mumble Overlay</title><background mime-type="image/png" file="bg.png" />,' ${root}/Distribution sed -i '' -e 's,<installer-gui-script minSpecVersion="1">,<installer-gui-script minSpecVersion="1"><title>Mumble Overlay</title><background mime-type="image/png" file="bg.png" />,' ${root}/Distribution
@@ -81,7 +81,10 @@ def create_overlay_package():
if options.developer_id: if options.developer_id:
codesign(bundle) codesign(bundle)
codesign(overlaylib) codesign(overlaylib)
os.system('./macx/scripts/build-overlay-installer') p = Popen(('./macx/scripts/build-overlay-installer',))
retval = p.wait()
if retval != 0:
raise Exception('build-overlay-installer failed')
if options.developer_id: if options.developer_id:
os.rename('release/MumbleOverlay.pkg', 'release/MumbleOverlayUnsigned.pkg') os.rename('release/MumbleOverlay.pkg', 'release/MumbleOverlayUnsigned.pkg')
prodsign('release/MumbleOverlayUnsigned.pkg', 'release/MumbleOverlay.pkg') prodsign('release/MumbleOverlayUnsigned.pkg', 'release/MumbleOverlay.pkg')
@@ -156,7 +159,10 @@ def add_compat_warning(self):
The compat binary displays a warning dialog telling the user that they need to download a universal version of Mumble The compat binary displays a warning dialog telling the user that they need to download a universal version of Mumble
''' '''
print ' * Splicing Mumble.compat into main bundle executable' print ' * Splicing Mumble.compat into main bundle executable'
os.system('lipo -create release/Mumble.compat -arch x86_64 %s -output %s' % (self.binary, self.binary)) p = Popen(('lipo', '-create', 'release/Mumble.compat', '-arch', 'x86_64', self.binary, '-output', self.binary))
retval = p.wait()
if retval != 0:
raise Exception('build-overlay-installer failed')


def set_min_macosx_version(self, version): def set_min_macosx_version(self, version):
''' '''
@@ -325,7 +331,10 @@ def package_server():
name = 'Murmur-OSX-Static-%s' % ver name = 'Murmur-OSX-Static-%s' % ver


# Fix .ini files # Fix .ini files
os.system('cd scripts && sh mkini.sh') p = Popen(('bash', 'mkini.sh'), cwd='scripts')
retval = p.wait()
if retval != 0:
raise Exception('build-overlay-installer failed')


destdir = os.path.join('release', name) destdir = os.path.join('release', name)
if os.path.exists(destdir): if os.path.exists(destdir):

0 comments on commit 840a31d

Please sign in to comment.
You can’t perform that action at this time.