installer/Readme.txt: update how to build

[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 a7f0620ff217f67606fa8dee9149bd25a4b28892..d4d1731a13814f8fb89fba28eef1bd41835171a9 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -35,7 +35,7 @@ unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
 #   the aspell sources placed in a sibling directory (variable ASpellSource)
 # * for hunspell support:
 #   the hunspell sources placed in a sibling directory (variable HunSpellSource)
-# * for dictionary deployment (per default thesauri only):
+# * for dictionary deployment (only hunspell dicts and mythes thesauri are deployed per default):
 #   - aspell:   the dictionary files of macports (in /opt/local/share/aspell and /opt/local/lib/aspell-0.60)
 #   - hunspell: the dictionary files in the sibling directory dictionaries/dicts
 #   - mythes:   the data and idx files in the sibling directory dictionaries/thes
@@ -55,6 +55,9 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions"
        QtConfigureOptions="${QtConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
+       for arch in ${ARCH_LIST} ; do
+               QTARCHS="${QTARCHS} -arch ${arch}"
+       done
        ;;
 5.0*)
        QtConfigureOptions="${QtConfigureOptions} -fast -no-strip"
@@ -62,12 +65,21 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
        QtMajorVersion=qt5
        ;;
+5.6*)
+       QtConfigureOptions="${QtConfigureOptions} -no-strip"
+       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"
+       QtMajorVersion=qt5
+       ;;
 5.*)
        QtConfigureOptions="${QtConfigureOptions} -no-strip"
        QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools"
        QtConfigureOptions="${QtConfigureOptions} -skip qtquick1 -skip qtwebkit -skip qtconnectivity -skip qtscript"
-       QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols -skip qtdeclarative"
+       QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
+#      QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
        QtMajorVersion=qt5
        ;;
 *)
@@ -75,6 +87,9 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
        QtConfigureOptions="${QtConfigureOptions} ${QtAPI}"
+       for arch in ${ARCH_LIST} ; do
+               QTARCHS="${QTARCHS} -arch ${arch}"
+       done
        ;;
 esac
 
@@ -89,11 +104,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"
@@ -185,11 +200,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
@@ -381,12 +397,9 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
        fi
        (
                mkdir -p "${QtBuildDir}" && cd "${QtBuildDir}"
-               for arch in ${ARCH_LIST} ; do
-                       ARCHS="${ARCHS} -arch ${arch}"
-               done
                echo configure options:
-               echo ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-               "${QtSourceDir}"/configure ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
+               echo ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
+               "${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
                make -j1 && make -j1 install
        )
 fi
@@ -803,10 +816,14 @@ deduplicate() {
        find "$@" -type f -print | while read file ; do
                echo $(md5 -q "$file") "$file"
        done | sort | while read hash file ; do
-               if [ "$phash" = "$hash" ]; then
+               ppath=$(dirname "$pfile")
+               path=$(dirname "$file")
+               if [ "$phash" = "$hash" -a "$ppath" = "$path" ]; then
+                       pname=$(basename "$pfile")
+                       name=$(basename "$file")
                        cmp -s "$pfile" "$file" && (
                                rm "$file"
-                               ln -s "$pfile" "$file" && echo link for "$file" created
+                               cd "$path" && ln -s "$pname" "$name" && echo link for "$file" created
                        )
                fi
                phash="$hash"