Merge branch 'master' of git.lyx.org:lyx

[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 16bada01d85504f9d8dba4077a79d048074ce84d..05cb757db577a80b6dc6a2cda85503292f40b5c3 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -35,7 +35,7 @@ unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
 #   the aspell sources placed in a sibling directory (variable ASpellSource)
 # * for hunspell support:
 #   the hunspell sources placed in a sibling directory (variable HunSpellSource)
-# * for dictionary deployment (per default thesauri only):
+# * for dictionary deployment (only hunspell dicts and mythes thesauri are deployed per default):
 #   - aspell:   the dictionary files of macports (in /opt/local/share/aspell and /opt/local/lib/aspell-0.60)
 #   - hunspell: the dictionary files in the sibling directory dictionaries/dicts
 #   - mythes:   the data and idx files in the sibling directory dictionaries/thes
@@ -55,6 +55,9 @@ case "${QtVersion}:${QtAPI}" in
        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"
+       for arch in ${ARCH_LIST} ; do
+               QTARCHS="${QTARCHS} -arch ${arch}"
+       done
        ;;
 5.0*)
        QtConfigureOptions="${QtConfigureOptions} -fast -no-strip"
@@ -62,12 +65,21 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
        QtMajorVersion=qt5
        ;;
+5.6*)
+       QtConfigureOptions="${QtConfigureOptions} -no-strip"
+       QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
+       QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools"
+       QtConfigureOptions="${QtConfigureOptions} -skip qtconnectivity -skip qtscript"
+       QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols -skip qtdeclarative"
+       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"
+       QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
+#      QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
        QtMajorVersion=qt5
        ;;
 *)
@@ -75,6 +87,9 @@ case "${QtVersion}:${QtAPI}" in
        QtConfigureOptions="${QtConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
        QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
        QtConfigureOptions="${QtConfigureOptions} ${QtAPI}"
+       for arch in ${ARCH_LIST} ; do
+               QTARCHS="${QTARCHS} -arch ${arch}"
+       done
        ;;
 esac
 
@@ -381,12 +396,9 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
        fi
        (
                mkdir -p "${QtBuildDir}" && cd "${QtBuildDir}"
-               for arch in ${ARCH_LIST} ; do
-                       ARCHS="${ARCHS} -arch ${arch}"
-               done
                echo configure options:
-               echo ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-               "${QtSourceDir}"/configure ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
+               echo ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
+               "${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
                make -j1 && make -j1 install
        )
 fi
@@ -678,6 +690,11 @@ content_directory() {
        echo "${content}"
 }
 
+installname() {
+               echo install_name_tool "$@"
+               install_name_tool "$@"
+}
+
 private_framework() {
        fwdir=$(framework_name "$1")
        source="$2"
@@ -687,11 +704,9 @@ private_framework() {
        mkdir -p "${condir}/${fwdir}"
        if [ ! -f "${condir}/${fwdir}/${libnm}" ]; then
                cp -p "${source}" "${condir}/${fwdir}"
-               echo Set library id in "${condir}/${fwdir}/${libnm}"
-               install_name_tool -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
+               installname -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
        fi
-       echo Correct library id reference to "${libnm}" in "${target}"
-       install_name_tool -change "${source}" "@executable_path/../${fwdir}/${libnm}" "${target}"
+       installname -change "${source}" "@executable_path/../${fwdir}/${libnm}" "${target}"
 }
 
 deploy_qtlibs() {
@@ -724,16 +739,17 @@ EOF
                test -d "${condir}/${fwdir}" || (
                        echo Copy framework "${source}/lib/"$(basename "${fwdir}")
                        cp -pR "${source}/lib/"$(basename "${fwdir}") "${condir}/${fwdir}"
-                       echo Set library id in "${condir}/${fwdir}/${version}${libnm}"
-                       install_name_tool -id "@executable_path/../${fwdir}/${version}${libnm}" "${condir}/${fwdir}/${version}${libnm}"
+                       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*")"*)
-                                                       echo Correct library id reference to "${libnm}" in "${filename}"
-                                                       install_name_tool -change\
+                                                       installname -change\
                                                                "${source}/lib/${dirname}/${version}${libnm}"\
                                                                "@executable_path/../${fwdir}/${version}${libnm}"\
                                                                "${filename}"
@@ -743,8 +759,7 @@ EOF
                                fi
                        done
                )
-               echo Correct library id reference to "${libnm}" in "${target}"
-               install_name_tool -change\
+               installname -change\
                        "${source}/lib/${dirname}/${version}${libnm}"\
                        "@executable_path/../${fwdir}/${version}${libnm}"\
                        "${target}"
@@ -796,6 +811,25 @@ convert_universal() {
        done
 }
 
+deduplicate() {
+       find "$@" -type f -print | while read file ; do
+               echo $(md5 -q "$file") "$file"
+       done | sort | while read hash file ; do
+               ppath=$(dirname "$pfile")
+               path=$(dirname "$file")
+               if [ "$phash" = "$hash" -a "$ppath" = "$path" ]; then
+                       pname=$(basename "$pfile")
+                       name=$(basename "$file")
+                       cmp -s "$pfile" "$file" && (
+                               rm "$file"
+                               cd "$path" && ln -s "$pname" "$name" && echo link for "$file" created
+                       )
+               fi
+               phash="$hash"
+               pfile="$file"
+       done
+}
+
 copy_dictionaries() {
        if [ -d "${ASpellInstallDir}" -a "yes" = "${aspell_dictionaries}" ]; then
                ASpellResources="${LyxAppPrefix}/Contents/Resources"
@@ -811,11 +845,13 @@ copy_dictionaries() {
                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
        fi
        if [ -d "${DictionarySourceDir}" -a "yes" = "${thesaurus_deployment}" ]; then
                MyThesResources="${LyxAppPrefix}/Contents/Resources"
                ( cd "${DictionarySourceDir}" && find thes -name .svn -prune -o -type f -print | cpio -pmdv "${MyThesResources}" )
+               deduplicate "${MyThesResources}"/thes
        fi
 }