]> git.lyx.org Git - lyx.git/blobdiff - development/LyX-Mac-binary-release.sh
care for optional brackets around version string
[lyx.git] / development / LyX-Mac-binary-release.sh
index 2f8897fac51a7b55298576df5b9990b520b6748d..282822e7f5ad2fcd370876958c399ea8bf2cdd04 100644 (file)
@@ -5,14 +5,14 @@
 # This script automates creating universal binaries of LyX on Mac.
 # Author: Bennett Helm (and extended by Konrad Hofbauer)
 # latest changes by Stephan Witt
-# Last modified: July 2014
+# Last modified: February 2020
 
 QtAPI=${QtAPI:-"-cocoa"}
 QtVersion=${QtVersion:-"4.6.3"}
-QtSourceVersion="qt-everywhere-opensource-src-${QtVersion}"
+QtSourceVersion=${QtSourceVersion:-"qt-everywhere-opensource-src-${QtVersion}"}
 QtBuildSubDir="qt-${QtVersion}-build${QtAPI}"
 QtConfigureOptions=${QtConfigureOptions:-"-release"}
-
+QtSkipComponents=${QtSkipComponents:-"qtconnectivity qtscript qtquickcontrols qtmultimedia qtvirtualkeyboard qtwayland qtwebengine"}
 LibMagicVersion=${LibMagicVersion:-"5.19"}
 LibMagicSource="file-${LibMagicVersion}"
 LibMagicLibrary="libmagic.1.dylib"
@@ -79,9 +79,9 @@ case "${QtVersion}:${QtAPI}" in
        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"
-#      QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
+       for component in ${QtSkipComponents} ; do
+               QtConfigureOptions="${QtConfigureOptions} -skip ${component}"
+       done
        QtMajorVersion=qt5
        ;;
 *)
@@ -152,6 +152,7 @@ usage() {
        echo " --with-build-path=PATH ....." default \${lyx-src-dir}/../lyx-build
        echo " --with-dmg-location=PATH ..." default \${build-path}
        echo " --with-binary-strip=yes ...." default no
+       echo " --codesign-identity=CSID ..." default is w/o CSID
        echo
        echo "All other arguments with -- are passed to configure"
        echo "including the defaults: ${LyXConfigureOptions}"
@@ -212,6 +213,10 @@ while [ $# -gt 0 ]; do
                esac
                shift
                ;;
+       --codesign-identity=*)
+               CODESIGN_IDENTITY=$(echo "${1}"|cut -d= -f2)
+               shift
+               ;;
        --libmagic-deployment=*)
                libmagic_deployment=$(echo ${1}|cut -d= -f2)
                shift
@@ -327,7 +332,7 @@ DocumentationDir=$(dirname "${LyxSourceDir}")/Documents
 DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.png
 
 if [ -z "${LyXVersion}" ]; then
-       LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()")
+       LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " []()")
 fi
 LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)}
 case "${LyXVersion}" in
@@ -352,15 +357,19 @@ LyxAppPrefix="${LyxAppDir}.app"
 # don't change order here...
 case "${QtVersion}" in
 5.0.*|5.1.*)
-       QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+       QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
+       QtFrameworkVersion="5"
+       ;;
+5.12.*)
+       QtLibraries=${QtLibraries:-"QtDBus QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
 5*)
-       QtLibraries="QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+       QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
        QtFrameworkVersion="5"
        ;;
 *)
-       QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+       QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"}
        QtFrameworkVersion="4"
        ;;
 esac
@@ -437,7 +446,7 @@ if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
        # we have a private libmagic (file(1)) source tree at hand...
        # so let's build and install it
        if [ -z "${LibMagicVersion}" ]; then
-               LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+               LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
        fi
 
        LibMagicName="LibMagic"
@@ -498,7 +507,7 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
        # we have a private HunSpell source tree at hand...
        # so let's build and install it
        if [ -z "${HunSpellVersion}" ]; then
