anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more flexible Xcode management, reduce hard coded version numbers

Browse Source
This commit is contained in:
Stephan Witt 2016-01-06 10:38:26 +01:00
parent f9d381c5c4
commit 10831da171
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
development/LyX-Mac-binary-release.sh
View File

@ -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

2
status.21x
View File

@ -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)