From e8301185c0391eafa18a09932bfeb1bd76b4bb04 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 7 May 2013 12:21:42 -0400 Subject: [PATCH] a few minor changes required to get a DMG to build (on Tiger, at least) --- tools/osx_packaging/osx_build | 10 +++++++--- wscript | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index af582ff3bf..66f3f791e7 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -506,10 +506,14 @@ UC_DMG=$APPNAME-${release_version}-${revision}.dmg VOLNAME=$APPNAME-$release_version # TODO use mktemp -MNTPATH=`mktemp -d -t ardourimg` +export TMPDIR=`pwd` +MNTPATH=`mktemp -d -t /ardourimg` TMPDMG=`mktemp -t ardour` ICNSTMP=`mktemp -t ardouricon` -DMGSIZE=$[ `du -sm "$PRODUCT_PKG_DIR" | cut -f 1` * 1049 / 1000 + 3 ] +EXTRA_SPACE_MB=30 +DMGMEGABYTES=$[ `du -sk "$PRODUCT_PKG_DIR" | cut -f 1` * 1024 / 1048576 + $EXTRA_SPACE_MB ] + +echo "DMG MB = " $DMGMEGABYTES rm -f $UC_DMG "$TMPDMG" "${TMPDMG}.dmg" "$ICNSTMP" rm -rf "$MNTPATH" @@ -517,7 +521,7 @@ mkdir -p "$MNTPATH" TMPDMG="${TMPDMG}.dmg" -hdiutil create -megabytes $DMGSIZE "$TMPDMG" +hdiutil create -megabytes $DMGMEGABYTES "$TMPDMG" DiskDevice=$(hdid -nomount "$TMPDMG" | grep Apple_HFS | cut -f 1 -d ' ') newfs_hfs -v "${VOLNAME}" "${DiskDevice}" mount -t hfs "${DiskDevice}" "${MNTPATH}" diff --git a/wscript b/wscript index 99e4a9ccc4..302b8fe069 100644 --- a/wscript +++ b/wscript @@ -12,7 +12,7 @@ import sys # if sys.platform == 'darwin': - OSX_VERSION = '3.0beta6' + OSX_VERSION = '3.0' VERSION = '3.0beta6' else: LINUX_VERSION = '3.1'