diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-24 01:27:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-24 01:27:46 +0200 |
| commit | d07c4241b58fc654cf0331d09d0814b4d6a24743 (patch) | |
| tree | d52f867d773a7fc0eae1f720e35925b4d3cb96e7 | |
| parent | 59acc57304a545d0cad49ad204d32d3f84dbbfa2 (diff) | |
Remove disk-build optional stuff from macOS build.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 20 |
2 files changed, 5 insertions, 17 deletions
@@ -678,7 +678,7 @@ def package(target, version, options): target.command('bash platform/osx/make_dmg.sh %s %s universal no %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] elif target.platform == 'osx' and target.bits == 64: - target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s %s' % (target.environment_prefix, target.directory, "yes" if options['disk'] else "no", target.apple_id, target.apple_password)) + target.command('bash platform/osx/make_dmg.sh %s %s thin %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password)) return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')] elif target.platform == 'docker': shutil.copyfile(target.deb, 'build/platform/docker') diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 7b8ff8507..5e44fc56d 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -1,10 +1,9 @@ #!/bin/bash # -SYNTAX="make_dmg.sh <environment> <builddir> <type> <disk> <apple-id> <apple-password>" +SYNTAX="make_dmg.sh <environment> <builddir> <type> <apple-id> <apple-password>" # where <type> is universal or thin -# <disk> is yes or no # -# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal yes foo@bar.net opensesame +# e.g. make_dmg.sh /Users/carl/osx-environment /Users/carl/cdist universal foo@bar.net opensesame # Don't set -e here as egrep (used a few times) returns 1 if no matches # were found. @@ -16,9 +15,8 @@ DMG_SIZE=256 ENV=$1 ROOT=$2 TYPE=$3 -DISK=$4 -APPLE_ID=$5 -APPLE_PASSWORD=$6 +APPLE_ID=$4 +APPLE_PASSWORD=$5 if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then echo $SYNTAX @@ -26,12 +24,6 @@ if [ "$TYPE" != "universal" -a "$TYPE" != "thin" ]; then exit 1 fi -if [ "$DISK" != "yes" -a "$DISK" != "no" ]; then - echo $SYNTAX - echo "where <disk> is yes or no" - exit 1 -fi - # This is our work area for making up the .dmgs mkdir -p build/platform/osx cd build/platform/osx @@ -511,8 +503,6 @@ rl=("$approot/MacOS/dcpomatic2_playlist" "$approot/Frameworks/"*.dylib) relink_relative "${rl[@]}" make_dmg "$appdir" "" "DCP-o-matic Playlist Editor" com.dcpomatic.playlist -if [ "$DISK" == "yes" ]; then - # DCP-o-matic Disk Writer .app setup "DCP-o-matic 2 Disk Writer.app" copy $ROOT src/dcpomatic/build/src/tools/dcpomatic2_disk "$approot/MacOS" @@ -588,5 +578,3 @@ pkgbuild --root $pkgroot --identifier com.dcpomatic.disk.writer --scripts $pkgba make_dmg "$appdir" "DCP-o-matic Disk Writer.pkg" "DCP-o-matic Disk Writer" com.dcpomatic.disk -fi - |