# 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"
HunSpellVersion=${HunSpellVersion:-"1.3.3"}
HunSpellSource="hunspell-${HunSpellVersion}"
-HunSpellLibrary="libhunspell-1.3.3.dylib"
+HunSpellLibrary="libhunspell-1.3.0.dylib"
unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
-QtMajorVersion=qt4
+QtMajorVersion=$(echo "${QtVersion}"|cut -d. -f1)
QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -confirm-license"
# stupid special case...
case "${QtVersion}:${QtAPI}" in
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.6*)
+5.6*|5.7*)
QtConfigureOptions="${QtConfigureOptions} -no-strip"
QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools"
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"
-# QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
- QtMajorVersion=qt5
+ for component in ${QtSkipComponents} ; do
+ QtConfigureOptions="${QtConfigureOptions} -skip ${component}"
+ done
;;
*)
QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions"
echo " --aspell-deployment=yes|no ." default yes
echo " --with-qt-frameworks=yes|no." default no
echo " --qt-deployment=yes|no ....." default yes
- echo " --with-macosx-target=TARGET " default 10.4 "(Tiger)"
echo " --with-sdkroot=SDKROOT ....." default 10.5 "(Leopard)"
echo " --with-arch=ARCH ..........." default ppc,i386
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}"
QTDIR=$(echo ${1}|cut -d= -f2)
shift
;;
- --with-macosx-target=*)
+ --with-macos-deployment-target=*)
MACOSX_DEPLOYMENT_TARGET=$(echo ${1}|cut -d= -f2)
+ LyXConfigureOptions="${LyXConfigureOptions} ${1}"
shift
;;
--with-sdkroot=*)
esac
shift
;;
+ --codesign-identity=*)
+ CODESIGN_IDENTITY=$(echo "${1}"|cut -d= -f2)
+ shift
+ ;;
--libmagic-deployment=*)
libmagic_deployment=$(echo ${1}|cut -d= -f2)
shift
aspell_deployment="no"
shift
;;
+ --with-included-hunspell)
+ LyXConfigureOptions="${LyXConfigureOptions} ${1}"
+ hunspell_deployment="no"
+ shift
+ ;;
--without-hunspell)
LyXConfigureOptions="${LyXConfigureOptions} ${1}"
hunspell_deployment="no"
+ hunspell_dictionaries="no"
shift
;;
--only-qt*=*)
LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
shift
;;
+ --enable-cxx11|--enable-cxx-mode=*)
+ EnableCXXMode="${1}"
+ shift
+ ;;
--*)
LyXConfigureOptions="${LyXConfigureOptions} ${1}"
shift
done
if [ "${configure_qt_frameworks}" != "yes" ]; then
- QtInstallDir=${QTDIR:-"/opt/qt4"}
+ QtInstallDir=${QTDIR}
fi
ARCH_LIST=${ARCH_LIST:-"ppc i386"}
DictionarySourceDir=${DICTIONARYDIR:-$(dirname "${LyxSourceDir}")/dictionaries}
DocumentationDir=$(dirname "${LyxSourceDir}")/Documents
-DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.png
+DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.tiff
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
# 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.2.*|5.3.*|5.4.*)
- QtLibraries="QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+5.1[2-5].*)
+ QtLibraries=${QtLibraries:-"QtDBus QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
QtFrameworkVersion="5"
;;
5*)
- QtLibraries="QtSvg QtXml QtPrintSupport QtDBus QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"
+ QtLibraries=${QtLibraries:-"QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
QtFrameworkVersion="5"
;;
+6*)
+ QtLibraries=${QtLibraries:-"QtDBus QtSvg QtXml QtPrintSupport QtSvgWidgets QtWidgets QtGui QtNetwork QtConcurrent QtCore"}
+ QtFrameworkVersion="A"
+ case "${EnableCXXMode}" in
+ --enable-cxx11|--enable-cxx-mode=11)
+ echo Warning: Adjust cxx standard "${EnableCXXMode}" for Qt 6. C++17 or better is required.
+ EnableCXXMode="--enable-cxx-mode=17"
+ ;;
+ esac
+ ;;
*)
- QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+ QtLibraries=${QtLibraries:-"QtSvg QtXml QtGui QtNetwork QtCore"}
QtFrameworkVersion="4"
;;
esac
DMGSIZE="550m"
# Check for existing SDKs
-SDKs=$(echo ${DEVELOPER_SDKS}/MacOSX10*sdk)
+SDKs=$(echo ${DEVELOPER_SDKS}/MacOSX1[01]*sdk)
case $SDKs in
*${SDKROOT}*)
;;
;;
esac
MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+MYLDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+
+case "${EnableCXXMode}" in
+--enable-cxx11|--enable-cxx-mode=11)
+ export CC=cc
+ export CXX="c++ -stdlib=libc++"
+ export CXXFLAGS=-std=c++11
+ LyXConfigureOptions="${LyXConfigureOptions} --enable-cxx-mode=11"
+ ;;
+--enable-cxx-mode=17)
+ export CC=cc
+ export CXX="c++ -stdlib=libc++"
+ export CXXFLAGS=-std=c++17
+ LyXConfigureOptions="${LyXConfigureOptions} ${EnableCXXMode}"
+ ;;
+esac
build_qt() {
echo Build Qt library ${QtSourceDir}
"${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
make -j1 && make -j1 install
)
- 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
# 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"
for arch in ${ARCH_LIST} ; do
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
- LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
+ LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"; export LDFLAGS
"${LibMagicSourceDir}/configure"\
--prefix="${LibMagicInstallDir}"\
${LibMagicConfigureOptions}
# 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"
for arch in ${ARCH_LIST} ; do
make distclean
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
- LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
+ LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"; export LDFLAGS
"${HunSpellSourceDir}/configure"\
--prefix="${HunSpellInstallDir}"\
${HunspellConfigureOptions}
# 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"
for arch in ${ARCH_LIST} ; do
make distclean
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
- LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
+ LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYLDFLAGS}"; export LDFLAGS
CXXFLAGS=-g "${ASpellSourceDir}/configure"\
--prefix="${ASpellInstallDir}"\
${AspellConfigureOptions}
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
# -------------------------------------
# Automate configure check
if [ -d "${LyxBuildDir}" ]; then rm -r "${LyxBuildDir}"; fi
mkdir -p "${LyxBuildDir}" && cd "${LyxBuildDir}"
- CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
- LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
+ CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"
+ LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch}"
if [ "$configure_qt_frameworks" = "yes" ]; then
export QT_CORE_CFLAGS="-FQtCore"
echo CPPFLAGS="${CPPFLAGS}"
export CPPFLAGS
echo CONFIGURE_OPTIONS="${LyXConfigureOptions}" ${QtInstallDir:+"--with-qt-dir=${QtInstallDir}"}
+ export PATH="${QtInstallDir}/libexec:$PATH"
"${LyxSourceDir}/configure"\
--prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\
${QtInstallDir:+"--with-qt-dir=${QtInstallDir}"} \
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
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() {
cp -p "${libname}" "${condir}/PlugIns/${dirname}"
done
fi
+ echo Copy frameworks ${QtLibraries} ...
for libnm in ${QtLibraries} ; do
fwdir=$(framework_name "$libnm")
dirname=$(dirname "${fwdir}")
mkdir -p "${condir}/${dirname}"
dirname=$(basename "${fwdir}")
- test -d "${condir}/${fwdir}" || (
- echo Copy framework "${source}/lib/"$(basename "${fwdir}")
- cp -pR "${source}/lib/"$(basename "${fwdir}") "${condir}/${fwdir}"
- 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*")"*)
- installname -change\
- "${source}/lib/${dirname}/${version}${libnm}"\
- "@executable_path/../${fwdir}/${version}${libnm}"\
- "${filename}"
- ;;
- esac
- done
- fi
- done
- )
- installname -change\
- "${source}/lib/${dirname}/${version}${libnm}"\
- "@executable_path/../${fwdir}/${version}${libnm}"\
- "${target}"
+ libpath="${source}/lib/${dirname}"
+ if [ -d "${libpath}" ]; then
+ test -d "${condir}/${fwdir}" || (
+ echo Copy framework "${libpath}"
+ cp -pR "${libpath}" "${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
+ 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*")"*)
+ installname -change\
+ "${source}/lib/${dirname}/${version}${libnm}"\
+ "@executable_path/../${fwdir}/${version}${libnm}"\
+ "${filename}"
+ ;;
+ esac
+ done
+ fi
+ done
+ )
+ installname -change\
+ "${source}/lib/${dirname}/${version}${libnm}"\
+ "@executable_path/../${fwdir}/${version}${libnm}"\
+ "${target}"
+ else
+ echo Warning: Cannot copy framework for "$libnm" ... missing source "${libpath}"
+ fi
done
if [ -d "${source}"/translations ]; then
if [ ! -d "${condir}/translations" ]; then
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}"
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}"/lilypond \
+ "${target}"/lilypond-book \
+ "${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() {
cp -p -r "${ASpellInstallDir}/lib/aspell-0.60"/* "${ASpellResources}"/data
cp -p -r "${ASpellInstallDir}/share/aspell"/* "${ASpellResources}"/dicts
fi
- if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_dictionaries}" ]; then
+ if [ -d "${DictionarySourceDir}" -a "yes" = "${hunspell_dictionaries}" ]; then
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
+ ( cd "${DictionarySourceDir}" && find dicts -name .svn -prune -o -type f -print | cpio -pmdv "${HunSpellResources}" )
+ deduplicate "${HunSpellResources}"/dicts
fi
if [ -d "${DictionarySourceDir}" -a "yes" = "${thesaurus_deployment}" ]; then
MyThesResources="${LyxAppPrefix}/Contents/Resources"
X_BOUNDS=$2
Y_BOUNDS=$3
Y_POSITION=$((Y_BOUNDS - 65))
- Y_BOUNDS=$((Y_BOUNDS + 20))
+ Y_BOUNDS=$((Y_BOUNDS + 50))
LYX_X_POSITION=$((X_BOUNDS / 4))
LYX_Y_POSITION=$Y_POSITION
APP_X_POSITION=$((3 * X_BOUNDS / 4))
EOF
}
+# The image was made with with inkscape and tiffutil from dmg-background.svgz
+make_image() {
+ INKSCAPE=/Applications/Inkscape.app/Contents/MacOS/inkscape
+ (
+ cd "${LyxSourceDir}"/development/MacOSX
+ test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 560 -o dmg-background.png dmg-background.svgz
+ test -x ${INKSCAPE} && ${INKSCAPE} --export-type=png -w 1120 -o dmg-background@2x.png dmg-background.svgz
+ tiffutil -cathidpicheck dmg-background.png dmg-background@2x.png -out dmg-background.tiff
+ )
+}
+
make_dmg() {
cd "${1}"
- BGSIZE=$(file "$DmgBackground" | awk -F , '/PNG/{print $2 }' | tr x ' ')
+ test -f "${DmgBackground}" || make_image
+ BGSIZE=$(file "$DmgBackground" | awk -F , '/TIFF/{ print $10 $4 ;}/PNG/{ print $2; }'|sed -e 's/width=//' -e 's/height=//' -e 's/x//')
BG_W=$(echo ${BGSIZE} | awk '{print $1 }')
BG_H=$(echo ${BGSIZE} | awk '{print $2 }')
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"
for arch in ${ARCH_LIST} ; do
DMGARCH="${DMGARCH}-${arch}"
done
- QtDmgArchSuffix=${QtMajorVersion}${DMGARCH}${QtAPI}.dmg
+ QtDmgArchSuffix="qt"${QtMajorVersion}${DMGARCH}${QtAPI}.dmg
test -n "${DMGLocation}" && (
make_dmg "${DMGLocation}"
build_lyx
convert_universal
copy_dictionaries
+ find "${LyxAppPrefix}" -type d -exec chmod go-w '{}' \;
+ test -n "${CODESIGN_IDENTITY}" && code_sign "${LYX_BUNDLE_PATH}"
fi
build_package
projects / lyx.git / blobdiff