HunSpellSource="hunspell-${HunSpellVersion}"
HunSpellLibrary="libhunspell-1.3.0.dylib"
-LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
-
unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
# Prerequisite:
# 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
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"
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
;;
*)
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
export OBJC=gcc-4.0
export CXX=g++-4.0
;;
- 10.5|10.6|10.7|10.8)
+ 10.5|10.6|10.7|10.8|10.9|10.10)
SDKROOT="${DEVELOPER_SDKS}/MacOSX${SDKROOT}.sdk"
;;
*)
LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build}
DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
+LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
+
LibMagicSourceDir=${LIBMAGICDIR:-$(dirname "${LyxSourceDir}")/${LibMagicSource}}
LibMagicBuildDir="${LyxBuildDir}"/"${LibMagicSource}"
LibMagicInstallDir=${LibMagicInstallDir:-"${LyXUtilitiesDir}"}
LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()")
fi
LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)}
+case "${LyXVersion}" in
+*dev*)
+ LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%h)
+ ;;
+esac
LyxName="LyX"
LyxBase="${LyxName}-${LyXVersion}"
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
esac
MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
-# pkg-config is not usable with this script
-export PKG_CONFIG=""
-
-# These variables define the identifiers of the
-# system (both Intel and PowerPC) to compile for.
-# (Note: darwin8 is 10.4; darwin9 is 10.5.)
-# Only change these if necessary
-
-HostSystem_i386="i686-apple-darwin8"
-HostSystem_ppc="powerpc-apple-darwin8"
-
if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then
echo Build Qt library ${QtSourceDir}
if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
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
+ 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}
+ test -d ${libnm} -o -L ${libnm} || \
+ ( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} )
done
)
fi
for arch in ${ARCH_LIST} ; do
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
- HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
"${LibMagicSourceDir}/configure"\
--prefix="${LibMagicInstallDir}"\
${LibMagicConfigureOptions}
(
cd "${LibMagicInstallDir}"
lipo -create ${OBJ_LIST} -o lib/${file}
+ # check for the "missing link"...
+ test -f lib/libmagic.dylib || (cd lib ; ln -s "${LibMagicLibrary}" libmagic.dylib)
)
done
# --------
make distclean
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
- HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
"${HunSpellSourceDir}/configure"\
--prefix="${HunSpellInstallDir}"\
${HunspellConfigureOptions}
make distclean
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
- HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
CXXFLAGS=-g "${ASpellSourceDir}/configure"\
--prefix="${ASpellInstallDir}"\
${AspellConfigureOptions}
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
- HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
if [ "$configure_qt_frameworks" = "yes" ]; then
export QT_CORE_CFLAGS="-FQtCore"
echo "${content}"
}
+installname() {
+ echo install_name_tool "$@"
+ install_name_tool "$@"
+}
+
private_framework() {
fwdir=$(framework_name "$1")
source="$2"
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() {
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}"
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}"
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"
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
}
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"
projects / lyx.git / blobdiff