X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FLyX-Mac-binary-release.sh;h=059d56d8f84d01335ca8c20bbbb26d0fc0f21031;hb=e4842c77d6e210919d00c103e1d33f973ac96033;hp=0c027c7a2c6a39d616417f8045a4c049bf86cdce;hpb=c235e733017245b8366ccf53957fc46a2cf62647;p=lyx.git

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 0c027c7a2c..059d56d8f8 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -5,45 +5,118 @@
 # 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: August 2012
+# Last modified: July 2014
 
-MAC_API=-cocoa
-Qt4Version=${Qt4Version:-"4.6.3"}
-Qt4SourceVersion="qt-everywhere-opensource-src-${Qt4Version}"
-Qt4BuildSubDir="qt-${Qt4Version}-build${MAC_API}"
+QtAPI=${QtAPI:-"-cocoa"}
+QtVersion=${QtVersion:-"4.6.3"}
+QtSourceVersion="qt-everywhere-opensource-src-${QtVersion}"
+QtBuildSubDir="qt-${QtVersion}-build${QtAPI}"
+QtConfigureOptions=${QtConfigureOptions:-"-release"}
+
+LibMagicVersion=${LibMagicVersion:-"5.19"}
+LibMagicSource="file-${LibMagicVersion}"
+LibMagicLibrary="libmagic.1.dylib"
+
+ASpellVersion=${ASpellVersion:-"0.60.6.1"}
+ASpellSource="aspell-${ASpellVersion}"
+ASpellLibrary="libaspell.15.dylib"
+
+HunSpellVersion=${HunSpellVersion:-"1.3.2"}
+HunSpellSource="hunspell-${HunSpellVersion}"
+HunSpellLibrary="libhunspell-1.3.0.dylib"
+
+unset DYLD_LIBRARY_PATH LD_LIBRARY_PATH
 
 # Prerequisite:
 # * a decent checkout of LyX sources (probably you have it already)
-# * Qt4 - build with shared or static libraries for the used platforms (default: i386 and ppc)
-#    or - an unpacked source tree of Qt4 in $QT4SOURCEDIR or in the sibling directory (variable Qt4SourceVersion)
+# * Qt - build with shared or static libraries for the used platforms (default: i386 and ppc)
+#   or - an unpacked source tree of Qt in $QTSOURCEDIR or in the sibling directory (variable QtSourceVersion)
 # * for aspell support:
-#   the aspell sources placed in a sibling directory (variable ASpellSourceVersion)
+#   the aspell sources placed in a sibling directory (variable ASpellSource)
 # * for hunspell support:
-#   the hunspell sources placed in a sibling directory (variable HunSpellSourceVersion)
-# * for dictionary deployment (per default thesauri only):
+#   the hunspell sources placed in a sibling directory (variable HunSpellSource)
+# * 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
+# * for magic file type detection support:
+#   the libmagic sources placed in a sibling directory (variable LibMagicSource)
 
-LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-included-gettext --with-x=no"
+LyXConfigureOptions="--enable-warnings --enable-optimization=-Os --with-x=no"
+LyXConfigureOptions="${LyXConfigureOptions} --disable-stdlib-debug"
 AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
-HunspellConfigureOptions="--with-warnings --disable-nls --with-included-gettext --disable-static"
-Qt4ConfigureOptions="-opensource -silent -shared -release -fast -no-exceptions"
-Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
-Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
-Qt4ConfigureOptions="${Qt4ConfigureOptions} ${MAC_API}"
+HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
+
+QtMajorVersion=qt4
+QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -confirm-license"
+# stupid special case...
+case "${QtVersion}:${QtAPI}" in
+4.6*:-carbon)
+	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} -no-javascript-jit -no-pkg-config"
+	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"
+#	QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
+	QtMajorVersion=qt5
+	;;
+*)
+	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"
+	QtConfigureOptions="${QtConfigureOptions} ${QtAPI}"
+	for arch in ${ARCH_LIST} ; do
+		QTARCHS="${QTARCHS} -arch ${arch}"
+	done
+	;;
+esac
 
 aspell_dictionaries="no"
 hunspell_dictionaries="yes"
 
