widelands-dev team mailing list archive

[Toni Förster <toni.foerster@xxxxxxxxx>]

Toni Förster has proposed merging lp:~widelands-dev/widelands/macos_build_app_SDK into lp:widelands.

Commit message:
Use MacOSX.sdk if an appropriate versioned SDK can't be found.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/macos_build_app_SDK/+merge/356225

Just noticed after upgrading to Xcode 10 that the installed SDK is newer than the current used macOS Version. This is a fallback, using whatever SDK is available.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/macos_build_app_SDK into lp:widelands.

=== modified file 'utils/macos/build_app.sh'
--- utils/macos/build_app.sh	2018-09-07 15:10:29 +0000
+++ utils/macos/build_app.sh	2018-10-06 20:04:42 +0000
@@ -69,6 +69,10 @@
    OSX_VERSION=$(sw_vers -productVersion | cut -d . -f 1,2)
    OSX_MIN_VERSION=$OSX_VERSION
    SDK_DIRECTORY="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk"
+   if [ ! -d "$SDK_DIRECTORY" ]; then
+      # If the SDK for the current macOS Version can't be found, use whatever is linked to MacOSX.sdk
+      SDK_DIRECTORY="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
+   fi
 fi
 
 REVISION=`bzr revno $SOURCE_DIR`