#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 af00aa2abee70a976bcc7f236ef48294fe10e330..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"
@@ -633,7 +638,10 @@ LYX_BUNDLE_PATH="${LyxAppPrefix}/${BUNDLE_PATH}"
 build_lyx() {
        # Clear Output
        if [ -n "${LyxAppZip}" -a -f "${LyxAppZip}" ]; then rm "${LyxAppZip}"; fi
-       if [ -d "${LyxAppPrefix}" ]; then rm -rf "${LyxAppPrefix}"; fi
+       if [ -d "${LyxAppPrefix}" ]; then
+               find "${LyxAppPrefix}" -type d -exec chmod u+w '{}' \;
+               rm -rf "${LyxAppPrefix}"
+       fi
 
        case "${EnableCXX11}" in
        "--enable-cxx11")
@@ -741,26 +749,25 @@ private_framework() {
        fwvrsn="1"
        mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
        mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Resources
-       if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}" ]; then
-               cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}"
+       if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}" ]; then
+               cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}"
                for hfile in "$@" ; do
                        test -f "${hfile}" && cp -p "${hfile}" "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
                done
                ln -s ${fwvrsn} "${condir}/${fwdir}/Versions/Current"
                ln -s Versions/Current/Headers "${condir}/${fwdir}/Headers"
                ln -s Versions/Current/Resources "${condir}/${fwdir}/Resources"
-               ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${libnm}"
-               ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${fwname}"
-               installname -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
+               ln -s Versions/Current/"${fwname}" "${condir}/${fwdir}/${fwname}"
+               installname -id "@executable_path/../${fwdir}/${fwname}" "${condir}/${fwdir}/${fwname}"
                if [ -f "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist ]; then
                        cat "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist | sed \
-                               -e "s/@CFBundleExecutable@/${libnm}/" \
+                               -e "s/@CFBundleExecutable@/${fwname}/" \
                                -e "s/@CFBundleIdentifier@/${libid}/" \
                                -e "s/@CFBundleShortVersionString@/${svrsn}/" \
                                -e "s/@CFBundleVersion@/${version}/" > "${condir}/${fwdir}"/Resources/Info.plist
                fi
        fi
-       installname -change "${source}" "@executable_path/../${fwdir}/${libnm}" "${target}"
+       installname -change "${source}" "@executable_path/../${fwdir}/${fwname}" "${target}"
 }
 
 deploy_qtlibs() {
@@ -793,7 +800,9 @@ EOF
                test -d "${condir}/${fwdir}" || (
                        echo Copy framework "${source}/lib/"$(basename "${fwdir}")
                        cp -pR "${source}/lib/"$(basename "${fwdir}") "${condir}/${fwdir}"
-                       rm -f "${condir}/${fwdir}/${version}${libnm}"_debug
+                       rm -f "${condir}/${fwdir}/${libnm}"_debug "${condir}/${fwdir}/${version}${libnm}"_debug
+                       test -f "${condir}/${fwdir}/${libnm}".prl && mv "${condir}/${fwdir}/${libnm}".prl "${condir}/${fwdir}"/Resources
+                       test -f "${condir}/${fwdir}/${libnm}"_debug.prl && mv "${condir}/${fwdir}/${libnm}"_debug.prl "${condir}/${fwdir}"/Resources
                        installname -id "@executable_path/../${fwdir}/${version}${libnm}" "${condir}/${fwdir}/${version}${libnm}"
                        find "${condir}/PlugIns" "${condir}/"$(dirname "${fwdir}") -name Headers -prune -o -type f -print | while read filename ; do
                                if [ "${filename}" != "${target}" ]; then
@@ -879,9 +888,14 @@ code_sign() {
        condir=$(content_directory "${target}"/lyx)
        appdir=$(dirname "${condir}")
        # have to sign frameworks first
+       for fwname in Aspell Hunspell LibMagic ; do
+               fwitem="${condir}"/$(framework_name "${fwname}")
+               if [ -d "${fwitem}" ]; then
+                       codesign --verbose --force --sign "${CODESIGN_IDENTITY}" "${fwitem}"
+               fi
+       done
        for csitem in \
                "${condir}"/Frameworks/Qt*.framework/Versions/${QtFrameworkVersion} \
-               "${condir}"/Frameworks/*.framework/lib*.dylib \
                "${condir}"/PlugIns/*/lib*.dylib \
                "${condir}"/Library/Spotlight/* \
                "${target}"/inkscape \
@@ -1007,7 +1021,7 @@ make_dmg() {
        VOLUME=$(mount |grep ${DEVICE} | cut -f 3 -d ' ')
 
        # copy in the application bundle
-       ditto --hfsCompression "${LyxAppDir}.app" "${VOLUME}/${LyxName}.app"
+       ditto --hfsCompression "${LyxAppPrefix}" "${VOLUME}/${LyxName}.app"
 
        # copy in background image
        mkdir -p "${VOLUME}/Pictures"
@@ -1016,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
@@ -1059,7 +1073,8 @@ build_package() {
 if [ ${LyxOnlyPackage:-"no"} = "no" ]; then
        build_lyx
        convert_universal
-       test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
        copy_dictionaries
+       test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
+       find "${LyxAppPrefix}" -type d -exec chmod a-w '{}' \;
 fi
 build_package