+libmagic_deployment="yes"
 aspell_deployment="yes"
 hunspell_deployment="yes"
 thesaurus_deployment="yes"
 
-qt4_deployment="yes"
-
-MACOSX_DEPLOYMENT_TARGET="10.4" # Tiger support is default
-SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" # Leopard build is default
+qt_deployment="yes"
+
+# auto detect Xcode location
+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}/MacOSX$(xcrun --show-sdk-version).sdk" # use default SDK
+elif [ -d "/Developer/SDKs" ]; then
+	DEVELOPER_SDKS="/Developer/SDKs"
+	XCODE_DEVELOPER="/Developer"
+	MACOSX_DEPLOYMENT_TARGET="10.4" # Tiger support is default
+	SDKROOT="${DEVELOPER_SDKS}/MacOSX10.5.sdk" # Leopard build is default
+fi
 
 # detection of script home
 LyxSourceDir=$(dirname "$0")
@@ -71,36 +144,48 @@ usage() {
 	echo
 	echo Optional arguments:
 	echo " --aspell-deployment=yes|no ." default yes
-	echo " --with-qt4-frameworks=yes|no" default no
-	echo " --qt4-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
 	echo "All other arguments with -- are passed to configure"
 	echo "including the defaults: ${LyXConfigureOptions}"
-	if [ -x "${LyxSourceDir}/configure" ]; then
-		echo
-		echo "*" Configure options of LyX
-		echo
-		"${LyxSourceDir}/configure" --help
-	fi
+	case "${1}" in
+	--help=short)
+		;;
+	*)
+		if [ -x "${LyxSourceDir}/configure" ]; then
+			echo
+			echo "*" Configure options of LyX
+			echo
+			"${LyxSourceDir}/configure" --help
+		fi
+	esac
 	exit 0
 }
 
+NCPU=$(sysctl -n hw.ncpu)
+NCPU=$((NCPU / 2))
+if [ $NCPU -gt 1 ]; then
+	MAKEJOBS=-j${NCPU}
+fi
+
 while [ $# -gt 0 ]; do
 	case "${1}" in
-	--with-qt4-frameworks=*)
-		configure_qt4_frameworks=$(echo ${1}|cut -d= -f2)
-		if [ "$configure_qt4_frameworks" = "yes" ]; then
+	--with-qt-frameworks=*)
+		configure_qt_frameworks=$(echo ${1}|cut -d= -f2)
+		if [ "$configure_qt_frameworks" = "yes" ]; then
 			unset QTDIR
-			qt4_deployment="no"
+			qt_deployment="no"
 		fi
 		shift
 		;;
-	--with-qt4-dir=*)
+	--with-qt-dir=*)
 		QTDIR=$(echo ${1}|cut -d= -f2)
 		shift
 		;;
@@ -112,20 +197,25 @@ while [ $# -gt 0 ]; do
 		SDKROOT=$(echo ${1}|cut -d= -f2)
 		case "${SDKROOT}" in
 		10.4)
-			SDKROOT="/Developer/SDKs/MacOSX10.4u.sdk"
+			SDKROOT="${DEVELOPER_SDKS}/MacOSX10.4u.sdk"
 			export CC=gcc-4.0
 			export OBJC=gcc-4.0
 			export CXX=g++-4.0
 			;;
-		10.5|10.6)
-			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
 		;;
+	--libmagic-deployment=*)
+		libmagic_deployment=$(echo ${1}|cut -d= -f2)
+		shift
+		;;
 	--aspell-deployment=*)
 		aspell_deployment=$(echo ${1}|cut -d= -f2)
 		aspell_dictionaries=$aspell_deployment