-               HunSpellVersion=$(grep AC_INIT "${HunSpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+               HunSpellVersion=$(grep AC_INIT "${HunSpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
        fi
 
        HunSpellName="Hunspell"
@@ -560,7 +569,7 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
        # we have a private ASpell source tree at hand...
        # so let's build and install it
        if [ -z "${ASpellVersion}" ]; then
-               ASpellVersion=$(grep AC_INIT "${ASpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+               ASpellVersion=$(grep AC_INIT "${ASpellSourceDir}"/configure.ac | cut -d, -f2|tr -d " []()")
        fi
 
        ASpellName="Aspell"
@@ -622,13 +631,17 @@ framework_name() {
        echo "Frameworks/${1}.framework"
 }
 
-LYX_FILE_LIST="lyx lyxclient tex2lyx"
+LYX_FILE_LIST="lyx lyxclient tex2lyx lyxconvert"
 BUNDLE_PATH="Contents/MacOS"
 LYX_BUNDLE_PATH="${LyxAppPrefix}/${BUNDLE_PATH}"
+
 build_lyx() {
        # Clear Output
        if [ -n "${LyxAppZip}" -a -f "${LyxAppZip}" ]; then rm "${LyxAppZip}"; fi
-       if [ -d "${LyxAppPrefix}" ]; then rm -rf "${LyxAppPrefix}"; fi
+       if [ -d "${LyxAppPrefix}" ]; then
+               find "${LyxAppPrefix}" -type d -exec chmod u+w '{}' \;
+               rm -rf "${LyxAppPrefix}"
+       fi
 
        case "${EnableCXX11}" in
        "--enable-cxx11")
@@ -704,7 +717,7 @@ build_lyx() {
                                mv "${LYX_BUNDLE_PATH}/${file}"\
                                        "${LYX_BUNDLE_PATH}/${file}-${arch}" 
                        else
-                               echo ERROR: Cannot build and install LyX for ${arch}.
+                               echo ERROR: Cannot build and install ${file} for ${arch}.
                                exit 1
                        fi
                done
@@ -720,21 +733,41 @@ content_directory() {
 
 installname() {
                echo install_name_tool "$@"
-               install_name_tool "$@"
+               install_name_tool "$@" || exit 1
 }
 
 private_framework() {
-       fwdir=$(framework_name "$1")
-       source="$2"
-       target="$3"
+       fwname="$1" ; shift
+       source="$1" ; shift
+       target="$1" ; shift
+       version=$(echo ${1:-"1.1.1"}.1.1.1 | cut -d. -f1-3) ; shift
+       fwdir=$(framework_name "${fwname}")
        condir=$(content_directory "${target}")
        libnm=$(basename "${source}")
-       mkdir -p "${condir}/${fwdir}"
-       if [ ! -f "${condir}/${fwdir}/${libnm}" ]; then
-               cp -p "${source}" "${condir}/${fwdir}"
-               installname -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
+       libid="org.lyx."$(echo "${libnm}" | cut -d. -f1)
+       svrsn=$(echo "${version}" | cut -d. -f1-2)
+       fwvrsn="1"
+       mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
+       mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Resources
+       if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}" ]; then
+               cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}"
+               for hfile in "$@" ; do
+                       test -f "${hfile}" && cp -p "${hfile}" "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
+               done
+               ln -s ${fwvrsn} "${condir}/${fwdir}/Versions/Current"
+               ln -s Versions/Current/Headers "${condir}/${fwdir}/Headers"
+               ln -s Versions/Current/Resources "${condir}/${fwdir}/Resources"
+               ln -s Versions/Current/"${fwname}" "${condir}/${fwdir}/${fwname}"
+               installname -id "@executable_path/../${fwdir}/${fwname}" "${condir}/${fwdir}/${fwname}"
+               if [ -f "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist ]; then
+                       cat "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist | sed \
+                               -e "s/@CFBundleExecutable@/${fwname}/" \
+                               -e "s/@CFBundleIdentifier@/${libid}/" \
+                               -e "s/@CFBundleShortVersionString@/${svrsn}/" \
+                               -e "s/@CFBundleVersion@/${version}/" > "${condir}/${fwdir}"/Resources/Info.plist
+               fi
        fi
-       installname -change "${source}" "@executable_path/../${fwdir}/${libnm}" "${target}"
+       installname -change "${source}" "@executable_path/../${fwdir}/${fwname}" "${target}"
 }
 
 deploy_qtlibs() {
@@ -767,6 +800,9 @@ EOF
                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
@@ -817,13 +853,16 @@ convert_universal() {
                        lipo -create ${OBJ_LIST} -o "${BUNDLE_PATH}/${file}"
                fi
                if [ -f "${LibMagicInstallDir}/lib/${LibMagicLibrary}" -a "yes" = "${libmagic_deployment}" ]; then
-                       private_framework LibMagic "${LibMagicInstallDir}/lib/${LibMagicLibrary}" "${LYX_BUNDLE_PATH}/${file}"
+                       private_framework LibMagic "${LibMagicInstallDir}/lib/${LibMagicLibrary}" "${LYX_BUNDLE_PATH}/${file}" \
+                               "${LibMagicVersion}" "${LibMagicInstallHdr}"
                fi
                if [ -f "${ASpellInstallDir}/lib/${ASpellLibrary}" -a "yes" = "${aspell_deployment}" ]; then
-                       private_framework Aspell "${ASpellInstallDir}/lib/${ASpellLibrary}" "${LYX_BUNDLE_PATH}/${file}"
+                       private_framework Aspell "${ASpellInstallDir}/lib/${ASpellLibrary}" "${LYX_BUNDLE_PATH}/${file}" \
+                               "${ASpellVersion}" "${ASpellInstallHdr}"
                fi
                if [ -f "${HunSpellInstallDir}/lib/${HunSpellLibrary}" -a "yes" = "${hunspell_deployment}" ]; then
-                       private_framework Hunspell "${HunSpellInstallDir}/lib/${HunSpellLibrary}" "${LYX_BUNDLE_PATH}/${file}"
+                       private_framework Hunspell "${HunSpellInstallDir}/lib/${HunSpellLibrary}" "${LYX_BUNDLE_PATH}/${file}" \
+                               "${HunSpellVersion}" "${HunSpellInstallDir}/include/hunspell/"*.hxx "${HunSpellInstallHdr}"
                fi
                if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt_deployment}" ]; then
                        deploy_qtlibs "${LYX_BUNDLE_PATH}/${file}"
@@ -837,8 +876,41 @@ convert_universal() {
                done
        done
        for arch in ${ARCH_LIST} ; do
-               rm -f ${BUNDLE_PATH}/*-${arch}
+               rm -f "${BUNDLE_PATH}"/*-${arch}
+       done
+}
+
+# -------------------------
+# Create code sign signatures
+# -------------------------
+code_sign() {
+       target="$1"
+       condir=$(content_directory "${target}"/lyx)
+       appdir=$(dirname "${condir}")
+       # have to sign frameworks first
+       for fwname in Aspell Hunspell LibMagic ; do
+               fwitem="${condir}"/$(framework_name "${fwname}")
+               if [ -d "${fwitem}" ]; then
+                       codesign --verbose --force --sign "${CODESIGN_IDENTITY}" "${fwitem}"
+               fi
        done
+       for csitem in \
+               "${condir}"/Frameworks/Qt*.framework/Versions/${QtFrameworkVersion} \
+               "${condir}"/PlugIns/*/lib*.dylib \
+               "${condir}"/Library/Spotlight/* \
+               "${target}"/inkscape \
+               "${target}"/maxima \
+               "${target}"/tex2lyx \
+               "${target}"/lyxeditor \
+               "${target}"/lyxconvert \
+               "${target}"/lyxclient
+       do
+               codesign --verbose --force --sign "${CODESIGN_IDENTITY}" "${csitem}"
+       done
+
+       /usr/bin/codesign --verbose --force --sign "${CODESIGN_IDENTITY}" "${appdir}" || {
+               echo Warning: codesign failed with certificate named '"'${CODESIGN_IDENTITY}'"'
+       }
 }
 
 deduplicate() {
@@ -942,28 +1014,27 @@ make_dmg() {
        test -d /Volumes/"${LyxBase}" && rmdir /Volumes/"${LyxBase}"
 
        # Mount the disk image
-       hdiutil attach "${DMGNAME}.sparseimage"
+       DEVICES=$(hdiutil attach "${DMGNAME}.sparseimage" | cut -f 1)
 
        # Obtain device information
-       DEVS=$(hdiutil attach "${DMGNAME}.sparseimage" | cut -f 1)
-       DEV=$(echo $DEVS | cut -f 1 -d ' ')
-       VOLUME=$(mount |grep ${DEV} | cut -f 3 -d ' ')
+       DEVICE=$(echo $DEVICES | cut -f 1 -d ' ')
+       VOLUME=$(mount |grep ${DEVICE} | cut -f 3 -d ' ')
 
        # copy in the application bundle
-       cp -Rp "${LyxAppDir}.app" "${VOLUME}/${LyxName}.app"
+       ditto --hfsCompression "${LyxAppPrefix}" "${VOLUME}/${LyxName}.app"
 
        # copy in background image
        mkdir -p "${VOLUME}/Pictures"
-       cp "${DmgBackground}" "${VOLUME}/Pictures/background.png"
+       ditto --hfsCompression "${DmgBackground}" "${VOLUME}/Pictures/background.png"
        # symlink applications
        ln -s /Applications/ "${VOLUME}"/Applications
-       test -d "${DocumentationDir}" && cp -r "${DocumentationDir}" "${VOLUME}"
+       test -d "${DocumentationDir}" && ditto --hfsCompression "${DocumentationDir}" "${VOLUME}"
        set_bundle_display_options "${VOLUME}" ${BG_W} ${BG_H}
-       ${XCODE_DEVELOPER}/Tools/SetFile -a C "${VOLUME}"
+       PATH="${XCODE_DEVELOPER}/Tools:$PATH" SetFile -a C "${VOLUME}"
        mv "${VOLUME}/Pictures" "${VOLUME}/.Pictures"
 
        # Unmount the disk image
-       hdiutil detach ${DEV}
+       hdiutil detach ${DEVICE}
 
        # Convert the disk image to read-only
        hdiutil convert "${DMGNAME}.sparseimage" -format UDBZ -o "${DMGNAME}.dmg"
@@ -1003,5 +1074,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 '{}' \;
 fi
 build_package