From 3fdfde294ff0cfc09501e2d944043187e7e530c9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 18 Feb 2013 17:37:21 +0100 Subject: add -skip option to the configures this makes it possible to exclude modules from the build without moving their sources out of the way. substitutes the much-requested -no-webkit. not adding a symmetrical option, as it is relatively pointless: to build only specific "leaf" modules, you only need to run "make module-qt ..." once you configured. and removing particular "intermediate" modules is achieved with this very option. Task-number: QTBUG-26697 Change-Id: I25cebdbd029885a2c653c4cde696f9bb78691768 Reviewed-by: Tuukka Turunen Reviewed-by: Joerg Bornemann --- configure | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 4a1836e5b0..360e58dc2d 100755 --- a/configure +++ b/configure @@ -777,6 +777,7 @@ CFG_SQL_AVAILABLE= QT_DEFAULT_BUILD_PARTS="libs tools examples" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" +CFG_SKIP_MODULES="" CFG_RELEASE_QMAKE=no CFG_AUDIO_BACKEND=auto CFG_V8SNAPSHOT=auto @@ -995,7 +996,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style options that pass an argument - -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-skip|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1288,6 +1289,14 @@ while [ "$#" -gt 0 ]; do make) CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" ;; + skip) + VAL=qt${VAL#qt} + if ! [ -d $relpath/../$VAL ]; then + echo "Attempting to skip non-existent module $VAL." >&2 + exit 1 + fi + CFG_SKIP_MODULES="$CFG_SKIP_MODULES $VAL" + ;; sdk) if [ "$BUILD_ON_MAC" = "yes" ]; then CFG_SDK="$VAL" @@ -3193,6 +3202,8 @@ Additional options: ($QT_DEFAULT_BUILD_PARTS) -nomake ..... Exclude part from the list of parts to be built. + -skip ..... Exclude an entire module from the build. + -no-gui ............ Don't build the Qt GUI module and dependencies. + -gui ............... Build the Qt GUI module and dependencies. @@ -6084,6 +6095,9 @@ QTMODULE="$outpath/mkspecs/qmodule.pri" echo "CONFIG += $QMAKE_CONFIG" >> "$QTMODULE.tmp" echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp" +if [ -n "$CFG_SKIP_MODULES" ]; then + echo "QT_SKIP_MODULES += $CFG_SKIP_MODULES" >> "$QTMODULE.tmp" +fi if [ -n "$QT_CFLAGS_PSQL" ]; then echo "QT_CFLAGS_PSQL = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp" -- cgit v1.2.3 From 1aa09f985985b4424073de6b9c0909c7270b5cb6 Mon Sep 17 00:00:00 2001 From: Richard Brinkman Date: Fri, 22 Feb 2013 09:02:31 +0100 Subject: ADD: -confirm-license option in output of configure --help Task-number: QTBUG-25185 Change-Id: I1578a023a8b4c030aaf4cd191203d5c28b950a0b Reviewed-by: Oswald Buddenhagen --- configure | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 360e58dc2d..4bd39f5d11 100755 --- a/configure +++ b/configure @@ -3095,6 +3095,9 @@ Configure options: -opensource ........ Compile and link the Open-Source Edition of Qt. -commercial ........ Compile and link the Commercial Edition of Qt. + -confirm-license.... Automatically acknowledge the license (use with + either -opensource or -commercial) + -no-c++11 .......... Do not compile Qt with C++11 support enabled. + -c++11 ............. Compile Qt with C++11 support enabled. -- cgit v1.2.3 From ff05c481387afcd84516a9d11671dff0f5705a28 Mon Sep 17 00:00:00 2001 From: Richard Brinkman Date: Wed, 20 Feb 2013 13:18:10 +0100 Subject: FIX: misleading -(no)make option in configure --help Clarify in the configure --help documentation that the text between parentheses in the -make option indicates the default parts, not all the parts that can be chosen from. Task-number: QTBUG-28826 Change-Id: Iac9cf294b8054823ecfaf262aeafab7779ce4c8b Reviewed-by: Oswald Buddenhagen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 4bd39f5d11..3d511e3d72 100755 --- a/configure +++ b/configure @@ -3202,7 +3202,7 @@ Third Party Libraries: Additional options: -make ....... Add part to the list of parts to be built at make time. - ($QT_DEFAULT_BUILD_PARTS) + (defaults to: $QT_DEFAULT_BUILD_PARTS) -nomake ..... Exclude part from the list of parts to be built. -skip ..... Exclude an entire module from the build. -- cgit v1.2.3 From a00e74914cfdd4cb37e669a86963523149b85d40 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 20 Feb 2013 12:06:12 +0100 Subject: Remove extra $ in default libexec directory Produces qt_lbexpath=$PREFIX/29677QT_INSTALL_LIBEXECS_DIRNAME in qconfig.cpp Change-Id: Ie6f208d759a748dfcd4f1547943a1dfb4b7aedd5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Kai Koehne --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 360e58dc2d..6d6b816c30 100755 --- a/configure +++ b/configure @@ -2832,7 +2832,7 @@ else fi if [ -z "$QT_INSTALL_LIBEXECS" ]; then #default - QT_INSTALL_LIBEXECS="$QT_INSTALL_ARCHDATA/$$QT_INSTALL_LIBEXECS_DIRNAME" #fallback + QT_INSTALL_LIBEXECS="$QT_INSTALL_ARCHDATA/$QT_INSTALL_LIBEXECS_DIRNAME" #fallback fi QT_INSTALL_LIBEXECS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBEXECS"` -- cgit v1.2.3 From 01292ac849363eea97bcb981ccded1279dc95e6c Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Mon, 11 Feb 2013 12:20:32 +0100 Subject: Make -force-debug-info option work Should be applied to Qt modules. Not interesting for third party users. Change-Id: I8fce821af397e3ace011a426c762319f6d30004f Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil Abrahamsen Blomfeldt --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 3d511e3d72..5f6075d722 100755 --- a/configure +++ b/configure @@ -2609,7 +2609,7 @@ if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then fi if [ "$CFG_FORCEDEBUGINFO" = "yes" ]; then - QT_CONFIG="$QT_CONFIG force_debug_info" + QMAKE_CONFIG="$QMAKE_CONFIG force_debug_info" fi # pass on $CFG_SDK to the arch/configure tests. -- cgit v1.2.3