X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FLyX-Mac-binary-release.sh;h=18b7285ba306ebb2067af56c2bc83303eae96a2a;hb=13b1277cd2f22bca7b4dec40eb6ca762b7d6fafe;hp=3ac7050e626b0631a7649569c898ace506758458;hpb=2ef64f72bd453840a2ce7afe9840edee88fd4303;p=lyx.git

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 3ac7050e62..18b7285ba3 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -45,8 +45,29 @@ qt4_deployment="yes"
 MACOSX_DEPLOYMENT_TARGET="10.4" # Tiger support is default
 SDKROOT="/Developer/SDKs/MacOSX10.5.sdk" # Leopard build is default
 
+# detection of script home
+LyxSourceDir=`dirname "$0"`
+if [ ! -d "${LyxSourceDir}" ]; then
+	echo Missing LyX source directory.
+	exit 2
+fi
+case "${LyxSourceDir}" in
+/*/development)
+	LyxSourceDir=`dirname "${LyxSourceDir}"`
+	;;
+/*)
+	;;
+*/development|development)
+	LyxSourceDir=`dirname "${LyxSourceDir}"`
+	LyxSourceDir=`cd "${LyxSourceDir}";pwd`
+	;;
+*)
+	LyxSourceDir=`cd "${LyxSourceDir}";pwd`
+	;;
+esac
+
 usage() {
-	echo Build script for LyX on Mac OS X
+	echo "*" Build script for LyX on Mac OS X
 	echo
 	echo Optional arguments:
 	echo " --aspell-deployment=yes|no ." default yes
@@ -60,7 +81,12 @@ usage() {
 	echo
 	echo "All other arguments with -- are passed to configure"
 	echo "including the defaults: ${LyXConfigureOptions}"
-	echo
+	if [ -x "${LyxSourceDir}/configure" ]; then
+		echo
+		echo "*" Configure options of LyX
+		echo
+		"${LyxSourceDir}/configure" --help
+	fi
 	exit 0
 }
 
@@ -131,7 +157,7 @@ while [ $# -gt 0 ]; do
 		LyxBuildDir=`echo ${1}|cut -d= -f2`
 		shift
 		;;
-	--help)
+	--help|--help=*)
 		usage
 		;;
 	--without-aspell)
@@ -170,27 +196,6 @@ ARCH_LIST=${ARCH_LIST:-"ppc i386"}
 strip="-strip"
 aspellstrip=
 
-# detection of script home
-LyxSourceDir=${1:-`dirname "$0"`}
-if [ ! -d "${LyxSourceDir}" ]; then
-	echo Missing LyX source directory.
-	exit 2
-fi
-case "${LyxSourceDir}" in
-/*/development)
-	LyxSourceDir=`dirname "${LyxSourceDir}"`
-	;;
-/*)
-	;;
-*/development|development)
-	LyxSourceDir=`dirname "${LyxSourceDir}"`
-	LyxSourceDir=`cd "${LyxSourceDir}";pwd`
-	;;
-*)
-	LyxSourceDir=`cd "${LyxSourceDir}";pwd`
-	;;
-esac
-
 LyxBuildDir=${LyxBuildDir:-`dirname "${LyxSourceDir}"`/lyx-build}
 DMGLocation=${DMGLocation:-"${LyxBuildDir}"}
 
@@ -388,7 +393,6 @@ if [ -d "${ASpellSourceDir}" -a ! -f "${ASpellInstallHdr}" -a "yes" = "${aspell_
 		CXXFLAGS=-g "${ASpellSourceDir}/configure"\
 			--prefix="${ASpellInstallDir}"\
 			${AspellConfigureOptions}
-			#--host="${HOSTSYSTEM}" ${BuildSystem:+"--build=${BuildSystem}"}
 		make && make install${aspellstrip}
 		for file in ${FILE_LIST} ; do
 			if [ -f "${ASpellInstallDir}"/lib/${file} ]; then
@@ -485,8 +489,6 @@ build_lyx() {
 			CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtCore.framework/Headers"
 			CPPFLAGS="${CPPFLAGS} -I${SDKROOT}/Library/Frameworks/QtGui.framework/Headers"
 		fi
-		LDFLAGS="${LDFLAGS}"${MAC_API:+" -framework Carbon"}
-		LDFLAGS="${LDFLAGS} -framework AppKit"
 
 		echo LDFLAGS="${LDFLAGS}"
 		export LDFLAGS
@@ -543,6 +545,7 @@ deploy_qtlibs() {
 	test -f "${condir}/Resources/qt.conf" || cat - > "${condir}/Resources/qt.conf" <<-EOF
 [Paths]
 Plugins = PlugIns
+Translations = translations
 EOF
 	if [ ! -d "${condir}/PlugIns" ]; then
 		mkdir -p "${condir}/PlugIns"
@@ -588,6 +591,11 @@ EOF
 			"@executable_path/../${fwdir}/${version}${libnm}"\
 			"${target}"
 	done
+	if [ ! -d "${condir}/translations" ]; then
+		mkdir -p "${condir}/translations"
+	fi
+	echo Copy Qt translations to "${condir}/translations"
+	cp -p "${source}"/translations/qt_*.qm "${condir}/translations"
 }
 
 # -------------------------