Implement Row::Element::row_flags

[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 dcc6316750b9088f0eec9ce4f945bf6ef9e00284..25b1c7abee0846ea17ab16287f1614e140d850c7 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=*)
@@ -268,9 +265,15 @@ while [ $# -gt 0 ]; do
                aspell_deployment="no"
                shift
                ;;
+       --with-included-hunspell)
+               LyXConfigureOptions="${LyXConfigureOptions} ${1}"
+               hunspell_deployment="no"
+               shift
+               ;;
        --without-hunspell)
                LyXConfigureOptions="${LyXConfigureOptions} ${1}"
                hunspell_deployment="no"
+               hunspell_dictionaries="no"
                shift
                ;;
        --only-qt*=*)
@@ -368,6 +371,10 @@ case "${QtVersion}" in
        QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
+6*)
+       QtLibraries=${QtLibraries:-"QtCore5Compat QtDBus QtSvg QtXml QtPrintSupport QtSvgWidgets QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
+       QtFrameworkVersion="A"
+       ;;
 *)
        QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"}
        QtFrameworkVersion="4"
@@ -419,16 +426,6 @@ build_qt() {
                "${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
                make -j1 && make -j1 install
        )
-       if [ -d "${QtInstallDir}" -a ! -f "${QtInstallDir}"/include/QtCore ]; then
-               cd "${QtInstallDir}" && (
-                       mkdir -p include
-                       cd include
-                       for libnm in ${QtLibraries} ; do
-                               test -d ${libnm} -o -L ${libnm} || \
-                               ( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} )
-                       done
-               )
-       fi
 }
 
 case ${QtOnlyPackage:-"no"} in
@@ -690,8 +687,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} -F${QtInstallDir}/lib"
+               CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"
+               LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"
 
                if [ "$configure_qt_frameworks" = "yes" ]; then
                        export QT_CORE_CFLAGS="-FQtCore"
@@ -946,12 +943,10 @@ copy_dictionaries() {
                cp -p -r "${ASpellInstallDir}/lib/aspell-0.60"/* "${ASpellResources}"/data
                cp -p -r "${ASpellInstallDir}/share/aspell"/* "${ASpellResources}"/dicts
        fi
-       if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_dictionaries}" ]; then
+       if [ -d "${DictionarySourceDir}" -a "yes" = "${hunspell_dictionaries}" ]; then
                HunSpellResources="${LyxAppPrefix}/Contents/Resources"
-               if [ -d "${DictionarySourceDir}" ]; then
-                       ( cd "${DictionarySourceDir}" && find dicts -name .svn -prune -o -type f -print | cpio -pmdv "${HunSpellResources}" )
-                       deduplicate "${HunSpellResources}"/dicts
-               fi
+               ( cd "${DictionarySourceDir}" && find dicts -name .svn -prune -o -type f -print | cpio -pmdv "${HunSpellResources}" )
+               deduplicate "${HunSpellResources}"/dicts
        fi
        if [ -d "${DictionarySourceDir}" -a "yes" = "${thesaurus_deployment}" ]; then
                MyThesResources="${LyxAppPrefix}/Contents/Resources"
@@ -1057,7 +1052,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}"
@@ -1078,6 +1073,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