anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved Qt frameworks packaging on Mac

Browse Source
This commit is contained in:
Stephan Witt 2014-03-04 22:28:17 +01:00
parent ad56bded03
commit 222ef85664
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
development/LyX-Mac-binary-release.sh
View File

@ -47,6 +47,7 @@ HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions" Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-exceptions"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus" Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-webkit -no-qt3support -no-javascript-jit -no-dbus"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools" Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
Qt4DmgSuffix=qt4${Qt4API}.dmg
# stupid special case... # stupid special case...
case "${Qt4Version}:${Qt4API}" in case "${Qt4Version}:${Qt4API}" in
@ -56,6 +57,10 @@ case "${Qt4Version}:${Qt4API}" in
Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip" Qt4ConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -fast -no-strip"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-javascript-jit -no-pkg-config" Qt4ConfigureOptions="${Qt4ConfigureOptions} -no-javascript-jit -no-pkg-config"
Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools" Qt4ConfigureOptions="${Qt4ConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
Qt4DmgSuffix=qt5${Qt4API}.dmg
;;
5.*)
Qt4DmgSuffix=qt5${Qt4API}.dmg
;; ;;
*) *)
Qt4ConfigureOptions="${Qt4ConfigureOptions} ${Qt4API}" Qt4ConfigureOptions="${Qt4ConfigureOptions} ${Qt4API}"
@ -288,10 +293,14 @@ LyxAppPrefix="${LyxAppDir}.app"
# don't change order here... # don't change order here...
case "${Qt4Version}" in case "${Qt4Version}" in
5*) 5.0.*|5.1.*)
QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore" QtLibraries="QtSvg QtXml QtPrintSupport QtWidgets QtGui QtNetwork QtConcurrent QtCore"
QtFrameworkVersion="5" QtFrameworkVersion="5"
;; ;;
5*)
QtLibraries="QtSvg QtXml QtPrintSupport QtMacExtras QtWidgets QtGui QtNetwork QtConcurrent QtCore"
QtFrameworkVersion="5"
;;
*) *)
QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore" QtLibraries="QtSvg QtXml QtGui QtNetwork QtCore"
QtFrameworkVersion="4" QtFrameworkVersion="4"
@ -881,9 +890,9 @@ build_package() {
test -n "${DMGLocation}" && ( test -n "${DMGLocation}" && (
make_dmg "${DMGLocation}" make_dmg "${DMGLocation}"
if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then if [ -d "${QtInstallDir}/lib/QtCore.framework/Versions/${QtFrameworkVersion}" -a "yes" = "${qt4_deployment}" ]; then
rm -f "${DMGLocation}/${DMGNAME}+qt4.dmg" rm -f "${DMGLocation}/${DMGNAME}+${Qt4DmgSuffix}"
echo move to "${DMGLocation}/${DMGNAME}+qt4${Qt4API}.dmg" echo move to "${DMGLocation}/${DMGNAME}+${Qt4DmgSuffix}"
mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+qt4${Qt4API}.dmg" mv "${DMGLocation}/${DMGNAME}.dmg" "${DMGLocation}/${DMGNAME}+${Qt4DmgSuffix}"
fi fi
) )
} }