Fix a bunch of warnings.

[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 6e6546993c75ff2cfd04ad574b50899eddc1d081..acde8c102871d3c3e035ff72314f11484ac2fd41 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -638,7 +638,10 @@ 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")
@@ -746,26 +749,25 @@ private_framework() {
        fwvrsn="1"
        mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
        mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Resources
-       if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}" ]; then
-               cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}"
+       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/"${libnm}" "${condir}/${fwdir}/${libnm}"
-               ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${fwname}"
-               installname -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
+               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@/${libnm}/" \
+                               -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() {
@@ -798,7 +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}/${version}${libnm}"_debug
+                       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
@@ -884,9 +888,14 @@ code_sign() {
        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}"/Frameworks/*.framework/lib*.dylib \
                "${condir}"/PlugIns/*/lib*.dylib \
                "${condir}"/Library/Spotlight/* \
                "${target}"/inkscape \
@@ -1012,7 +1021,7 @@ make_dmg() {
        VOLUME=$(mount |grep ${DEVICE} | cut -f 3 -d ' ')
 
        # copy in the application bundle
-       ditto --hfsCompression "${LyxAppDir}.app" "${VOLUME}/${LyxName}.app"
+       ditto --hfsCompression "${LyxAppPrefix}" "${VOLUME}/${LyxName}.app"
 
        # copy in background image
        mkdir -p "${VOLUME}/Pictures"
@@ -1064,7 +1073,8 @@ build_package() {
 if [ ${LyxOnlyPackage:-"no"} = "no" ]; then
        build_lyx
        convert_universal
-       test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
        copy_dictionaries
+       test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
+       find "${LyxAppPrefix}" -type d -exec chmod a-w '{}' \;
 fi
 build_package