Merge lp:~widelands-dev/widelands/bug-1817607-macos-build into lp:widelands

[Toni Förster]

- macOS: set build target to 10.9 if macOS 10.9 or newer is found.
- macOS: append macOS target version to dmg filename.

[GunChleoc (gunchleoc)]

1 general nitpick. I don't know anything about MacOS - has this been tested with both older and newer Macs?

[Toni Förster (stonerl)]

I can only test this with a newer Mac. SirVer needs to test this on his old one, though. For the nit see inline.

[GunChleoc (gunchleoc)]

OK, I overlooked that. Code is good to go.

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4571. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/503973556.
Appveyor build 4358. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1817607_macos_build-4358.

[SirVer (sirver)]

Still works on my old Mac to build the nightlies. I did not yet achieve to build a newer version on my new mac, but I believe this to be an issue with my build environment. This is good to go, imho.

review: Approve

[GunChleoc (gunchleoc)]

Thanks for testing!

@bunnybot merge

=== modified file 'utils/macos/build_app.sh'
--- utils/macos/build_app.sh	2018-12-13 21:27:09 +0000
+++ utils/macos/build_app.sh	2019-03-09 10:20:12 +0000
@@ -62,9 +62,14 @@
 # If not, use the one for the installed macOS Version
 OSX_MIN_VERSION="10.7"
 SDK_DIRECTORY="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_MIN_VERSION.sdk"
+
+OSX_VERSION=$(sw_vers -productVersion | cut -d . -f 1,2)
+OSX_MINOR=$(sw_vers -productVersion | cut -d . -f 2)
+
 if [ ! -d "$SDK_DIRECTORY" ]; then
-   OSX_VERSION=$(sw_vers -productVersion | cut -d . -f 1,2)
-   OSX_MIN_VERSION=$OSX_VERSION
+   if [ "$OSX_MINOR" -ge 9 ]; then
+      OSX_MIN_VERSION="10.9"
+   fi
    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
@@ -86,7 +91,8 @@
 echo "   Version:     $WLVERSION"
 echo "   Destination: $DESTINATION"
 echo "   Type:        $TYPE"
-echo "   macOS:       $OSX_MIN_VERSION"
+echo "   macOS:       $OSX_VERSION"
+echo "   Target:      $OSX_MIN_VERSION"
 echo "   Compiler:    $COMPILER"
 echo ""
 
@@ -102,9 +108,9 @@
 
    echo "Creating DMG ..."
    if [ "$TYPE" == "Release" ]; then
-      hdiutil create -fs HFS+ -volname "Widelands $WLVERSION" -srcfolder "$DESTINATION" "$UP/widelands_64bit_$WLVERSION.dmg"
+      hdiutil create -fs HFS+ -volname "Widelands $WLVERSION" -srcfolder "$DESTINATION" "$UP/widelands_${OSX_MIN_VERSION}_$WLVERSION.dmg"
    elif [ "$TYPE" == "Debug" ]; then
-      hdiutil create -fs HFS+ -volname "Widelands $WLVERSION" -srcfolder "$DESTINATION" "$UP/widelands_64bit_${WLVERSION}_${TYPE}.dmg"
+      hdiutil create -fs HFS+ -volname "Widelands $WLVERSION" -srcfolder "$DESTINATION" "$UP/widelands_${OSX_MIN_VERSION}_${WLVERSION}_${TYPE}.dmg"
    fi
 }