#12247 disable Qt5 modifier hack for Qt-5.12 version or newer

[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 9bd196dbc71212e33d084bad2c3b158b238f6d9b..94dc534d66d5ce53193fbc0786dd4cb12b25ccbe 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -9,10 +9,10 @@
 
 QtAPI=${QtAPI:-"-cocoa"}
 QtVersion=${QtVersion:-"4.6.3"}
-QtSourceVersion="qt-everywhere-opensource-src-${QtVersion}"
+QtSourceVersion=${QtSourceVersion:-"qt-everywhere-opensource-src-${QtVersion}"}
 QtBuildSubDir="qt-${QtVersion}-build${QtAPI}"
 QtConfigureOptions=${QtConfigureOptions:-"-release"}
-
+QtSkipComponents=${QtSkipComponents:-"qtconnectivity qtscript qtquickcontrols qtmultimedia qtvirtualkeyboard qtwayland qtwebengine"}
 LibMagicVersion=${LibMagicVersion:-"5.19"}
 LibMagicSource="file-${LibMagicVersion}"
 LibMagicLibrary="libmagic.1.dylib"
@@ -79,9 +79,9 @@ case "${QtVersion}:${QtAPI}" in
        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"
-#      QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
+       for component in ${QtSkipComponents} ; do
+               QtConfigureOptions="${QtConfigureOptions} -skip ${component}"
+       done
        QtMajorVersion=qt5
        ;;
 *)
@@ -152,6 +152,7 @@ usage() {
        echo " --with-build-path=PATH ....." default \${lyx-src-dir}/../lyx-build
        echo " --with-dmg-location=PATH ..." default \${build-path}
        echo " --with-binary-strip=yes ...." default no
+       echo " --codesign-identity=CSID ..." default is w/o CSID
        echo
        echo "All other arguments with -- are passed to configure"
        echo "including the defaults: ${LyXConfigureOptions}"
@@ -356,15 +357,19 @@ LyxAppPrefix="${LyxAppDir}.app"
 # don't change order here...
 case "${QtVersion}" in
 5.0.*|5.1.*)
-       QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+       QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
+       QtFrameworkVersion="5"
+       ;;
+5.12.*)
+       QtLibraries=${QtLibraries:-"QtDBus QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
 5*)
-       QtLibraries="QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+       QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
 *)
-       QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+       QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"}
        QtFrameworkVersion="4"
        ;;
 esac
@@ -441,7 +446,7 @@ if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
        # we have a private libmagic (file(1)) source tree at hand...
        # so let's build and install it
        if [ -z "${LibMagicVersion}" ]; then
-               LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+               LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
        fi
 
        LibMagicName="LibMagic"
@@ -502,7 +507,7 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
        # we have a private HunSpell source tree at hand...
        # so let's build and install it
        if [ -z "${HunSpellVersion}" ]; then
-               HunSpellVersion=$(grep AC_INIT "${HunSpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+               HunSpellVersion=$(grep AC_INIT "${HunSpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
        fi
 
        HunSpellName="Hunspell"
@@ -564,7 +569,7 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
        # we have a private ASpell source tree at hand...
        # so let's build and install it
        if [ -z "${ASpellVersion}" ]; then
-               ASpellVersion=$(grep AC_INIT "${ASpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+               ASpellVersion=$(grep AC_INIT "${ASpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
        fi
 
        ASpellName="Aspell"
@@ -1025,7 +1030,7 @@ make_dmg() {
        ln -s /Applications/ "${VOLUME}"/Applications
        test -d "${DocumentationDir}" && ditto --hfsCompression "${DocumentationDir}" "${VOLUME}"
        set_bundle_display_options "${VOLUME}" ${BG_W} ${BG_H}
-       ${XCODE_DEVELOPER}/Tools/SetFile -a C "${VOLUME}"
+       PATH="${XCODE_DEVELOPER}/Tools:$PATH" SetFile -a C "${VOLUME}"
        mv "${VOLUME}/Pictures" "${VOLUME}/.Pictures"
 
        # Unmount the disk image