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

Automate Qt major version detection in macOS build script

Browse Source
This commit is contained in:
Stephan Witt 2021-12-06 07:51:26 +01:00
parent b48620dff1
commit 53ed3dc062
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ LyXConfigureOptions="${LyXConfigureOptions} --disable-stdlib-debug"
AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility" AspellConfigureOptions="--enable-warnings --enable-optimization=-O0 --enable-debug --disable-nls --enable-compile-in-filters --disable-pspell-compatibility"
HunspellConfigureOptions="--with-warnings --disable-nls --disable-static" HunspellConfigureOptions="--with-warnings --disable-nls --disable-static"
QtMajorVersion=qt4 QtMajorVersion=$(echo "${QtVersion}"|cut -d. -f1)
QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -confirm-license" QtConfigureOptions="${QtConfigureOptions} -opensource -silent -shared -confirm-license"
# stupid special case... # stupid special case...
case "${QtVersion}:${QtAPI}" in case "${QtVersion}:${QtAPI}" in
@ -63,7 +63,6 @@ case "${QtVersion}:${QtAPI}" in
QtConfigureOptions="${QtConfigureOptions} -fast -no-strip" QtConfigureOptions="${QtConfigureOptions} -fast -no-strip"
QtConfigureOptions="${QtConfigureOptions} -no-javascript-jit -no-pkg-config" QtConfigureOptions="${QtConfigureOptions} -no-javascript-jit -no-pkg-config"
QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools" QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake demos -nomake docs -nomake tools"
QtMajorVersion=qt5
;; ;;
5.6*|5.7*) 5.6*|5.7*)
QtConfigureOptions="${QtConfigureOptions} -no-strip" QtConfigureOptions="${QtConfigureOptions} -no-strip"
@ -73,7 +72,6 @@ case "${QtVersion}:${QtAPI}" in
QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols" QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
QtConfigureOptions="${QtConfigureOptions} -skip qttools" QtConfigureOptions="${QtConfigureOptions} -skip qttools"
QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative" QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
QtMajorVersion=qt5
;; ;;
5.*) 5.*)
QtConfigureOptions="${QtConfigureOptions} -no-strip" QtConfigureOptions="${QtConfigureOptions} -no-strip"
@ -82,7 +80,6 @@ case "${QtVersion}:${QtAPI}" in
for component in ${QtSkipComponents} ; do for component in ${QtSkipComponents} ; do
QtConfigureOptions="${QtConfigureOptions} -skip ${component}" QtConfigureOptions="${QtConfigureOptions} -skip ${component}"
done done
QtMajorVersion=qt5
;; ;;
*) *)
QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions" QtConfigureOptions="${QtConfigureOptions} -fast -no-exceptions"
@ -1055,7 +1052,7 @@ build_package() {
for arch in ${ARCH_LIST} ; do for arch in ${ARCH_LIST} ; do
DMGARCH="${DMGARCH}-${arch}" DMGARCH="${DMGARCH}-${arch}"
done done
QtDmgArchSuffix=${QtMajorVersion}${DMGARCH}${QtAPI}.dmg QtDmgArchSuffix="qt"${QtMajorVersion}${DMGARCH}${QtAPI}.dmg
test -n "${DMGLocation}" && ( test -n "${DMGLocation}" && (
make_dmg "${DMGLocation}" make_dmg "${DMGLocation}"