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

prepare Qt 5.6 builds

Browse Source 
* support separate Qt framework builds
 * adjust configure options to skip QtTools
This commit is contained in:
Stephan Witt 2016-02-28 11:34:06 +01:00
parent b0dd26909c
commit f16b2cab75
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,9 @@ case "${QtVersion}:${QtAPI}" in
QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config" QtConfigureOptions="${QtConfigureOptions} -no-kms -no-pkg-config"
QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools" QtConfigureOptions="${QtConfigureOptions} -nomake examples -nomake tools"
QtConfigureOptions="${QtConfigureOptions} -skip qtconnectivity -skip qtscript" QtConfigureOptions="${QtConfigureOptions} -skip qtconnectivity -skip qtscript"
QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols -skip qtdeclarative" QtConfigureOptions="${QtConfigureOptions} -skip qtquickcontrols"
QtConfigureOptions="${QtConfigureOptions} -skip qttools"
QtConfigureOptions="${QtConfigureOptions} -skip qtdeclarative"
QtMajorVersion=qt5 QtMajorVersion=qt5
;; ;;
5.*) 5.*)
@ -266,6 +268,10 @@ while [ $# -gt 0 ]; do
hunspell_deployment="no" hunspell_deployment="no"
shift shift
;; ;;
--only-qt*=*)
QtOnlyPackage=$(echo ${1}|cut -d= -f2)
shift
;;
--only-package=*) --only-package=*)
LyxOnlyPackage=$(echo ${1}|cut -d= -f2) LyxOnlyPackage=$(echo ${1}|cut -d= -f2)
shift shift
@ -388,7 +394,7 @@ case $SDKs in
esac esac
MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" MYCFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${QtBuildDir}" -a -d "${QtInstallDir}" \) ]; then build_qt() {
echo Build Qt library ${QtSourceDir} echo Build Qt library ${QtSourceDir}
if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then if [ "${QtInstallDir}" = "${QtBuildDir}" ]; then
echo Bad install directory for Qt. echo Bad install directory for Qt.
@ -402,17 +408,29 @@ if [ "${configure_qt_frameworks}" != "yes" -a -d "${QtSourceDir}" -a ! \( -d "${
"${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}" "${QtSourceDir}"/configure ${QtConfigureOptions} ${QTARCHS} -prefix "${QtInstallDir}"
make -j1 && make -j1 install make -j1 && make -j1 install
) )
fi if [ -d "${QtInstallDir}" -a ! -f "${QtInstallDir}"/include/QtCore ]; then
if [ -d "${QtInstallDir}" -a ! -f "${QtInstallDir}"/include/QtCore ]; then cd "${QtInstallDir}" && (
cd "${QtInstallDir}" && ( mkdir -p include
mkdir -p include cd include
cd include for libnm in ${QtLibraries} ; do
for libnm in ${QtLibraries} ; do test -d ${libnm} -o -L ${libnm} || \
test -d ${libnm} -o -L ${libnm} || \ ( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} )
( ln -s ../lib/${libnm}.framework/Headers ${libnm} && echo Link to framework ${libnm} ) done
done )
) fi
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 if [ -d "${LibMagicSourceDir}" -a ! -f "${LibMagicInstallHdr}" ]; then
# we have a private libmagic (file(1)) source tree at hand... # we have a private libmagic (file(1)) source tree at hand...