Improved package build script for MacOS. Handle compiler standard for Qt6.

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

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 7cd3b794af96aece9b4233755b7c532773b3cded..cc7320de405ddb664343ee64ac096e5729667a91 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -47,7 +47,7 @@ LyXConfigureOptions="${LyXConfigureOptions} --disable-stdlib-debug"
 AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
 HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
 
-QtMajorVersion=qt4
+QtMajorVersion=$(echo "${QtVersion}"|cut -d. -f1)
 QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -confirm-license"
 # stupid special case...
 case "${QtVersion}:${QtAPI}" in
@@ -63,7 +63,6 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -fast -no-strip"
        QtConfigureOptions="${QtConfigureOptions} -no-javascript-jit -no-pkg-config"
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
-       QtMajorVersion=qt5
        ;;
 5.6*|5.7*)
        QtConfigureOptions="${QtConfigureOptions} -no-strip"
@@ -73,7 +72,6 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
        QtConfigureOptions="${QtConfigureOptions} -skip qttools"
        QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
-       QtMajorVersion=qt5
        ;;
 5.*)
        QtConfigureOptions="${QtConfigureOptions} -no-strip"
@@ -82,7 +80,6 @@ case "${QtVersion}:${QtAPI}" in
        for component in ${QtSkipComponents} ; do
                QtConfigureOptions="${QtConfigureOptions} -skip ${component}"
        done
-       QtMajorVersion=qt5
        ;;
 *)
        QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions"
@@ -146,7 +143,6 @@ usage() {
        echo " --aspell-deployment=yes|no ." default yes
        echo " --with-qt-frameworks=yes|no." default no
        echo " --qt-deployment=yes|no ....." default yes
-       echo " --with-macosx-target=TARGET " default 10.4 "(Tiger)"
        echo " --with-sdkroot=SDKROOT ....." default 10.5 "(Leopard)"
        echo " --with-arch=ARCH ..........." default ppc,i386
        echo " --with-build-path=PATH ....." default \${lyx-src-dir}/../lyx-build
@@ -190,8 +186,9 @@ while [ $# -gt 0 ]; do
                QTDIR=$(echo ${1}|cut -d= -f2)
                shift
                ;;
-       --with-macosx-target=*)
+       --with-macos-deployment-target=*)
                MACOSX_DEPLOYMENT_TARGET=$(echo ${1}|cut -d= -f2)
+               LyXConfigureOptions="${LyXConfigureOptions} ${1}"
                shift
                ;;
        --with-sdkroot=*)
@@ -287,9 +284,9 @@ while [ $# -gt 0 ]; do
                LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
                shift
                ;;
-       --enable-cxx11)
+       --enable-cxx11|--enable-cxx-mode=*)
                LyXConfigureOptions="${LyXConfigureOptions} ${1}"
-               EnableCXX11="--enable-cxx11"
+               EnableCXXMode="${1}"
                shift
                ;;
        --*)
@@ -335,7 +332,7 @@ QtBuildDir=${QtBuildDir:-"${LyxBuildDir}"/${QtBuildSubDir:-"qt-build"}}
 
 DictionarySourceDir=${DICTIONARYDIR:-$(dirname "${LyxSourceDir}")/dictionaries}
 DocumentationDir=$(dirname "${LyxSourceDir}")/Documents
-DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.png
+DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.tiff
 
 if [ -z "${LyXVersion}" ]; then
        LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " []()")
@@ -377,6 +374,12 @@ case "${QtVersion}" in
 6*)
        QtLibraries=${QtLibraries:-"QtCore5Compat QtDBus QtSvg QtXml QtPrintSupport QtSvgWidgets QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="A"
+       case "${EnableCXXMode}" in
+       --enable-cxx11|--enable-cxx-mode=11)
+               echo Warning: Adjust cxx standard "${EnableCXXMode}" for Qt 6. C++17 or better is required.
+               EnableCXXMode="--enable-cxx-mode=17"
+               ;;
+       esac
        ;;
 *)
        QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"}