@@ -140,8 +230,8 @@ while [ $# -gt 0 ]; do
 		thesaurus_deployment=$(echo ${1}|cut -d= -f2)
 		shift
 		;;
-	--qt4-deployment=*)
-		qt4_deployment=$(echo ${1}|cut -d= -f2)
+	--qt-deployment=*)
+		qt_deployment=$(echo ${1}|cut -d= -f2)
 		shift
 		;;
 	--with-arch=*)
@@ -153,12 +243,20 @@ while [ $# -gt 0 ]; do
 		DMGLocation=$(echo ${1}|cut -d= -f2)
 		shift
 		;;
+	--with-binary-strip=yes)
+		strip="-strip"
+		shift
+		;;
 	--with-build-path=*)
 		LyxBuildDir=$(echo ${1}|cut -d= -f2)
 		shift
 		;;
+	--with-util-dir=*)
+		LyXUtilitiesDir=$(echo ${1}|cut -d= -f2)
+		shift
+		;;
 	--help|--help=*)
-		usage
+		usage "${1}"
 		;;
 	--without-aspell)
 		LyXConfigureOptions="${LyXConfigureOptions} ${1}"
@@ -170,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
@@ -184,38 +286,50 @@ while [ $# -gt 0 ]; do
 	esac
 done
 
-if [ "${configure_qt4_frameworks}" != "yes" ]; then
+if [ "${configure_qt_frameworks}" != "yes" ]; then
 	QtInstallDir=${QTDIR:-"/opt/qt4"}
 fi
-QtFrameworkVersion="4"
-ASpellSourceVersion="aspell-0.60.6"
-HunSpellSourceVersion="hunspell-1.2.12"
 
 ARCH_LIST=${ARCH_LIST:-"ppc i386"}
 
-strip="-strip"
 aspellstrip=
 
 LyxBuildDir=${LyxBuildDir:-$(dirname "${LyxSourceDir}")/lyx-build}
 DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
 
-ASpellSourceDir=${ASPELLDIR:-$(dirname "${LyxSourceDir}")/${ASpellSourceVersion}}
-ASpellInstallDir=${ASpellInstallDir:-"${LyxBuildDir}"/SpellChecker.lib}
-HunSpellSourceDir=${HUNSPELLDIR:-$(dirname "${LyxSourceDir}")/${HunSpellSourceVersion}}
-HunSpellInstallDir=${HunSpellInstallDir:-"${LyxBuildDir}"/SpellChecker.lib}
-Qt4SourceDir=${QT4SOURCEDIR:-$(dirname "${LyxSourceDir}")/${Qt4SourceVersion}}
-Qt4BuildDir=${Qt4BuildDir:-"${LyxBuildDir}"/${Qt4BuildSubDir:-"qt4-build"}}
-DictionarySourceDir=${DICTIONARYDIR:-$(dirname "${LyxSourceDir}")/dictionaries}
-DocumentationDir=$(dirname "${LyxSourceDir}")/Documents
-DmgBackground="${LyxSourceDir}"/development/MacOSX/dmg-background.png
+LyXUtilitiesDir=${LyXUtilitiesDir:-"${LyxBuildDir}"/utilities}
 
+LibMagicSourceDir=${LIBMAGICDIR:-$(dirname "${LyxSourceDir}")/${LibMagicSource}}
+LibMagicBuildDir="${LyxBuildDir}"/"${LibMagicSource}"
+LibMagicInstallDir=${LibMagicInstallDir:-"${LyXUtilitiesDir}"}
+LibMagicInstallHdr="${LibMagicInstallDir}/include/magic.h"
+
+ASpellSourceDir=${ASPELLDIR:-$(dirname "${LyxSourceDir}")/${ASpellSource}}
+ASpellBuildDir="${ASpellSourceDir}"
+ASpellInstallDir=${ASpellInstallDir:-"${LyXUtilitiesDir}"}
 ASpellInstallHdr="${ASpellInstallDir}/include/aspell.h"
+
+HunSpellSourceDir=${HUNSPELLDIR:-$(dirname "${LyxSourceDir}")/${HunSpellSource}}
+HunSpellBuildDir="${HunSpellSourceDir}"
+HunSpellInstallDir=${HunSpellInstallDir:-"${LyXUtilitiesDir}"}
 HunSpellInstallHdr="${HunSpellInstallDir}/include/hunspell/hunspell.h"
 
+QtSourceDir=${QTSOURCEDIR:-$(dirname "${LyxSourceDir}")/${QtSourceVersion}}
+QtBuildDir=${QtBuildDir:-"${LyxBuildDir}"/${QtBuildSubDir:-"qt-build"}}
+
+DictionarySourceDir=${DICTIONARYDIR:-$(dirname "${LyxSourceDir}")/dictionaries}
+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 " ()")
 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}"
