From 72a26857e99e7f0ac2b58d2df9d5fae4fde31700 Mon Sep 17 00:00:00 2001 From: Itms Date: Thu, 15 Sep 2016 13:41:16 +0000 Subject: [PATCH] Use the current OS X version instead of a hardcoded value in the path to the OSX development tools, when building the OSX bundle. Patch by jurgemaister, plus some little fixes, fixes #3884. Tested on OSX 10.11. This was SVN commit r18726. --- .../mods/public/gui/credits/texts/programming.json | 1 + build/workspaces/build-osx-bundle.sh | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json index b99ec2871e..c2569b896a 100644 --- a/binaries/data/mods/public/gui/credits/texts/programming.json +++ b/binaries/data/mods/public/gui/credits/texts/programming.json @@ -102,6 +102,7 @@ {"nick": "jP_wanN", "name": "Jonas Platte"}, {"nick": "Jubalbarca", "name": "James Baillie"}, {"nick": "JubJub", "name": "Sebastian Vetter"}, + {"nick": "jurgemaister"}, {"nick": "kabzerek", "name": "Grzegorz Kabza"}, {"nick": "Kai", "name": "Kai Chen"}, {"name": "Kareem Ergawy"}, diff --git a/build/workspaces/build-osx-bundle.sh b/build/workspaces/build-osx-bundle.sh index 1b136ea51d..296c6c7f96 100755 --- a/build/workspaces/build-osx-bundle.sh +++ b/build/workspaces/build-osx-bundle.sh @@ -22,12 +22,13 @@ # Choices are "x86_64" or "i386" (ppc and ppc64 not supported) export ARCH=${ARCH:="x86_64"} +OSX_VERSION=`sw_vers -productVersion | grep -Eo "^\d+.\d+"` # Set SDK and mimimum required OS X version -export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"} +export SYSROOT=${SYSROOT:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"} export MIN_OSX_VERSION=${MIN_OSX_VERSION:="10.7"} -# 0 A.D. release version, e.g. Alpha 18 is 0.0.18 -BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.18"} +# 0 A.D. release version, e.g. Alpha 21 is 0.0.21 +BUNDLE_VERSION=${BUNDLE_VERSION:="0.0.X"} # Define compiler as "clang", this is all Mavericks supports. # gcc symlinks may still exist, but they are simply clang with @@ -50,7 +51,7 @@ die() if [ "`uname -s`" != "Darwin" ]; then die "This script is intended for OS X only" fi - + # Check SDK exists if [ ! -d "$SYSROOT" ]; then die "$SYSROOT does not exist! You probably need to install Xcode" @@ -103,7 +104,7 @@ BUNDLE_SHAREDSUPPORT=$BUNDLE_CONTENTS/SharedSupport # TODO: Do we really want to regenerate everything? (consider if one task fails) # Build libraries against SDK -echo "\nBuilding libaries\n" +echo "\nBuilding libraries\n" pushd ../../libraries/osx > /dev/null ./build-osx-libs.sh $JOBS --force-rebuild >> $build_log 2>&1 || die "Libraries build script failed" popd > /dev/null