X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FLyX-Mac-binary-release.sh;h=b59cc8f82382334c1fb8e43aff450df1c1d4a124;hb=96d63d28a7069b85953e505838732e2f491b341d;hp=45adfd8f286adfeee9eb2f41e86099ffd979c7fb;hpb=f2aeca65b491f4a2396ec2b8834713e5c156c5ef;p=lyx.git diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh index 45adfd8f28..b59cc8f823 100644 --- a/development/LyX-Mac-binary-release.sh +++ b/development/LyX-Mac-binary-release.sh @@ -21,9 +21,9 @@ ASpellVersion=${ASpellVersion:-"0.60.6.1"} ASpellSource="aspell-${ASpellVersion}" ASpellLibrary="libaspell.15.dylib" -HunSpellVersion=${HunSpellVersion:-"1.3.2"} +HunSpellVersion=${HunSpellVersion:-"1.3.3"} HunSpellSource="hunspell-${HunSpellVersion}" -HunSpellLibrary="libhunspell-1.3.0.dylib" +HunSpellLibrary="libhunspell-1.3.3.dylib" unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH @@ -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,23 @@ 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" + QtConfigureOptions="${QtConfigureOptions} -skip qttools" + QtConfigureOptions="${QtConfigureOptions} -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 +89,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 @@ -89,11 +106,11 @@ thesaurus_deployment="yes" qt_deployment="yes" # auto detect Xcode location -if [ -d "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs" ]; then - DEVELOPER_SDKS="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs" - XCODE_DEVELOPER="/Applications/Xcode.app/Contents/Developer" +DEVELOPER_SDKS=$(dirname $(xcrun --show-sdk-path)) +if [ -n "${DEVELOPER_SDKS}" ]; then + XCODE_DEVELOPER=$(dirname $(dirname $(xcrun --show-sdk-platform-path))) MACOSX_DEPLOYMENT_TARGET="10.7" # Lion support is default - SDKROOT="${DEVELOPER_SDKS}/MacOSX10.7.sdk" # Lion build is default + SDKROOT="${DEVELOPER_SDKS}/MacOSX$(xcrun --show-sdk-version).sdk" # use default SDK elif [ -d "/Developer/SDKs" ]; then DEVELOPER_SDKS="/Developer/SDKs" XCODE_DEVELOPER="/Developer" @@ -185,11 +202,12 @@ while [ $# -gt 0 ]; do export OBJC=gcc-4.0 export CXX=g++-4.0 ;; - 10.5|10.6|10.7|10.8) - SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk" - ;; *) - usage + SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk" + if [ ! -d "${SDKROOT}" ]; then + echo Invalid SDKROOT given: "${SDKROOT}" + usage --help=short + fi ;; esac shift @@ -250,6 +268,10 @@ while [ $# -gt 0 ]; do hunspell_deployment="no" shift ;; + --only-qt*=*) + QtOnlyPackage=$(echo ${1}|cut -d= -f2) + shift + ;; --only-package=*) LyxOnlyPackage=$(echo ${1}|cut -d= -f2) shift @@ -305,7 +327,7 @@ fi LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)} case "${LyXVersion}" in *dev*) - LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%H) + LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%h) ;; esac @@ -328,17 +350,21 @@ case "${QtVersion}" in QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore" QtFrameworkVersion="5" ;; -5*) +5.2.*|5.3.*|5.4.*) QtLibraries="QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore" QtFrameworkVersion="5" ;; +5*) + QtLibraries="QtSvg QtXml QtPrintSupport QtDBus QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore" + QtFrameworkVersion="5" + ;; *) QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore" QtFrameworkVersion="4" ;; esac -DMGNAME="${LyxBase}" +DMGNAME="${LyxBase}${LyXGitCommitHash:+-}${LyXGitCommitHash}" DMGSIZE="550m" # Check for existing SDKs @@ -368,7 +394,7 @@ case $SDKs in esac MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" -if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then +build_qt() { echo Build Qt library ${QtSourceDir} if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then echo Bad install directory for Qt. @@ -377,22 +403,34 @@ 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}" - make ${MAKEJOBS} && make install - ) - 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} - done + echo ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}" + "${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}" + make -j1 && make -j1 install ) -fi + 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 +y*) + build_qt + exit 0 + ;; +*) + if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then + build_qt + fi + ;; +esac if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then # we have a private libmagic (file(1)) source tree at hand... @@ -632,10 +670,6 @@ build_lyx() { CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}" LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}" - if [ -n "${LyXGitCommitHash}" ]; then - CPPFLAGS="${CPPFLAGS} -DLYX_GIT_COMMIT_HASH='${LyXGitCommitHash}'" - fi - if [ "$configure_qt_frameworks" = "yes" ]; then export QT_CORE_CFLAGS="-FQtCore" export QT_CORE_LIBS="-framework QtCore" @@ -675,6 +709,11 @@ content_directory() { echo "${content}" } +installname() { + echo install_name_tool "$@" + install_name_tool "$@" +} + private_framework() { fwdir=$(framework_name "$1") source="$2" @@ -684,11 +723,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() { @@ -721,16 +758,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}" @@ -740,8 +778,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}" @@ -793,6 +830,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" @@ -808,11 +864,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 } @@ -869,7 +927,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"