French UserGuide.lyx: updates from Jean-Pierre

[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 ff2bfa9acfe369ce3414adde94a859da419926b1..d26086efc07b170b0df0870ed7177d9c181f39ff 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -25,8 +25,6 @@ HunSpellVersion=${HunSpellVersion:-"1.3.2"}
 HunSpellSource="hunspell-${HunSpellVersion}"
 HunSpellLibrary="libhunspell-1.3.0.dylib"
 
-LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
-
 unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
 
 # Prerequisite:
@@ -48,25 +46,34 @@ LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-x=no"
 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"
-QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
-QtConfigureOptions="${QtConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
-QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
-QtMajorVersion=qt4
 
+QtMajorVersion=qt4
+QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -confirm-license"
 # stupid special case...
 case "${QtVersion}:${QtAPI}" in
 4.6*:-carbon)
+       QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions"
+       QtConfigureOptions="${QtConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
+       QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
        ;;
 5.0*)
-       QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip"
+       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.*)
+       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 -skip qtdeclarative"
        QtMajorVersion=qt5
        ;;
 *)
+       QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions"
+       QtConfigureOptions="${QtConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
+       QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
        QtConfigureOptions="${QtConfigureOptions} ${QtAPI}"
        ;;
 esac
@@ -178,7 +185,7 @@ while [ $# -gt 0 ]; do
                        export OBJC=gcc-4.0
                        export CXX=g++-4.0
                        ;;
-               10.5|10.6|10.7|10.8)
+               10.5|10.6|10.7|10.8|10.9|10.10)
                        SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
                        ;;
                *)
@@ -268,6 +275,8 @@ aspellstrip=
 LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build}
 DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
 
+LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
+
 LibMagicSourceDir=${LIBMAGICDIR:-$(dirname "${LyxSourceDir}")/${LibMagicSource}}
 LibMagicBuildDir="${LyxBuildDir}"/"${LibMagicSource}"
 LibMagicInstallDir=${LibMagicInstallDir:-"${LyXUtilitiesDir}"}
@@ -294,6 +303,11 @@ if [ -z "${LyXVersion}" ]; then
        LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()")
 fi
 LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)}
+case "${LyXVersion}" in
+*dev*)
+       LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%h)
+       ;;
+esac
 
 LyxName="LyX"
 LyxBase="${LyxName}-${LyXVersion}"
@@ -324,7 +338,7 @@ case "${QtVersion}" in
        ;;
 esac
 
-DMGNAME="${LyxBase}"
+DMGNAME="${LyxBase}${LyXGitCommitHash:+-}${LyXGitCommitHash}"
 DMGSIZE="550m"
 
 # Check for existing SDKs
@@ -354,17 +368,6 @@ case $SDKs in
 esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
-# pkg-config is not usable with this script
-export PKG_CONFIG=""
-
-# These variables define the identifiers of the
-# system (both Intel and PowerPC) to compile for.
-# (Note: darwin8 is 10.4; darwin9 is 10.5.)
-# Only change these if necessary
-
-HostSystem_i386="i686-apple-darwin8"
-HostSystem_ppc="powerpc-apple-darwin8"
-
 if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then
        echo Build Qt library ${QtSourceDir}
        if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
@@ -379,7 +382,7 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
                done
                echo configure options:
                echo ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-               echo yes | "${QtSourceDir}"/configure ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
+               "${QtSourceDir}"/configure ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
                make ${MAKEJOBS} && make install
        )
        cd "${QtInstallDir}" && (
@@ -415,7 +418,6 @@ if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
        for arch in ${ARCH_LIST} ; do
                CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
                LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
-               HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
                "${LibMagicSourceDir}/configure"\
                        --prefix="${LibMagicInstallDir}"\
                        ${LibMagicConfigureOptions}
@@ -441,6 +443,8 @@ if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
                (
                        cd "${LibMagicInstallDir}"
                        lipo -create ${OBJ_LIST} -o lib/${file}
+                       # check for the "missing link"...
+                       test -f lib/libmagic.dylib || (cd lib ; ln -s "${LibMagicLibrary}" libmagic.dylib)
                )
        done
        # --------
@@ -476,7 +480,6 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
                make distclean
                CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
                LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
-               HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
                "${HunSpellSourceDir}/configure"\
                        --prefix="${HunSpellInstallDir}"\
                        ${HunspellConfigureOptions}
@@ -540,7 +543,6 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
                make distclean
                CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
                LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
-               HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
                CXXFLAGS=-g "${ASpellSourceDir}/configure"\
                        --prefix="${ASpellInstallDir}"\
                        ${AspellConfigureOptions}
@@ -629,7 +631,6 @@ build_lyx() {
 
                CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
                LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
-               HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
 
                if [ "$configure_qt_frameworks" = "yes" ]; then
                        export QT_CORE_CFLAGS="-FQtCore"
@@ -864,7 +865,8 @@ make_dmg() {
 
        hdiutil create -type SPARSE -size ${DMGSIZE:-"250m"} -fs HFS+ -volname "${LyxBase}" "${DMGNAME}"
        # Unmount currently mounted disk image
-       test -d /Volumes/"${LyxBase}" && umount /Volumes/"${LyxBase}"
+       mount | grep "${LyxBase}" && umount /Volumes/"${LyxBase}"
+       test -d /Volumes/"${LyxBase}" && rmdir /Volumes/"${LyxBase}"
 
        # Mount the disk image
        hdiutil attach "${DMGNAME}.sparseimage"