@@ -231,30 +345,47 @@ LyxAppPrefix="${LyxAppDir}.app"
 # ---------------------------------
 
 # don't change order here...
-QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
+case "${QtVersion}" in
+5.0.*|5.1.*)
+	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"
+	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
-SDKs=$(echo /Developer/SDKs/MacOSX10*sdk)
-case "$SDKs" in
-${SDKROOT})
+SDKs=$(echo ${DEVELOPER_SDKS}/MacOSX10*sdk)
+case $SDKs in
+*${SDKROOT}*)
 	;;
 *10.6*)
 	MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.5"}; export MACOSX_DEPLOYMENT_TARGET
 	case "${MACOSX_DEPLOYMENT_TARGET}" in
 	10.6)
-		SDKROOT="/Developer/SDKs/MacOSX10.6.sdk"; export SDKROOT
+		SDKROOT="${DEVELOPER_SDKS}/MacOSX10.6.sdk"; export SDKROOT
 		;;
 	10.5|10.4)
-		SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
+		SDKROOT=${SDKROOT:-"${DEVELOPER_SDKS}/MacOSX10.5.sdk"}; export SDKROOT
 		;;
 	esac
 	;;
 *10.5*)
 	MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-"10.4"}; export MACOSX_DEPLOYMENT_TARGET
-	SDKROOT=${SDKROOT:-"/Developer/SDKs/MacOSX10.5.sdk"}; export SDKROOT
+	SDKROOT=${SDKROOT:-"${DEVELOPER_SDKS}/MacOSX10.5.sdk"}; export SDKROOT
 	;;
 *)
 	echo Unknown or missing SDK for Mac OS X.
@@ -263,38 +394,103 @@ ${SDKROOT})
 esac
 MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
 
