From e8dcd5038d8a6ee73f3efdd6fe5fbe276684feec Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 28 Sep 2015 20:19:36 +0200 Subject: "frame" execution of config tests precisely the purpose is to make build log parsers able to ignore build failures in verbose configure output. Change-Id: I01af2e019fd1b055fdfcf6749faeebacb7a39c3f Reviewed-by: Frederik Gladhorn Reviewed-by: Thiago Macieira --- tools/configure/configureapp.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f955a8de2e..17f19361f7 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2577,6 +2577,8 @@ void Configure::autoDetection() dictionary["QT_POINTER_SIZE"] = "8"; else dictionary["QT_POINTER_SIZE"] = "4"; + + cout << "Done running configuration tests." << endl; } bool Configure::verifyConfiguration() -- cgit v1.2.3 From a75995124d2aedf7f8a85407eb5c3c8532fc9ea0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 22 Sep 2015 16:36:03 +0200 Subject: fix configure bootstrap on mingw with spaces in the builddir the missing quotes would cause us to misdetect mingw as msys. Change-Id: I408c0e6bfc3cbfecd02c54904cf96ab79e0b6d88 Reviewed-by: Joerg Bornemann --- tools/configure/Makefile.mingw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/configure') diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index 539664e7d6..f4513c64d6 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -89,7 +89,7 @@ $(OBJECTS): $(PCH) # sh-compatible shell. This is not a problem, because configure.bat # will not do that. ifeq ($(SHELL), sh.exe) - ifeq ($(wildcard $(CURDIR)/sh.exe), ) + ifeq ($(wildcard "$(CURDIR)/sh.exe"), ) SH = 0 else SH = 1 -- cgit v1.2.3 From a2f501f9394660ad68a9b559d7e87ddfd1f4bd48 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 11 Dec 2014 14:32:59 -0800 Subject: Make -dbus-linked the default on all platforms [ChangeLog][QtDBus] The QtDBus library now links directly to the libdbus-1 system library if it was detected at configure time. To force linking to the library, pass option -dbus-linked to configure; to force dynamically loading at runtime, use -dbus-runtime. Task-number: QTBUG-14131 Change-Id: Ie33d1f22f85b465ab0ce166b8f17b8491eae1c21 Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 17f19361f7..c54bc9426e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -904,13 +904,15 @@ void Configure::parseCmdLine() } else if (configCmdLine.at(i) == "-no-qdbus") { dictionary[ "DBUS" ] = "no"; } else if (configCmdLine.at(i) == "-qdbus") { - dictionary[ "DBUS" ] = "yes"; + dictionary[ "DBUS" ] = "auto"; } else if (configCmdLine.at(i) == "-no-dbus") { dictionary[ "DBUS" ] = "no"; } else if (configCmdLine.at(i) == "-dbus") { - dictionary[ "DBUS" ] = "yes"; + dictionary[ "DBUS" ] = "auto"; } else if (configCmdLine.at(i) == "-dbus-linked") { dictionary[ "DBUS" ] = "linked"; + } else if (configCmdLine.at(i) == "-dbus-runtime") { + dictionary[ "DBUS" ] = "runtime"; } else if (configCmdLine.at(i) == "-audio-backend") { dictionary[ "AUDIO_BACKEND" ] = "yes"; } else if (configCmdLine.at(i) == "-no-audio-backend") { @@ -2023,8 +2025,8 @@ bool Configure::displayHelp() desc("LIBPROXY", "no", "-no-libproxy", "Do not compile in libproxy support."); desc("LIBPROXY", "yes", "-libproxy", "Compile in libproxy support (for cross compilation targets).\n"); desc("DBUS", "no", "-no-dbus", "Do not compile in D-Bus support."); - desc("DBUS", "yes", "-dbus", "Compile in D-Bus support and load libdbus-1\ndynamically."); desc("DBUS", "linked", "-dbus-linked", "Compile in D-Bus support and link to libdbus-1.\n"); + desc("DBUS", "runtime", "-dbus-runtime", "Compile in D-Bus support and load libdbus-1\ndynamically."); desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into\nQt Multimedia."); desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into Qt Multimedia.\n"); desc("WMF_BACKEND", "no","-no-wmf-backend", "Do not compile in the windows media foundation backend\ninto Qt Multimedia."); @@ -2496,7 +2498,7 @@ void Configure::autoDetection() if (dictionary["LIBPROXY"] == "auto") dictionary["LIBPROXY"] = checkAvailability("LIBPROXY") ? "yes" : "no"; if (dictionary["DBUS"] == "auto") - dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no"; + dictionary["DBUS"] = checkAvailability("DBUS") ? "linked" : "runtime"; if (dictionary["QML_DEBUG"] == "auto") dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no"; if (dictionary["AUDIO_BACKEND"] == "auto") @@ -2966,7 +2968,7 @@ void Configure::generateOutputVars() if (dictionary[ "LIBPROXY" ] == "yes") qtConfig += "libproxy"; - if (dictionary[ "DBUS" ] == "yes") + if (dictionary[ "DBUS" ] == "runtime") qtConfig += "dbus"; else if (dictionary[ "DBUS" ] == "linked") qtConfig += "dbus dbus-linked"; @@ -3076,7 +3078,7 @@ void Configure::generateOutputVars() qmakeVars += QString("OPENSSL_LIBS += -L%1/lib").arg(opensslPath); } } - if (dictionary[ "DBUS" ] != "no") { + if (dictionary[ "DBUS" ] == "linked") { if (!dbusPath.isEmpty()) { qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath); qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath); -- cgit v1.2.3 From a3292031295a09e5e959141db78c2310e08562ae Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 1 Oct 2015 16:39:57 +0200 Subject: configure.exe: Add -verbose option. Make it possible to inspect the output of the configure tests. Task-number: QTBUG-48525 Change-Id: If93d597679ae1b189dfdaa485852d34cad52593b Reviewed-by: Oswald Buddenhagen --- tools/configure/configureapp.cpp | 20 +++++++++++++++++--- tools/configure/configureapp.h | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'tools/configure') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c54bc9426e..d4ea0f6d04 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -83,7 +83,7 @@ static inline void promptKeyPress() exit(0); // Exit cleanly for Ctrl+C } -Configure::Configure(int& argc, char** argv) +Configure::Configure(int& argc, char** argv) : verbose(0) { // Default values for indentation optionIndent = 4; @@ -383,6 +383,7 @@ void Configure::parseCmdLine() configCmdLine.clear(); reloadCmdLine(); } + else if (configCmdLine.at(i) == "-loadconfig") { ++i; if (i != argCount) { @@ -420,6 +421,10 @@ void Configure::parseCmdLine() || configCmdLine.at(i) == "-?") dictionary[ "HELP" ] = "yes"; + else if (configCmdLine.at(i) == "-v" || configCmdLine.at(i) == "-verbose") { + ++verbose; + } + else if (configCmdLine.at(i) == "-qconfig") { ++i; if (i == argCount) @@ -2058,6 +2063,7 @@ bool Configure::displayHelp() desc( "-loadconfig ", "Run configure with the parameters from file configure_.cache."); desc( "-saveconfig ", "Run configure and save the parameters in file configure_.cache."); desc( "-redo", "Run configure with the same parameters as last time.\n"); + desc( "-v, -verbose", "Run configure tests with verbose output.\n"); // Qt\Windows CE only options go below here ----------------------------------------------------------------------------- desc("Qt for Windows CE only:\n\n"); @@ -3377,7 +3383,7 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext } // run qmake - QString command = QString("%1 %2 %3 2>&1") + QString command = QString("%1 %2 %3") .arg(QDir::toNativeSeparators(QDir(newpwd).relativeFilePath(buildPath + "/bin/qmake.exe")), QDir::toNativeSeparators(sourcePath + "/config.tests/" + projectPath), extraOptions); @@ -3389,6 +3395,11 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext addSysroot(&command); } + if (verbose) + cout << qPrintable(command) << endl; + else + command += " 2>&1"; + int code = 0; QString output = Environment::execute(command, &code); //cout << output << endl; @@ -3398,7 +3409,10 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext command = dictionary[ "MAKE" ]; if (command.contains("nmake") || command.contains("jom")) command += " /NOLOGO"; - command += " -s 2>&1"; + if (verbose) + cout << qPrintable(command) << endl; + else + command += " -s 2>&1"; output = Environment::execute(command, &code); //cout << output << endl; diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index de8d1a2469..78cc118a9d 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -93,6 +93,8 @@ public: private: bool checkAngleAvailability(QString *errorMessage = 0) const; + int verbose; + // Our variable dictionaries QMap dictionary; QStringList allBuildParts; -- cgit v1.2.3