X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2FLyX-Mac-binary-release.sh;h=b57bc165e691e47b369cb54c4271a5e53c9ea878;hb=b98dd4ecc120fca7356aa6bd7584486c48ff4590;hp=4fb754740b99782739af5825b5597228b8466767;hpb=35722e58ec54d13e6c4371a3eb4166e89c510c5d;p=lyx.git

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index 4fb754740b..b57bc165e6 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -62,6 +62,14 @@ case "${QtVersion}:${QtAPI}" in
 	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"
@@ -185,7 +193,7 @@ while [ $# -gt 0 ]; do
 			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"
 			;;
 		*)
@@ -303,6 +311,11 @@ 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}"
@@ -323,17 +336,21 @@ case "${QtVersion}" in
 	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
@@ -378,13 +395,16 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
 		echo configure options:
 		echo ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
 		"${QtSourceDir}"/configure ${QtConfigureOptions} ${ARCHS} -prefix "${QtInstallDir}"
-		make ${MAKEJOBS} && make install
+		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
@@ -666,6 +686,11 @@ content_directory() {
 	echo "${content}"
 }
 
+installname() {
+		echo install_name_tool "$@"
+		install_name_tool "$@"
+}
+
 private_framework() {
 	fwdir=$(framework_name "$1")
 	source="$2"
@@ -675,11 +700,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() {
@@ -712,16 +735,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/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}"
@@ -731,8 +755,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}"
@@ -784,6 +807,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"
@@ -799,11 +841,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
 }
 
@@ -860,7 +904,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"