-# 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_qt4_frameworks}" != "yes" -a -d "${Qt4SourceDir}" -a ! \( -d "${Qt4BuildDir}" -a -d "${QtInstallDir}" \) ]; then
-	echo Build Qt4 library ${Qt4SourceDir}
-	if [ "${QtInstallDir}" = "${Qt4BuildDir}" ]; then
+build_qt() {
+	echo Build Qt library ${QtSourceDir}
+	if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
 		echo Bad install directory for Qt.
-		echo Must be different from build directory "${Qt4BuildDir}".
+		echo Must be different from build directory "${QtBuildDir}".
 		exit 1
 	fi
 	(
-		mkdir -p "${Qt4BuildDir}" && cd "${Qt4BuildDir}"
-		for arch in ${ARCH_LIST} ; do
-			ARCHS="${ARCHS} -arch ${arch}"
-		done
+		mkdir -p "${QtBuildDir}" && cd "${QtBuildDir}"
 		echo configure options:
-		echo ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-		echo yes | "${Qt4SourceDir}"/configure ${Qt4ConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-		make && make install
+		echo ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
+		"${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
+		make -j1 && make -j1 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}
+	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...
+	# so let's build and install it
+	if [ -z "${LibMagicVersion}" ]; then
+		LibMagicVersion=$(grep AC_INIT "${LibMagicSourceDir}"/configure.ac | cut -d, -f2|tr -d " ()")
+	fi
+
+	LibMagicName="LibMagic"
+	LibMagicBase="${LibMagicName}-${LibMagicVersion}"
+
+	echo Build libmagic library ${LibMagicBase}
+	echo configure options:
+	echo --prefix="${LibMagicInstallDir}" ${LibMagicConfigureOptions}
+
+	mkdir -p "${LibMagicBuildDir}" && cd "${LibMagicBuildDir}"
+
+	# ----------------------------------------
+	# Build LibMagic for different architectures
+	# ----------------------------------------
+	FILE_LIST="${LibMagicLibrary}"
+
+	for arch in ${ARCH_LIST} ; do
+		CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export CPPFLAGS
+		LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"; export LDFLAGS
+		"${LibMagicSourceDir}/configure"\
+			--prefix="${LibMagicInstallDir}"\
+			${LibMagicConfigureOptions}
+		make && make install${strip}
+		for file in ${FILE_LIST} ; do
+			if [ -f "${LibMagicInstallDir}"/lib/${file} ]; then
+				mv "${LibMagicInstallDir}"/lib/${file}\
+					"${LibMagicInstallDir}"/lib/${file}-${arch} 
+			else
+				echo Cannot build and install LibMagic for ${arch}.
+				exit 1
+			fi
 		done
-	)
+	done
+	# -------------------------
+	# Create universal binaries
+	# -------------------------
+	for file in ${FILE_LIST} ; do
+		OBJ_LIST=
+		for arch in ${ARCH_LIST} ; do
+			OBJ_LIST="${OBJ_LIST} lib/${file}-${arch}"
+		done
+		(
+			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
+	# --------
+	# Clean up
+	# --------
+	for arch in ${ARCH_LIST} ; do
+		rm -f "${LibMagicInstallDir}"/lib/*-${arch}
+	done
 fi
 
 if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
@@ -311,18 +507,17 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
 	echo configure options:
 	echo --prefix="${HunSpellInstallDir}" ${HunspellConfigureOptions}
 
-	cd "${HunSpellSourceDir}"
+	mkdir -p "${HunSpellBuildDir}" && cd "${HunSpellBuildDir}"
 
 	# ----------------------------------------
 	# Build HunSpell for different architectures
 	# ----------------------------------------
-	FILE_LIST="libhunspell-1.2.0.dylib"
+	FILE_LIST="${HunSpellLibrary}"
 
 	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
-		HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
 		"${HunSpellSourceDir}/configure"\
 			--prefix="${HunSpellInstallDir}"\
 			${HunspellConfigureOptions}
@@ -349,7 +544,7 @@ if [ -d "${HunSpellSourceDir}" -a ! -f "${HunSpellInstallHdr}" ]; then
 			cd "${HunSpellInstallDir}"
 			lipo -create ${OBJ_LIST} -o lib/${file}
 			# check for the "missing link"...
-			test -f lib/libhunspell.dylib || (cd lib ; ln -s libhunspell-1.2.dylib libhunspell.dylib)
+			test -f lib/libhunspell.dylib || (cd lib ; ln -s "${HunSpellLibrary}" libhunspell.dylib)
 		)
 	done
 	# --------
@@ -380,13 +575,12 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
 	# ----------------------------------------
 	# Build ASpell for different architectures
 	# ----------------------------------------
-	FILE_LIST="libaspell.15.dylib"
+	FILE_LIST="${ASpellLibrary}"
 
 	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
-		HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
 		CXXFLAGS=-g "${ASpellSourceDir}/configure"\
 			--prefix="${ASpellInstallDir}"\
 			${AspellConfigureOptions}
@@ -475,14 +669,12 @@ build_lyx() {
 
 		CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
 		LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
-		HOSTSYSTEM=$(eval "echo \\$HostSystem_$arch")
-
-		if [ "$configure_qt4_frameworks" = "yes" ]; then
-			export QT4_CORE_CFLAGS="-FQtCore"
-			export QT4_CORE_LIBS="-framework QtCore"
-			export QT4_FRONTEND_CFLAGS="-FQtGui"
-			export QT4_FRONTEND_LIBS="-framework QtGui"
-			export PKG_CONFIG=""
+
+		if [ "$configure_qt_frameworks" = "yes" ]; then
+			export QT_CORE_CFLAGS="-FQtCore"
+			export QT_CORE_LIBS="-framework QtCore"
+			export QT_FRONTEND_CFLAGS="-FQtGui"
+			export QT_FRONTEND_LIBS="-framework QtGui"
 			CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtCore.framework/Headers"
 			CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtGui.framework/Headers"
 		fi
@@ -491,13 +683,13 @@ build_lyx() {
 		export LDFLAGS
 		echo CPPFLAGS="${CPPFLAGS}"
 		export CPPFLAGS
-		echo CONFIGURE_OPTIONS="${LyXConfigureOptions}" ${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"}
+		echo CONFIGURE_OPTIONS="${LyXConfigureOptions}" ${QtInstallDir:+"--with-qt-dir=${QtInstallDir}"}
 		"${LyxSourceDir}/configure"\
 			--prefix="${LyxAppPrefix}" --with-version-suffix="-${LyXVersionSuffix}"\
-			${QtInstallDir:+"--with-qt4-dir=${QtInstallDir}"} \
+			${QtInstallDir:+"--with-qt-dir=${QtInstallDir}"} \
 			${LyXConfigureOptions}\
 			--enable-build-type=rel && \
-		make -j2 && make install${strip}
+		make ${MAKEJOBS} && make install${strip}
 		for file in ${LYX_FILE_LIST} ; do
 			if [ -f "${LYX_BUNDLE_PATH}/${file}" ]; then
 				mv "${LYX_BUNDLE_PATH}/${file}"\
@@ -517,6 +709,11 @@ content_directory() {
 	echo "${content}"
 }
 
+installname() {
+		echo install_name_tool "$@"
+		install_name_tool "$@"
+}
+
 private_framework() {
 	fwdir=$(framework_name "$1")
 	source="$2"
@@ -526,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() {
@@ -546,7 +741,7 @@ Translations = translations
 EOF
 	if [ ! -d "${condir}/PlugIns" ]; then
 		mkdir -p "${condir}/PlugIns"
-		find "${source}/plugins" -name \*.dylib -print | while read libname ; do
+		find "${source}/plugins" -name \*.dylib -print | grep -v _debug.dylib | while read libname ; do
 			echo Copy plugin "${libname}"
 			dylib=$(basename "${libname}")
 			dirname=$(dirname "${libname}")
@@ -563,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/qt4/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.6.0, current version 4.6.2)
+						# 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}"
@@ -582,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}"
@@ -610,13 +805,16 @@ convert_universal() {
 		if [ -n "${OBJ_LIST}" ]; then
 			lipo -create ${OBJ_LIST} -o "${BUNDLE_PATH}/${file}"
 		fi
-		if [ -d "${ASpellInstallDir}" -a "yes" = "${aspell_deployment}" ]; then
-			private_framework Aspell "${ASpellInstallDir}/lib/libaspell.15.dylib" "${LYX_BUNDLE_PATH}/${file}"
+		if [ -f "${LibMagicInstallDir}/lib/${LibMagicLibrary}" -a "yes" = "${libmagic_deployment}" ]; then
+			private_framework LibMagic "${LibMagicInstallDir}/lib/${LibMagicLibrary}" "${LYX_BUNDLE_PATH}/${file}"
+		fi
+		if [ -f "${ASpellInstallDir}/lib/${ASpellLibrary}" -a "yes" = "${aspell_deployment}" ]; then
+			private_framework Aspell "${ASpellInstallDir}/lib/${ASpellLibrary}" "${LYX_BUNDLE_PATH}/${file}"
 		fi
-		if [ -d "${HunSpellInstallDir}" -a "yes" = "${hunspell_deployment}" ]; then
-			private_framework Hunspell "${HunSpellInstallDir}/lib/libhunspell-1.2.0.dylib" "${LYX_BUNDLE_PATH}/${file}"
+		if [ -f "${HunSpellInstallDir}/lib/${HunSpellLibrary}" -a "yes" = "${hunspell_deployment}" ]; then
+			private_framework Hunspell "${HunSpellInstallDir}/lib/${HunSpellLibrary}" "${LYX_BUNDLE_PATH}/${file}"
 		fi
-		if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then
+		if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt_deployment}" ]; then
 			deploy_qtlibs "${LYX_BUNDLE_PATH}/${file}"
 		fi
 		otool -L "${BUNDLE_PATH}/${file}" | while read reference ; do
@@ -632,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"
@@ -647,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
 }
 
@@ -664,6 +883,7 @@ set_bundle_display_options() {
 	LYX_Y_POSITION=$Y_POSITION
 	APP_X_POSITION=$((3 * X_BOUNDS / 4))
 	APP_Y_POSITION=$Y_POSITION
+	WITH_DOCUMENTS=$(test -d "${1}/Documents" && echo true || echo false)
 	osascript <<-EOF
 	tell application "Finder"
         set f to POSIX file ("${1}" as string) as alias
@@ -679,11 +899,13 @@ set_bundle_display_options() {
             delay 1 -- sync
             set icon size of the icon view options of container window to 64
             set arrangement of the icon view options of container window to not arranged
-            set position of item "Documents" to {$LYX_X_POSITION,0}
+            if ${WITH_DOCUMENTS} then
+               set position of item "Documents" to {$LYX_X_POSITION,0}
+            end if
             set position of item "${LyxName}.app" to {$LYX_X_POSITION,$LYX_Y_POSITION}
             set position of item "Applications" to {$APP_X_POSITION,$APP_Y_POSITION}
             set background picture of the icon view options\
-					of container window to file "background.png" of folder "Pictures"
+               of container window to file "background.png" of folder "Pictures"
             set the bounds of the container window to {0, 0, $X_BOUNDS, $Y_BOUNDS}
             update without registering applications
             delay 5 -- sync
@@ -705,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"
@@ -725,7 +948,7 @@ make_dmg() {
 	ln -s /Applications/ "${VOLUME}"/Applications
 	test -d "${DocumentationDir}" && cp -r "${DocumentationDir}" "${VOLUME}"
 	set_bundle_display_options "${VOLUME}" ${BG_W} ${BG_H}
-	/Developer/Tools/SetFile -a C "${VOLUME}"
+	${XCODE_DEVELOPER}/Tools/SetFile -a C "${VOLUME}"
 	mv "${VOLUME}/Pictures" "${VOLUME}/.Pictures"
 
 	# Unmount the disk image
@@ -745,12 +968,18 @@ build_package() {
 		cd "${LyxAppPrefix}" && zip -r "${LyxAppZip}" .
 	)
 
+	DMGARCH=""
+	for arch in ${ARCH_LIST} ; do
+		DMGARCH="${DMGARCH}-${arch}"
+	done
+	QtDmgArchSuffix=${QtMajorVersion}${DMGARCH}${QtAPI}.dmg
+
 	test -n "${DMGLocation}" && (
 		make_dmg "${DMGLocation}"
-		if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then
-			rm -f "${DMGLocation}/${DMGNAME}+qt4.dmg"
-			echo move to "${DMGLocation}/${DMGNAME}+qt4${MAC_API}.dmg"
-			mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+qt4${MAC_API}.dmg"
+		if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt_deployment}" ]; then
+			rm -f "${DMGLocation}/${DMGNAME}+${QtDmgArchSuffix}"
+			echo move to "${DMGLocation}/${DMGNAME}+${QtDmgArchSuffix}"
+			mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+${QtDmgArchSuffix}"
 		fi
 	)
 }