Safe line break to increase precision of error reporting in Listings caption

[lyx.git] / development / LyX-Mac-binary-release.sh

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 05cb757db577a80b6dc6a2cda85503292f40b5c3..d97bc19c29b85a758208326a244c5803b63590b6 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -21,7 +21,7 @@ ASpellVersion=${ASpellVersion:-"0.60.6.1"}
 ASpellSource="aspell-${ASpellVersion}"
 ASpellLibrary="libaspell.15.dylib"
 
-HunSpellVersion=${HunSpellVersion:-"1.3.2"}
+HunSpellVersion=${HunSpellVersion:-"1.3.3"}
 HunSpellSource="hunspell-${HunSpellVersion}"
 HunSpellLibrary="libhunspell-1.3.0.dylib"
 
@@ -70,7 +70,9 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools"
        QtConfigureOptions="${QtConfigureOptions} -skip qtconnectivity -skip qtscript"
-       QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols -skip qtdeclarative"
+       QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
+       QtConfigureOptions="${QtConfigureOptions} -skip qttools"
+       QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
        QtMajorVersion=qt5
        ;;
 5.*)
@@ -104,11 +106,11 @@ thesaurus_deployment="yes"
 qt_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"
@@ -200,11 +202,12 @@ while [ $# -gt 0 ]; do
                        export OBJC=gcc-4.0
                        export CXX=g++-4.0
                        ;;
-               10.5|10.6|10.7|10.8|10.9|10.10)
-                       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
@@ -265,6 +268,10 @@ while [ $# -gt 0 ]; do
                hunspell_deployment="no"
                shift
                ;;
+       --only-qt*=*)
+               QtOnlyPackage=$(echo ${1}|cut -d= -f2)
+               shift
+               ;;
        --only-package=*)
                LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
                shift
@@ -387,7 +394,7 @@ case $SDKs in
 esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
-if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then
+build_qt() {
        echo Build Qt library ${QtSourceDir}
        if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
                echo Bad install directory for Qt.
@@ -401,17 +408,29 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
                "${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
                make -j1 && make -j1 install
        )
-fi
-if [ -d "${QtInstallDir}" -a ! -f "${QtInstallDir}"/include/QtCore ]; then
-       cd "${QtInstallDir}" && (
-               mkdir -p include
-               cd include
-               for libnm in ${QtLibraries} ; do
-                       test -d ${libnm} -o -L ${libnm} || \
-                       ( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} )
-               done
-       )
-fi
+       if [ -d "${QtInstallDir}" -a ! -f "${QtInstallDir}"/include/QtCore ]; then
+               cd "${QtInstallDir}" && (
+                       mkdir -p include
+                       cd include
+                       for libnm in ${QtLibraries} ; do
+                               test -d ${libnm} -o -L ${libnm} || \
+                               ( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} )
+                       done
+               )
+       fi
+}
+
+case ${QtOnlyPackage:-"no"} in
+y*)
+       build_qt
+       exit 0
+       ;;
+*)
+       if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then
+               build_qt
+       fi
+       ;;
+esac
 
 if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
        # we have a private libmagic (file(1)) source tree at hand...
@@ -764,11 +783,13 @@ EOF
                        "@executable_path/../${fwdir}/${version}${libnm}"\
                        "${target}"
        done
-       if [ ! -d "${condir}/translations" ]; then
-               mkdir -p "${condir}/translations"
+       if [ -d "${source}"/translations ]; then
+               if [ ! -d "${condir}/translations" ]; then
+                       mkdir -p "${condir}/translations"
+               fi
+               echo Copy Qt translations to "${condir}/translations"
+               cp -p "${source}"/translations/qt_*.qm "${condir}/translations"
        fi
-       echo Copy Qt translations to "${condir}/translations"
-       cp -p "${source}"/translations/qt_*.qm "${condir}/translations"
 }
 
 # -------------------------