[LyX/2.1.x] more flexible Xcode management, reduce hard coded version numbers

[Stephan Witt]

commit 10831da1710c92d6af40dd9b21f88be97e7cb4e7
Author: Stephan Witt <sw...@lyx.org>
Date:   Wed Jan 6 10:38:26 2016 +0100

    more flexible Xcode management, reduce hard coded version numbers

diff --git a/development/LyX-Mac-binary-release.sh 
b/development/LyX-Mac-binary-release.sh
index 848c649..542f687 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -78,11 +78,11 @@ thesaurus_deployment="yes"
 qt4_deployment="yes"
 
 # auto detect Xcode location
-if [ -d 
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"
 ]; then
-       
DEVELOPER_SDKS="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs"
-       XCODE_DEVELOPER="/Applications/Xcode.app/Contents/Developer"
+DEVELOPER_SDKS=$(dirname $(xcrun --show-sdk-path))
+if [ -n "${DEVELOPER_SDKS}" ]; then
+       XCODE_DEVELOPER=$(dirname $(dirname $(xcrun --show-sdk-platform-path)))
        MACOSX_DEPLOYMENT_TARGET="10.7" # Lion support is default
-       SDKROOT="${DEVELOPER_SDKS}/MacOSX10.7.sdk" # Lion build is default
+       SDKROOT="${DEVELOPER_SDKS}/MacOSX$(xcrun --show-sdk-version).sdk" # use 
default SDK
 elif [ -d "/Developer/SDKs" ]; then
        DEVELOPER_SDKS="/Developer/SDKs"
        XCODE_DEVELOPER="/Developer"
@@ -168,11 +168,12 @@ while [ $# -gt 0 ]; do
                        export OBJC=gcc-4.0
                        export CXX=g++-4.0
                        ;;
-               10.5|10.6|10.7|10.8)
-                       SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
-                       ;;
                *)
-                       usage
+                       SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
+                       if [ ! -d "${SDKROOT}" ]; then
+                               echo Invalid SDKROOT given: "${SDKROOT}"
+                               usage --help=short
+                       fi
                        ;;
                esac
                shift
diff --git a/status.21x b/status.21x
index 2a2bb89..f2e6dbd 100644
--- a/status.21x
+++ b/status.21x
@@ -181,3 +181,5 @@ What's new
 
 - Give a warning when system boost and stdlib-debug are used together
   (bug 9736).
+
+- Correct Mac OS X package build script (10.11 SDK for Xcode 7 + El Capitan)