]> git.lyx.org Git - lyx.git/blobdiff - development/LyX-Mac-binary-release.sh
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Tweak ruff configuration
[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 017a61072cc6aef34db03366e778f4794ba423ee..179ed5db9aeb2c9de5c40844c8a68e1298c2c190 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -284,9 +284,8 @@ while [ $# -gt 0 ]; do
                LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
                shift
                ;;
-       --enable-cxx11)
-               LyXConfigureOptions="${LyXConfigureOptions} ${1}"
-               EnableCXX11="--enable-cxx11"
+       --enable-cxx11|--enable-cxx-mode=*)
+               EnableCXXMode="${1}"
                shift
                ;;
        --*)
@@ -300,7 +299,7 @@ while [ $# -gt 0 ]; do
 done
 
 if [ "${configure_qt_frameworks}" != "yes" ]; then
-       QtInstallDir=${QTDIR:-"/opt/qt4"}
+       QtInstallDir=${QTDIR}
 fi
 
 ARCH_LIST=${ARCH_LIST:-"ppc i386"}
@@ -363,7 +362,7 @@ case "${QtVersion}" in
        QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
-5.12.*)
+5.1[2-5].*)
        QtLibraries=${QtLibraries:-"QtDBus QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
@@ -372,8 +371,14 @@ case "${QtVersion}" in
        QtFrameworkVersion="5"
        ;;
 6*)
-       QtLibraries=${QtLibraries:-"QtCore5Compat QtDBus QtSvg QtXml QtPrintSupport QtSvgWidgets QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
+       QtLibraries=${QtLibraries:-"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"}
@@ -412,6 +417,21 @@ 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
+       LyXConfigureOptions="${LyXConfigureOptions} --enable-cxx-mode=11"
+       ;;
+--enable-cxx-mode=17)
+       export CC=cc
+       export CXX="c++ -stdlib=libc++"
+       export CXXFLAGS=-std=c++17
+       LyXConfigureOptions="${LyXConfigureOptions} ${EnableCXXMode}"
+       ;;
+esac
+
 build_qt() {
        echo Build Qt library ${QtSourceDir}
        if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
@@ -641,14 +661,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
        # -------------------------------------
@@ -704,6 +716,7 @@ build_lyx() {
                echo CPPFLAGS="${CPPFLAGS}"
                export CPPFLAGS
                echo CONFIGURE_OPTIONS="${LyXConfigureOptions}" ${QtInstallDir:+"--with-qt-dir=${QtInstallDir}"}
+               export PATH="${QtInstallDir}/libexec:$PATH"
                "${LyxSourceDir}/configure"\
                        --prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\
                        ${QtInstallDir:+"--with-qt-dir=${QtInstallDir}"} \
@@ -790,41 +803,47 @@ EOF
                        cp -p "${libname}" "${condir}/PlugIns/${dirname}"
                done
        fi
+       echo Copy frameworks ${QtLibraries} ...
        for libnm in ${QtLibraries} ; do
                fwdir=$(framework_name "$libnm")
                dirname=$(dirname "${fwdir}")
                mkdir -p "${condir}/${dirname}"
                dirname=$(basename "${fwdir}")
-               test -d "${condir}/${fwdir}" || (
-                       echo Copy framework "${source}/lib/"$(basename "${fwdir}")
-                       cp -pR "${source}/lib/"$(basename "${fwdir}") "${condir}/${fwdir}"
-                       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
-                                       otool -L "${filename}" 2>/dev/null | sort -u | while read library ; do
-                                               # pattern match for: /path/to/qt/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
-                                               case "${library}" in
-                                               *@rpath/*"${libnm}"*"("*version*")"*)
-                                                       # echo rpath based name for ${libnm} is ok.
-                                                       ;;
-                                               *"${libnm}"*"("*version*")"*)
-                                                       installname -change\
-                                                               "${source}/lib/${dirname}/${version}${libnm}"\
-                                                               "@executable_path/../${fwdir}/${version}${libnm}"\
-                                                               "${filename}"
-                                                       ;;
-                                               esac
-                                       done
-                               fi
-                       done
-               )
-               installname -change\
-                       "${source}/lib/${dirname}/${version}${libnm}"\
-                       "@executable_path/../${fwdir}/${version}${libnm}"\
-                       "${target}"
+               libpath="${source}/lib/${dirname}"
+               if [ -d "${libpath}" ]; then
+                       test -d "${condir}/${fwdir}" || (
+                               echo Copy framework "${libpath}"
+                               cp -pR "${libpath}" "${condir}/${fwdir}"
+                               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
+                                               otool -L "${filename}" 2>/dev/null | sort -u | while read library ; do
+                                                       # pattern match for: /path/to/qt/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
+                                                       case "${library}" in
+                                                       *@rpath/*"${libnm}"*"("*version*")"*)
+                                                               # echo rpath based name for ${libnm} is ok.
+                                                               ;;
+                                                       *"${libnm}"*"("*version*")"*)
+                                                               installname -change\
+                                                                       "${source}/lib/${dirname}/${version}${libnm}"\
+                                                                       "@executable_path/../${fwdir}/${version}${libnm}"\
+                                                                       "${filename}"
+                                                               ;;
+                                                       esac
+                                               done
+                                       fi
+                               done
+                       )
+                       installname -change\
+                               "${source}/lib/${dirname}/${version}${libnm}"\
+                               "@executable_path/../${fwdir}/${version}${libnm}"\
+                               "${target}"
+               else
+                       echo Warning: Cannot copy framework for "$libnm" ... missing source "${libpath}"
+               fi
        done
        if [ -d "${source}"/translations ]; then
                if [ ! -d "${condir}/translations" ]; then
@@ -1000,15 +1019,18 @@ 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
+       (
+               cd "${LyxSourceDir}"/development/MacOSX
+               test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
+               test -x ${INKSCAPE} && ${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}"
 
+       test -f "${DmgBackground}" || make_image
        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 }')
@@ -1081,7 +1103,7 @@ if [ ${LyxOnlyPackage:-"no"} = "no" ]; then
        build_lyx
        convert_universal
        copy_dictionaries
-       test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
        find "${LyxAppPrefix}" -type d -exec chmod go-w '{}' \;
+       test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
 fi
 build_package
The LyX Source Repository