@@ -415,6 +418,19 @@ esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 MYLDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
+case "${EnableCXXMode}" in
+--enable-cxx11|--enable-cxx-mode=11)
+       export CC=cc
+       export CXX="c++ -stdlib=libc++"
+       export CXXFLAGS=-std=c++11
+       ;;
+--enable-cxx-mode=17)
+       export CC=cc
+       export CXX="c++ -stdlib=libc++"
+       export CXXFLAGS=-std=c++17
+       ;;
+esac
+
 build_qt() {
        echo Build Qt library ${QtSourceDir}
        if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
@@ -644,14 +660,6 @@ build_lyx() {
                rm -rf "${LyxAppPrefix}"
        fi
 
-       case "${EnableCXX11}" in
-       "--enable-cxx11")
-               export CC=cc
-               export CXX="c++ -stdlib=libc++"
-               export CXXFLAGS=-std=c++11
-               ;;
-       esac
-
        # -------------------------------------
        # Automate configure check
        # -------------------------------------
@@ -690,8 +698,8 @@ build_lyx() {
                if [ -d "${LyxBuildDir}" ];  then rm -r "${LyxBuildDir}"; fi
                mkdir -p "${LyxBuildDir}" && cd "${LyxBuildDir}"
 
-               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
-               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"
+               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"
+               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"
 
                if [ "$configure_qt_frameworks" = "yes" ]; then
                        export QT_CORE_CFLAGS="-FQtCore"
@@ -962,7 +970,7 @@ set_bundle_display_options() {
        X_BOUNDS=$2
        Y_BOUNDS=$3
        Y_POSITION=$((Y_BOUNDS - 65))
-       Y_BOUNDS=$((Y_BOUNDS + 20))
+       Y_BOUNDS=$((Y_BOUNDS + 50))
        LYX_X_POSITION=$((X_BOUNDS / 4))
        LYX_Y_POSITION=$Y_POSITION
        APP_X_POSITION=$((3 * X_BOUNDS / 4))
@@ -1000,10 +1008,19 @@ set_bundle_display_options() {
 EOF
 }
 
+# The image was made with with inkscape and tiffutil from dmg-background.svgz
+make_image() {
+       INKSCAPE=/Applications/Inkscape.app/Contents/MacOS/inkscape
+       cd "${LyxSourceDir}"/development/MacOSX
+       ${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
+       ${INKSCAPE} --export-type=png -w 1120 -o dmg-background@2x.png dmg-background.svgz
+       tiffutil -cathidpicheck dmg-background.png dmg-background@2x.png -out dmg-background.tiff
+}
+
 make_dmg() {
        cd "${1}"
 
-       BGSIZE=$(file "$DmgBackground" | awk -F , '/PNG/{print $2 }' | tr x ' ')
+       BGSIZE=$(file "$DmgBackground" | awk -F , '/TIFF/{ print $10 $4 ;}/PNG/{ print $2; }'|sed -e 's/width=//' -e 's/height=//' -e 's/x//')
        BG_W=$(echo ${BGSIZE} | awk '{print $1 }')
        BG_H=$(echo ${BGSIZE} | awk '{print $2 }')
 
@@ -1055,7 +1072,7 @@ build_package() {
        for arch in ${ARCH_LIST} ; do
                DMGARCH="${DMGARCH}-${arch}"
        done
-       QtDmgArchSuffix=${QtMajorVersion}${DMGARCH}${QtAPI}.dmg
+       QtDmgArchSuffix="qt"${QtMajorVersion}${DMGARCH}${QtAPI}.dmg
 
        test -n "${DMGLocation}" && (
                make_dmg "${DMGLocation}"
@@ -1076,6 +1093,6 @@ if [ ${LyxOnlyPackage:-"no"} = "no" ]; then
        convert_universal
        copy_dictionaries
        test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
-       find "${LyxAppPrefix}" -type d -exec chmod a-w '{}' \;
+       find "${LyxAppPrefix}" -type d -exec chmod go-w '{}' \;
 fi
 build_package