diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/Makefile.mingw | 4 | ||||
| -rw-r--r-- | tools/configure/Makefile.win32 | 4 | ||||
| -rw-r--r-- | tools/configure/configure.pro | 4 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 3695 | ||||
| -rw-r--r-- | tools/configure/configureapp.h | 88 | ||||
| -rw-r--r-- | tools/configure/environment.cpp | 243 | ||||
| -rw-r--r-- | tools/configure/environment.h | 13 | ||||
| -rw-r--r-- | tools/configure/main.cpp | 30 |
8 files changed, 100 insertions, 3981 deletions
diff --git a/tools/configure/Makefile.mingw b/tools/configure/Makefile.mingw index ed13c1a776..ff960115f9 100644 --- a/tools/configure/Makefile.mingw +++ b/tools/configure/Makefile.mingw @@ -4,7 +4,7 @@ CONFSRC = $(TOOLSRC)/configure RAW_PCH = configure_pch.h PCH = $(RAW_PCH).gch/c++ -DEFINES = -DUNICODE -DQT_NO_DATASTREAM -DQT_NO_CODECS -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_COMPRESS -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -D_CRT_SECURE_NO_DEPRECATE -DQT_BOOTSTRAPPED -DQT_BUILD_CONFIGURE -DQT_USE_QSTRINGBUILDER -DQT_VERSION_STR=\"$(QTVERSION)\" -DQT_VERSION_MAJOR=$(QT_VERSION_MAJOR) -DQT_VERSION_MINOR=$(QT_VERSION_MINOR) -DQT_VERSION_PATCH=$(QT_VERSION_PATCH) +DEFINES = -DUNICODE -D_CRT_SECURE_NO_DEPRECATE -DQT_BOOTSTRAPPED -DQT_BUILD_CONFIGURE -DQT_USE_QSTRINGBUILDER -DQT_VERSION_STR=\"$(QTVERSION)\" -DQT_VERSION_MAJOR=$(QT_VERSION_MAJOR) -DQT_VERSION_MINOR=$(QT_VERSION_MINOR) -DQT_VERSION_PATCH=$(QT_VERSION_PATCH) INCPATH = -I"../../include" -I"../../include/QtCore" -I"../../include/QtCore/$(QTVERSION)" -I"../../include/QtCore/$(QTVERSION)/QtCore" -I"$(TOOLSRC)/shared" -I"$(QTSRC)mkspecs/win32-g++" CXXFLAGS_BARE = -std=c++11 -fno-rtti -fno-exceptions -mthreads -Wall -Wextra $(DEFINES) $(INCPATH) CXXFLAGS = -include $(RAW_PCH) $(CXXFLAGS_BARE) @@ -12,7 +12,7 @@ LINK = g++ LFLAGS = -Wl,-subsystem,console -mthreads LIBS = -lole32 -ladvapi32 -luuid -TARGET = ../../configure.exe +TARGET = ../../configureapp.exe OBJECTS = \ main.o \ diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index aae3d57ce3..8ed2ffd23f 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -2,7 +2,7 @@ CORESRC = $(QTSRC)src\corelib TOOLSRC = $(QTSRC)tools CONFSRC = $(TOOLSRC)\configure -DEFINES = -DUNICODE -DQT_NO_CODECS -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_LITE_COMPONENT -DQT_NO_COMPRESS -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -D_CRT_SECURE_NO_DEPRECATE -DQT_BOOTSTRAPPED -DQT_BUILD_CONFIGURE -DQT_USE_QSTRINGBUILDER -DQT_VERSION_STR=\"$(QTVERSION)\" -DQT_VERSION_MAJOR=$(QT_VERSION_MAJOR) -DQT_VERSION_MINOR=$(QT_VERSION_MINOR) -DQT_VERSION_PATCH=$(QT_VERSION_PATCH) +DEFINES = -DUNICODE -D_CRT_SECURE_NO_DEPRECATE -DQT_BOOTSTRAPPED -DQT_BUILD_CONFIGURE -DQT_USE_QSTRINGBUILDER -DQT_VERSION_STR=\"$(QTVERSION)\" -DQT_VERSION_MAJOR=$(QT_VERSION_MAJOR) -DQT_VERSION_MINOR=$(QT_VERSION_MINOR) -DQT_VERSION_PATCH=$(QT_VERSION_PATCH) INCPATH = -I"..\..\include" -I"..\..\include\QtCore" -I"..\..\include\QtCore\$(QTVERSION)" -I"..\..\include\QtCore\$(QTVERSION)\QtCore" -I"$(TOOLSRC)\shared" -I"$(QTSRC)mkspecs\win32-msvc2012" CXXFLAGS_BARE = -nologo -Zc:wchar_t -W3 -GR -EHsc -w34100 -w34189 -wd4577 $(CFLAGS_CRT) $(EXTRA_CXXFLAGS) $(DEFINES) $(INCPATH) !IF ("$(CXX)" != "clang-cl") @@ -17,7 +17,7 @@ LINK = link LFLAGS = /NOLOGO /DYNAMICBASE /NXCOMPAT /INCREMENTAL:NO /SUBSYSTEM:CONSOLE "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /MANIFEST /MANIFESTFILE:"configure.intermediate.manifest" LIBS = ole32.lib advapi32.lib shell32.lib -TARGET = ..\..\configure.exe +TARGET = ..\..\configureapp.exe OBJECTS = \ main.obj \ diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index f1767e16cd..9149a30e3e 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -1,9 +1,9 @@ -TARGET = configure +TARGET = configureapp DESTDIR = $$PWD/../.. # build directly in source dir CONFIG += console flat stl rtti_off CONFIG -= moc qt -DEFINES = UNICODE QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMPONENT QT_NO_COMPRESS QT_NO_THREAD QT_NO_QOBJECT QT_NO_GEOM_VARIANT _CRT_SECURE_NO_DEPRECATE QT_USE_QSTRINGBUILDER +DEFINES = UNICODE _CRT_SECURE_NO_DEPRECATE QT_USE_QSTRINGBUILDER DEFINES += QT_BOOTSTRAPPED QT_BUILD_CONFIGURE win32 : LIBS += -lole32 -ladvapi32 diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 1800bfc873..841aa66b8f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -66,9 +66,6 @@ std::ostream &operator<<(std::ostream &s, const QString &val) { using namespace std; -// Macros to simplify options marking -#define MARK_OPTION(x,y) ( dictionary[ #x ] == #y ? "*" : " " ) - static inline void promptKeyPress() { cout << "(Press any key to continue...)"; @@ -76,27 +73,10 @@ static inline void promptKeyPress() exit(0); // Exit cleanly for Ctrl+C } -Configure::Configure(int& argc, char** argv) : verbose(0) +Configure::Configure(int& argc, char** argv) { - // Default values for indentation - optionIndent = 4; - descIndent = 25; - outputWidth = 0; - // Get console buffer output width - CONSOLE_SCREEN_BUFFER_INFO info; - HANDLE hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - if (GetConsoleScreenBufferInfo(hStdout, &info)) - outputWidth = info.dwSize.X - 1; - outputWidth = qMin(outputWidth, 79); // Anything wider gets unreadable - if (outputWidth < 35) // Insanely small, just use 79 - outputWidth = 79; int i; - /* - ** Set up the initial state, the default - */ - dictionary[ "CONFIGCMD" ] = argv[ 0 ]; - for (i = 1; i < argc; i++) configCmdLine += argv[ i ]; @@ -122,169 +102,25 @@ Configure::Configure(int& argc, char** argv) : verbose(0) QDir(buildPath).mkpath("bin"); buildDir.mkpath("mkspecs"); + buildDir.mkpath("config.tests"); } - defaultBuildParts << QStringLiteral("libs") << QStringLiteral("tools") << QStringLiteral("examples"); - allBuildParts = defaultBuildParts; - allBuildParts << QStringLiteral("tests"); dictionary[ "QT_INSTALL_PREFIX" ] = installPath; - dictionary[ "QMAKESPEC" ] = getenv("QMAKESPEC"); if (dictionary[ "QMAKESPEC" ].size() == 0) { dictionary[ "QMAKESPEC" ] = Environment::detectQMakeSpec(); dictionary[ "QMAKESPEC_FROM" ] = "detected"; - } else { - dictionary[ "QMAKESPEC_FROM" ] = "env"; } - dictionary[ "QCONFIG" ] = "full"; - dictionary[ "EMBEDDED" ] = "no"; - dictionary[ "BUILD_QMAKE" ] = "yes"; - dictionary[ "QMAKE_INTERNAL" ] = "no"; - dictionary[ "WIDGETS" ] = "yes"; - dictionary[ "GUI" ] = "yes"; - dictionary[ "RTTI" ] = "yes"; - dictionary[ "STRIP" ] = "yes"; - dictionary[ "PCH" ] = "yes"; - dictionary[ "SEPARATE_DEBUG_INFO" ] = "no"; - dictionary[ "SSE2" ] = "auto"; - dictionary[ "SSE3" ] = "auto"; - dictionary[ "SSSE3" ] = "auto"; - dictionary[ "SSE4_1" ] = "auto"; - dictionary[ "SSE4_2" ] = "auto"; - dictionary[ "AVX" ] = "auto"; - dictionary[ "AVX2" ] = "auto"; - dictionary[ "AVX512" ] = "auto"; dictionary[ "SYNCQT" ] = "auto"; - dictionary[ "AUDIO_BACKEND" ] = "auto"; - dictionary[ "WMF_BACKEND" ] = "no"; - dictionary[ "WMSDK" ] = "auto"; - dictionary[ "QML_DEBUG" ] = "yes"; - dictionary[ "PLUGIN_MANIFESTS" ] = "no"; - dictionary[ "DIRECTWRITE" ] = "auto"; - dictionary[ "DIRECTWRITE2" ] = "auto"; - dictionary[ "DIRECT2D" ] = "no"; - dictionary[ "NIS" ] = "no"; - dictionary[ "NEON" ] = "auto"; - dictionary[ "LARGE_FILE" ] = "yes"; - dictionary[ "FONT_CONFIG" ] = "no"; - dictionary[ "POSIX_IPC" ] = "no"; - dictionary[ "QT_GLIB" ] = "no"; - dictionary[ "QT_ICONV" ] = "auto"; - dictionary[ "QT_EVDEV" ] = "auto"; - dictionary[ "QT_MTDEV" ] = "auto"; - dictionary[ "QT_TSLIB" ] = "auto"; - dictionary[ "QT_INOTIFY" ] = "auto"; - dictionary[ "QT_EVENTFD" ] = "auto"; - dictionary[ "QT_CUPS" ] = "auto"; - dictionary[ "CFG_GCC_SYSROOT" ] = "yes"; - dictionary[ "SLOG2" ] = "no"; - dictionary[ "QNX_IMF" ] = "no"; - dictionary[ "PPS" ] = "no"; - dictionary[ "LGMON" ] = "no"; - dictionary[ "SYSTEM_PROXIES" ] = "no"; - dictionary[ "WERROR" ] = "auto"; - dictionary[ "QREAL" ] = "double"; - dictionary[ "ATOMIC64" ] = "auto"; //Only used when cross compiling. dictionary[ "QT_INSTALL_SETTINGS" ] = "/etc/xdg"; - QString version; - QFile qmake_conf(sourcePath + "/.qmake.conf"); - if (qmake_conf.open(QFile::ReadOnly)) { - while (!qmake_conf.atEnd()) { - static const char beginning[] = "MODULE_VERSION = "; - QByteArray line = qmake_conf.readLine(); - if (!line.startsWith(beginning)) - continue; - - version = qMove(line).mid(int(strlen(beginning))).trimmed(); - break; - } - qmake_conf.close(); - } - - if (version.isEmpty()) - version = QString("%1.%2.%3").arg(QT_VERSION>>16).arg(((QT_VERSION>>8)&0xff)).arg(QT_VERSION&0xff); - - dictionary[ "VERSION" ] = version; - { - QRegExp version_re("([0-9]*)\\.([0-9]*)\\.([0-9]*)(|-.*)"); - if (version_re.exactMatch(version)) { - dictionary[ "VERSION_MAJOR" ] = version_re.cap(1); - dictionary[ "VERSION_MINOR" ] = version_re.cap(2); - dictionary[ "VERSION_PATCH" ] = version_re.cap(3); - } - } - dictionary[ "REDO" ] = "no"; - dictionary[ "BUILD" ] = "debug"; - dictionary[ "BUILDALL" ] = "auto"; // Means yes, but not explicitly - dictionary[ "FORCEDEBUGINFO" ] = "no"; - dictionary[ "RELEASE_TOOLS" ] = "no"; - dictionary[ "BUILDTYPE" ] = "none"; - dictionary[ "BUILDDEV" ] = "no"; - - dictionary[ "COMPILE_EXAMPLES" ] = "yes"; - - dictionary[ "C++STD" ] = "auto"; - - dictionary[ "USE_GOLD_LINKER" ] = "no"; - - dictionary[ "ENABLE_NEW_DTAGS" ] = "no"; - - dictionary[ "SHARED" ] = "yes"; - - dictionary[ "STATIC_RUNTIME" ] = "no"; - - dictionary[ "ZLIB" ] = "auto"; - - dictionary[ "PCRE" ] = "auto"; - - dictionary[ "ICU" ] = "no"; - - dictionary[ "ANGLE" ] = "auto"; - dictionary[ "DYNAMICGL" ] = "auto"; - - dictionary[ "GIF" ] = "auto"; - dictionary[ "JPEG" ] = "auto"; - dictionary[ "PNG" ] = "auto"; - dictionary[ "LIBJPEG" ] = "auto"; - dictionary[ "LIBPNG" ] = "auto"; - dictionary[ "DOUBLECONVERSION" ] = "auto"; - dictionary[ "FREETYPE" ] = "yes"; - dictionary[ "FREETYPE_FROM" ] = "default"; - dictionary[ "HARFBUZZ" ] = "qt"; - - dictionary[ "ACCESSIBILITY" ] = "yes"; - dictionary[ "OPENGL" ] = "yes"; - dictionary[ "OPENGL_ES_2" ] = "yes"; - dictionary[ "OPENVG" ] = "no"; - dictionary[ "SSL" ] = "auto"; - dictionary[ "OPENSSL" ] = "auto"; - dictionary[ "LIBPROXY" ] = "auto"; - dictionary[ "DBUS" ] = "auto"; - - dictionary[ "STYLE_WINDOWS" ] = "yes"; - dictionary[ "STYLE_WINDOWSXP" ] = "auto"; - dictionary[ "STYLE_WINDOWSVISTA" ] = "auto"; - dictionary[ "STYLE_FUSION" ] = "yes"; - - dictionary[ "SQL_MYSQL" ] = "no"; - dictionary[ "SQL_ODBC" ] = "no"; - dictionary[ "SQL_OCI" ] = "no"; - dictionary[ "SQL_PSQL" ] = "no"; - dictionary[ "SQL_TDS" ] = "no"; - dictionary[ "SQL_DB2" ] = "no"; - dictionary[ "SQL_SQLITE" ] = "auto"; - dictionary[ "SQL_SQLITE_LIB" ] = "qt"; - dictionary[ "SQL_SQLITE2" ] = "no"; - dictionary[ "SQL_IBASE" ] = "no"; - QString tmp = dictionary[ "QMAKESPEC" ]; if (tmp.contains("\\")) { tmp = tmp.mid(tmp.lastIndexOf("\\") + 1); @@ -292,25 +128,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0) tmp = tmp.mid(tmp.lastIndexOf("/") + 1); } dictionary[ "QMAKESPEC" ] = tmp; - - dictionary[ "INCREDIBUILD_XGE" ] = "auto"; - dictionary[ "LTCG" ] = "no"; - dictionary[ "NATIVE_GESTURES" ] = "yes"; - dictionary[ "MSVC_MP" ] = "no"; - - if (dictionary["QMAKESPEC"].startsWith("win32-g++")) { - const QString zero = QStringLiteral("0"); - const QStringList parts = Environment::gccVersion().split(QLatin1Char('.')); - dictionary["QT_GCC_MAJOR_VERSION"] = parts.value(0, zero); - dictionary["QT_GCC_MINOR_VERSION"] = parts.value(1, zero); - dictionary["QT_GCC_PATCH_VERSION"] = parts.value(2, zero); - } else if (dictionary["QMAKESPEC"].contains(QString("msvc"))) { - const QString zero = QStringLiteral("0"); - const QStringList parts = Environment::msvcVersion().split(QLatin1Char('.')); - dictionary["QT_CL_MAJOR_VERSION"] = parts.value(0, zero); - dictionary["QT_CL_MINOR_VERSION"] = parts.value(1, zero); - dictionary["QT_CL_PATCH_VERSION"] = parts.value(2, zero); - } } Configure::~Configure() @@ -328,76 +145,36 @@ QString Configure::formatPath(const QString &path) return ret; } -QString Configure::formatPaths(const QStringList &paths) -{ - QString ret; - foreach (const QString &path, paths) { - if (!ret.isEmpty()) - ret += QLatin1Char(' '); - ret += formatPath(path); - } - return ret; -} - -// We could use QDir::homePath() + "/.qt-license", but -// that will only look in the first of $HOME,$USERPROFILE -// or $HOMEDRIVE$HOMEPATH. So, here we try'em all to be -// more forgiving for the end user.. -QString Configure::firstLicensePath() -{ - QStringList allPaths; - allPaths << "./.qt-license" - << QString::fromLocal8Bit(getenv("HOME")) + "/.qt-license" - << QString::fromLocal8Bit(getenv("USERPROFILE")) + "/.qt-license" - << QString::fromLocal8Bit(getenv("HOMEDRIVE")) + QString::fromLocal8Bit(getenv("HOMEPATH")) + "/.qt-license"; - for (int i = 0; i< allPaths.count(); ++i) - if (QFile::exists(allPaths.at(i))) - return allPaths.at(i); - return QString(); -} - -// #### somehow I get a compiler error about vc++ reaching the nesting limit without -// undefining the ansi for scoping. -#ifdef for -#undef for -#endif - void Configure::parseCmdLine() { + sourcePathMangled = sourcePath; + buildPathMangled = buildPath; if (configCmdLine.size() && configCmdLine.at(0) == "-top-level") { dictionary[ "TOPLEVEL" ] = "yes"; configCmdLine.removeAt(0); + sourcePathMangled = QFileInfo(sourcePath).path(); + buildPathMangled = QFileInfo(buildPath).path(); } int argCount = configCmdLine.size(); int i = 0; - const QStringList imageFormats = QStringList() << "gif" << "png" << "jpeg"; - - if (argCount < 1) // skip rest if no arguments - ; - else if (configCmdLine.at(i) == "-redo") { - dictionary[ "REDO" ] = "yes"; - configCmdLine.clear(); - reloadCmdLine(); - } - else if (configCmdLine.at(i) == "-loadconfig") { - ++i; - if (i != argCount) { - dictionary[ "REDO" ] = "yes"; - dictionary[ "CUSTOMCONFIG" ] = "_" + configCmdLine.at(i); - configCmdLine.clear(); - reloadCmdLine(); - } else { - dictionary[ "DONE" ] = "error"; + // Look first for -redo + for (int k = 0 ; k < argCount; ++k) { + if (configCmdLine.at(k) == "-redo") { + dictionary["REDO"] = "yes"; + configCmdLine.removeAt(k); + if (!reloadCmdLine(k)) { + dictionary["DONE"] = "error"; + return; + } + argCount = configCmdLine.size(); + break; } - i = 0; } - argCount = configCmdLine.size(); + // Then look for XQMAKESPEC bool isDeviceMkspec = false; - - // Look first for XQMAKESPEC for (int j = 0 ; j < argCount; ++j) { if ((configCmdLine.at(j) == "-xplatform") || (configCmdLine.at(j) == "-device")) { @@ -412,152 +189,18 @@ void Configure::parseCmdLine() } for (; i<configCmdLine.size(); ++i) { - bool continueElse[] = {false, false}; - if (configCmdLine.at(i) == "-help" - || configCmdLine.at(i) == "-h" - || 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) - break; - dictionary[ "QCONFIG" ] = configCmdLine.at(i); - } - else if (configCmdLine.at(i) == "-qreal") { - ++i; - if (i == argCount) - break; - QString s = dictionary[ "QREAL" ] = configCmdLine.at(i); - if (s == "float") { - dictionary[ "QREAL_STRING" ] = "\"float\""; - } else { - // escape - s = s.simplified(); - s = '"' + s.toLatin1().toPercentEncoding(QByteArray(), "-._~", '_') + '"'; - dictionary[ "QREAL_STRING" ] = s; - } - } - - else if (configCmdLine.at(i) == "-release") { - dictionary[ "BUILD" ] = "release"; - if (dictionary[ "BUILDALL" ] == "auto") - dictionary[ "BUILDALL" ] = "no"; - } else if (configCmdLine.at(i) == "-debug") { - dictionary[ "BUILD" ] = "debug"; - if (dictionary[ "BUILDALL" ] == "auto") - dictionary[ "BUILDALL" ] = "no"; - } else if (configCmdLine.at(i) == "-debug-and-release") - dictionary[ "BUILDALL" ] = "yes"; - else if (configCmdLine.at(i) == "-force-debug-info") - dictionary[ "FORCEDEBUGINFO" ] = "yes"; - else if (configCmdLine.at(i) == "-no-separate-debug-info") - dictionary[ "SEPARATE_DEBUG_INFO" ] = "no"; - else if (configCmdLine.at(i) == "-separate-debug-info") - dictionary[ "SEPARATE_DEBUG_INFO" ] = "yes"; - else if (configCmdLine.at(i) == "-optimized-tools") - dictionary[ "RELEASE_TOOLS" ] = "yes"; - else if (configCmdLine.at(i) == "-no-optimized-tools") - dictionary[ "RELEASE_TOOLS" ] = "no"; - - else if (configCmdLine.at(i) == "-compile-examples") { - dictionary[ "COMPILE_EXAMPLES" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-compile-examples") { - dictionary[ "COMPILE_EXAMPLES" ] = "no"; - } - - else if (configCmdLine.at(i) == "-c++std") { - ++i; - if (i == argCount) - break; - - QString level = configCmdLine.at(i); - if (level == "c++11" || level == "c++14" || level == "c++1z" - || level == "auto") { - dictionary[ "C++STD" ] = level; - } else if (level == "11" || level == "14" || level == "1z") { - dictionary[ "C++STD" ] = "c++" + level; - } else { - dictionary[ "DONE" ] = "error"; - cout << "ERROR: invalid C++ standard " << level - << "; valid options are: c++11 c++14 c++1z auto" << endl; - return; - } - } - - - else if (configCmdLine.at(i) == "-use-gold-linker") - dictionary[ "USE_GOLD_LINKER" ] = "yes"; - else if (configCmdLine.at(i) == "-no-use-gold-linker") - dictionary[ "USE_GOLD_LINKER" ] = "no"; - else if (configCmdLine.at(i) == "-enable-new-dtags") - dictionary[ "ENABLE_NEW_DTAGS" ] = "yes"; - else if (configCmdLine.at(i) == "-disable-new-dtags") - dictionary[ "ENABLE_NEW_DTAGS" ] = "no"; - else if (configCmdLine.at(i) == "-shared") - dictionary[ "SHARED" ] = "yes"; - else if (configCmdLine.at(i) == "-static") - dictionary[ "SHARED" ] = "no"; - else if (configCmdLine.at(i) == "-static-runtime") - dictionary[ "STATIC_RUNTIME" ] = "yes"; - else if (configCmdLine.at(i) == "-developer-build") - dictionary[ "BUILDDEV" ] = "yes"; - else if (configCmdLine.at(i) == "-opensource") { + if (configCmdLine.at(i) == "-opensource") { dictionary[ "BUILDTYPE" ] = "opensource"; } else if (configCmdLine.at(i) == "-commercial") { dictionary[ "BUILDTYPE" ] = "commercial"; } - else if (configCmdLine.at(i) == "-ltcg") { - dictionary[ "LTCG" ] = "yes"; - } - else if (configCmdLine.at(i) == "-no-ltcg") { - dictionary[ "LTCG" ] = "no"; - } - else if (configCmdLine.at(i) == "-mp") { - dictionary[ "MSVC_MP" ] = "yes"; - } - else if (configCmdLine.at(i) == "-no-mp") { - dictionary[ "MSVC_MP" ] = "no"; - } - else if (configCmdLine.at(i) == "-force-asserts") { - dictionary[ "FORCE_ASSERTS" ] = "yes"; - } - else if (configCmdLine.at(i) == "-target") { - ++i; - if (i == argCount) - break; - const QString option = configCmdLine.at(i); - if (option == "xp") { - cout << "ERROR: option \"-target xp\" is no longer valid" << endl; - dictionary["DONE"] = "error"; - return; - } - - if (option != "xp") { - cout << "ERROR: invalid argument for -target option" << endl; - dictionary["DONE"] = "error"; - return; - } - dictionary["TARGET_OS"] = option; - } else if (configCmdLine.at(i) == "-platform") { ++i; if (i == argCount) break; dictionary[ "QMAKESPEC" ] = configCmdLine.at(i); dictionary[ "QMAKESPEC_FROM" ] = "commandline"; - } else if (configCmdLine.at(i) == "-arch") { - ++i; - if (i == argCount) - break; - dictionary["OBSOLETE_ARCH_ARG"] = "yes"; - } else if (configCmdLine.at(i) == "-embedded") { - dictionary[ "EMBEDDED" ] = "yes"; } else if (configCmdLine.at(i) == "-xplatform" || configCmdLine.at(i) == "-device") { ++i; @@ -572,514 +215,13 @@ void Configure::parseCmdLine() devOpt = option; } - else if (configCmdLine.at(i) == "-no-zlib") { - // No longer supported since Qt 4.4.0 - // But save the information for later so that we can print a warning - // - // If you REALLY really need no zlib support, you can still disable - // it by doing the following: - // add "no-zlib" to mkspecs/qconfig.pri - // #define QT_NO_COMPRESS (probably by adding to src/corelib/global/qconfig.h) - // - // There's no guarantee that Qt will build under those conditions - - dictionary[ "ZLIB_FORCED" ] = "yes"; - } else if (configCmdLine.at(i) == "-qt-zlib") { - dictionary[ "ZLIB" ] = "qt"; - } else if (configCmdLine.at(i) == "-system-zlib") { - dictionary[ "ZLIB" ] = "system"; - } - - else if (configCmdLine.at(i) == "-qt-pcre") { - dictionary[ "PCRE" ] = "qt"; - } else if (configCmdLine.at(i) == "-system-pcre") { - dictionary[ "PCRE" ] = "system"; - } - - else if (configCmdLine.at(i) == "-icu") { - dictionary[ "ICU" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-icu") { - dictionary[ "ICU" ] = "no"; - } - - else if (configCmdLine.at(i) == "-angle") { - dictionary[ "ANGLE" ] = "yes"; - dictionary[ "ANGLE_FROM" ] = "commandline"; - } else if (configCmdLine.at(i) == "-no-angle") { - dictionary[ "ANGLE" ] = "no"; - dictionary[ "ANGLE_FROM" ] = "commandline"; - } - - // Image formats -------------------------------------------- - else if (configCmdLine.at(i) == "-no-gif") - dictionary[ "GIF" ] = "no"; - - else if (configCmdLine.at(i) == "-no-libjpeg") { - dictionary[ "JPEG" ] = "no"; - dictionary[ "LIBJPEG" ] = "no"; - } else if (configCmdLine.at(i) == "-qt-libjpeg") { - dictionary[ "LIBJPEG" ] = "qt"; - } else if (configCmdLine.at(i) == "-system-libjpeg") { - dictionary[ "LIBJPEG" ] = "system"; - } - - else if (configCmdLine.at(i) == "-no-libpng") { - dictionary[ "PNG" ] = "no"; - dictionary[ "LIBPNG" ] = "no"; - } else if (configCmdLine.at(i) == "-qt-libpng") { - dictionary[ "LIBPNG" ] = "qt"; - } else if (configCmdLine.at(i) == "-system-libpng") { - dictionary[ "LIBPNG" ] = "system"; - } - - // Double Conversion ----------------------------------------- - else if (configCmdLine.at(i) == "-no-doubleconversion") - dictionary[ "DOUBLECONVERSION" ] = "no"; - else if (configCmdLine.at(i) == "-qt-doubleconversion") - dictionary[ "DOUBLECONVERSION" ] = "qt"; - else if (configCmdLine.at(i) == "-system-doubleconversion") - dictionary[ "DOUBLECONVERSION" ] = "system"; - - // Text Rendering -------------------------------------------- - else if (configCmdLine.at(i) == "-no-freetype") { - dictionary[ "FREETYPE" ] = "no"; - dictionary[ "FREETYPE_FROM" ] = "commandline"; - } else if (configCmdLine.at(i) == "-qt-freetype") { - dictionary[ "FREETYPE" ] = "yes"; - dictionary[ "FREETYPE_FROM" ] = "commandline"; - } else if (configCmdLine.at(i) == "-system-freetype") { - dictionary[ "FREETYPE" ] = "system"; - dictionary[ "FREETYPE_FROM" ] = "commandline"; - } - - else if (configCmdLine.at(i) == "-no-harfbuzz") - dictionary[ "HARFBUZZ" ] = "no"; - else if (configCmdLine.at(i) == "-qt-harfbuzz") - dictionary[ "HARFBUZZ" ] = "qt"; - else if (configCmdLine.at(i) == "-system-harfbuzz") - dictionary[ "HARFBUZZ" ] = "system"; - - // Styles --------------------------------------------------- - else if (configCmdLine.at(i) == "-qt-style-windows") - dictionary[ "STYLE_WINDOWS" ] = "yes"; - else if (configCmdLine.at(i) == "-no-style-windows") - dictionary[ "STYLE_WINDOWS" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-style-windowsxp") - dictionary[ "STYLE_WINDOWSXP" ] = "yes"; - else if (configCmdLine.at(i) == "-no-style-windowsxp") - dictionary[ "STYLE_WINDOWSXP" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-style-windowsvista") - dictionary[ "STYLE_WINDOWSVISTA" ] = "yes"; - else if (configCmdLine.at(i) == "-no-style-windowsvista") - dictionary[ "STYLE_WINDOWSVISTA" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-style-fusion") - dictionary[ "STYLE_FUSION" ] = "yes"; - else if (configCmdLine.at(i) == "-no-style-fusion") - dictionary[ "STYLE_FUSION" ] = "no"; - - // Work around compiler nesting limitation - else - continueElse[1] = true; - if (!continueElse[1]) { - } - - // OpenGL Support ------------------------------------------- - else if (configCmdLine.at(i) == "-no-opengl") { - dictionary[ "OPENGL" ] = "no"; - dictionary[ "OPENGL_ES_2" ] = "no"; - } else if (configCmdLine.at(i) == "-opengl-es-2") { - dictionary[ "OPENGL" ] = "yes"; - dictionary[ "OPENGL_ES_2" ] = "yes"; - } else if (configCmdLine.at(i) == "-opengl") { - dictionary[ "OPENGL" ] = "yes"; - i++; - if (i == argCount) - break; - - dictionary[ "OPENGL_ES_2" ] = "no"; - if ( configCmdLine.at(i) == "es2" ) { - dictionary[ "OPENGL_ES_2" ] = "yes"; - } else if ( configCmdLine.at(i) == "desktop" ) { - // OPENGL=yes suffices - } else if ( configCmdLine.at(i) == "dynamic" ) { - dictionary[ "DYNAMICGL" ] = "yes"; - } else { - cout << "Argument passed to -opengl option is not valid." << endl; - dictionary[ "DONE" ] = "error"; - break; - } - } - - // OpenVG Support ------------------------------------------- - else if (configCmdLine.at(i) == "-openvg") { - dictionary[ "OPENVG" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-openvg") { - dictionary[ "OPENVG" ] = "no"; - } - - // Databases ------------------------------------------------ - else if (configCmdLine.at(i) == "-qt-sql-mysql") - dictionary[ "SQL_MYSQL" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-mysql") - dictionary[ "SQL_MYSQL" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-mysql") - dictionary[ "SQL_MYSQL" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-odbc") - dictionary[ "SQL_ODBC" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-odbc") - dictionary[ "SQL_ODBC" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-odbc") - dictionary[ "SQL_ODBC" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-oci") - dictionary[ "SQL_OCI" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-oci") - dictionary[ "SQL_OCI" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-oci") - dictionary[ "SQL_OCI" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-psql") - dictionary[ "SQL_PSQL" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-psql") - dictionary[ "SQL_PSQL" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-psql") - dictionary[ "SQL_PSQL" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-tds") - dictionary[ "SQL_TDS" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-tds") - dictionary[ "SQL_TDS" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-tds") - dictionary[ "SQL_TDS" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-db2") - dictionary[ "SQL_DB2" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-db2") - dictionary[ "SQL_DB2" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-db2") - dictionary[ "SQL_DB2" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-sqlite") - dictionary[ "SQL_SQLITE" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-sqlite") - dictionary[ "SQL_SQLITE" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-sqlite") - dictionary[ "SQL_SQLITE" ] = "no"; - else if (configCmdLine.at(i) == "-system-sqlite") - dictionary[ "SQL_SQLITE_LIB" ] = "system"; - else if (configCmdLine.at(i) == "-qt-sql-sqlite2") - dictionary[ "SQL_SQLITE2" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-sqlite2") - dictionary[ "SQL_SQLITE2" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-sqlite2") - dictionary[ "SQL_SQLITE2" ] = "no"; - - else if (configCmdLine.at(i) == "-qt-sql-ibase") - dictionary[ "SQL_IBASE" ] = "yes"; - else if (configCmdLine.at(i) == "-plugin-sql-ibase") - dictionary[ "SQL_IBASE" ] = "plugin"; - else if (configCmdLine.at(i) == "-no-sql-ibase") - dictionary[ "SQL_IBASE" ] = "no"; - - // Image formats -------------------------------------------- - else if (configCmdLine.at(i).startsWith("-qt-imageformat-") && - imageFormats.contains(configCmdLine.at(i).section('-', 3))) - dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "yes"; - else if (configCmdLine.at(i).startsWith("-plugin-imageformat-") && - imageFormats.contains(configCmdLine.at(i).section('-', 3))) - dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "plugin"; - else if (configCmdLine.at(i).startsWith("-no-imageformat-") && - imageFormats.contains(configCmdLine.at(i).section('-', 3))) - dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "no"; - - else if (configCmdLine.at(i) == "-no-incredibuild-xge") - dictionary[ "INCREDIBUILD_XGE" ] = "no"; - else if (configCmdLine.at(i) == "-incredibuild-xge") - dictionary[ "INCREDIBUILD_XGE" ] = "yes"; - else if (configCmdLine.at(i) == "-native-gestures") - dictionary[ "NATIVE_GESTURES" ] = "yes"; - else if (configCmdLine.at(i) == "-no-native-gestures") - dictionary[ "NATIVE_GESTURES" ] = "no"; - // Others --------------------------------------------------- - else if (configCmdLine.at(i) == "-widgets") - dictionary[ "WIDGETS" ] = "yes"; - else if (configCmdLine.at(i) == "-no-widgets") - dictionary[ "WIDGETS" ] = "no"; - - else if (configCmdLine.at(i) == "-gui") - dictionary[ "GUI" ] = "yes"; - else if (configCmdLine.at(i) == "-no-gui") - dictionary[ "GUI" ] = "no"; - - else if (configCmdLine.at(i) == "-rtti") - dictionary[ "RTTI" ] = "yes"; - else if (configCmdLine.at(i) == "-no-rtti") - dictionary[ "RTTI" ] = "no"; - - else if (configCmdLine.at(i) == "-strip") - dictionary[ "STRIP" ] = "yes"; - else if (configCmdLine.at(i) == "-no-strip") - dictionary[ "STRIP" ] = "no"; - - else if (configCmdLine.at(i) == "-pch") - dictionary[ "PCH" ] = "yes"; - else if (configCmdLine.at(i) == "-no-pch") - dictionary[ "PCH" ] = "no"; - - else if (configCmdLine.at(i) == "-accessibility") - dictionary[ "ACCESSIBILITY" ] = "yes"; - else if (configCmdLine.at(i) == "-no-accessibility") { - dictionary[ "ACCESSIBILITY" ] = "no"; - cout << "Setting accessibility to NO" << endl; - } - - else if (configCmdLine.at(i) == "-no-sse2") - dictionary[ "SSE2" ] = "no"; - else if (configCmdLine.at(i) == "-sse2") - dictionary[ "SSE2" ] = "yes"; - else if (configCmdLine.at(i) == "-no-sse3") - dictionary[ "SSE3" ] = "no"; - else if (configCmdLine.at(i) == "-sse3") - dictionary[ "SSE3" ] = "yes"; - else if (configCmdLine.at(i) == "-no-ssse3") - dictionary[ "SSSE3" ] = "no"; - else if (configCmdLine.at(i) == "-ssse3") - dictionary[ "SSSE3" ] = "yes"; - else if (configCmdLine.at(i) == "-no-sse4.1") - dictionary[ "SSE4_1" ] = "no"; - else if (configCmdLine.at(i) == "-sse4.1") - dictionary[ "SSE4_1" ] = "yes"; - else if (configCmdLine.at(i) == "-no-sse4.2") - dictionary[ "SSE4_2" ] = "no"; - else if (configCmdLine.at(i) == "-sse4.2") - dictionary[ "SSE4_2" ] = "yes"; - else if (configCmdLine.at(i) == "-no-avx") - dictionary[ "AVX" ] = "no"; - else if (configCmdLine.at(i) == "-avx") - dictionary[ "AVX" ] = "yes"; - else if (configCmdLine.at(i) == "-no-avx2") - dictionary[ "AVX2" ] = "no"; - else if (configCmdLine.at(i) == "-avx2") - dictionary[ "AVX2" ] = "yes"; - else if (configCmdLine.at(i) == "-no-avx512") - dictionary[ "AVX512" ] = ""; - else if (configCmdLine.at(i) == "-avx512") - dictionary[ "AVX512" ] = "auto"; - - else if (configCmdLine.at(i) == "-no-ssl") { - dictionary[ "SSL"] = "no"; - } else if (configCmdLine.at(i) == "-ssl") { - dictionary[ "SSL" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-openssl") { - dictionary[ "OPENSSL"] = "no"; - } else if (configCmdLine.at(i) == "-openssl") { - dictionary[ "OPENSSL" ] = "yes"; - dictionary[ "SSL" ] = "yes"; - } else if (configCmdLine.at(i) == "-openssl-linked") { - dictionary[ "OPENSSL" ] = "linked"; - dictionary[ "SSL" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-libproxy") { - dictionary[ "LIBPROXY"] = "no"; - } else if (configCmdLine.at(i) == "-libproxy") { - dictionary[ "LIBPROXY" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-qdbus") { - dictionary[ "DBUS" ] = "no"; - } else if (configCmdLine.at(i) == "-qdbus") { - dictionary[ "DBUS" ] = "auto"; - } else if (configCmdLine.at(i) == "-no-dbus") { - dictionary[ "DBUS" ] = "no"; - } else if (configCmdLine.at(i) == "-dbus") { - 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") { - dictionary[ "AUDIO_BACKEND" ] = "no"; - } else if (configCmdLine.at(i) == "-wmf-backend") { - dictionary[ "WMF_BACKEND" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-wmf-backend") { - dictionary[ "WMF_BACKEND" ] = "no"; - } else if (configCmdLine.at(i) == "-no-qml-debug") { - dictionary[ "QML_DEBUG" ] = "no"; - } else if (configCmdLine.at(i) == "-qml-debug") { - dictionary[ "QML_DEBUG" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-plugin-manifests") { - dictionary[ "PLUGIN_MANIFESTS" ] = "no"; - } else if (configCmdLine.at(i) == "-plugin-manifests") { - dictionary[ "PLUGIN_MANIFESTS" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-slog2") { - dictionary[ "SLOG2" ] = "no"; - } else if (configCmdLine.at(i) == "-slog2") { - dictionary[ "SLOG2" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-imf") { - dictionary[ "QNX_IMF" ] = "no"; - } else if (configCmdLine.at(i) == "-imf") { - dictionary[ "QNX_IMF" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-pps") { - dictionary[ "PPS" ] = "no"; - } else if (configCmdLine.at(i) == "-pps") { - dictionary[ "PPS" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-lgmon") { - dictionary[ "LGMON" ] = "no"; - } else if (configCmdLine.at(i) == "-lgmon") { - dictionary[ "LGMON" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-system-proxies") { - dictionary[ "SYSTEM_PROXIES" ] = "no"; - } else if (configCmdLine.at(i) == "-system-proxies") { - dictionary[ "SYSTEM_PROXIES" ] = "yes"; - } else if (configCmdLine.at(i) == "-warnings-are-errors" || - configCmdLine.at(i) == "-Werror") { - dictionary[ "WERROR" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-warnings-are-errors") { - dictionary[ "WERROR" ] = "no"; - } else if (configCmdLine.at(i) == "-no-headersclean") { - dictionary[ "HEADERSCLEAN" ] = "no"; - } else if (configCmdLine.at(i) == "-headersclean") { - dictionary[ "HEADERSCLEAN" ] = "yes"; - } else if (configCmdLine.at(i) == "-no-eventfd") { - dictionary[ "QT_EVENTFD" ] = "no"; - } else if (configCmdLine.at(i) == "-eventfd") { - dictionary[ "QT_EVENTFD" ] = "yes"; - } - - // Work around compiler nesting limitation - else - continueElse[0] = true; - if (!continueElse[0]) { - } - - else if (configCmdLine.at(i) == "-internal") - dictionary[ "QMAKE_INTERNAL" ] = "yes"; - else if (configCmdLine.at(i) == "-no-syncqt") dictionary[ "SYNCQT" ] = "no"; - else if (configCmdLine.at(i) == "-no-qmake") - dictionary[ "BUILD_QMAKE" ] = "no"; - else if (configCmdLine.at(i) == "-qmake") - dictionary[ "BUILD_QMAKE" ] = "yes"; - - else if (configCmdLine.at(i) == "-qtnamespace") { - ++i; - if (i == argCount) - break; - dictionary[ "QT_NAMESPACE" ] = configCmdLine.at(i); - } else if (configCmdLine.at(i) == "-qtlibinfix") { - ++i; - if (i == argCount) - break; - dictionary[ "QT_LIBINFIX" ] = configCmdLine.at(i); - } else if (configCmdLine.at(i) == "-D") { - ++i; - if (i == argCount) - break; - qmakeDefines += configCmdLine.at(i); - } else if (configCmdLine.at(i) == "-I") { - ++i; - if (i == argCount) - break; - qmakeIncludes += configCmdLine.at(i); - } else if (configCmdLine.at(i) == "-L") { - ++i; - if (i == argCount) - break; - QFileInfo checkDirectory(configCmdLine.at(i)); - if (!checkDirectory.isDir()) { - cout << "Argument passed to -L option is not a directory path. Did you mean the -l option?" << endl; - dictionary[ "DONE" ] = "error"; - break; - } - qmakeLibs += QString("-L" + configCmdLine.at(i)); - } else if (configCmdLine.at(i) == "-l") { - ++i; - if (i == argCount) - break; - qmakeLibs += QString("-l" + configCmdLine.at(i)); - } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS=")) { - opensslLibs = configCmdLine.at(i); - } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_DEBUG=")) { - opensslLibsDebug = configCmdLine.at(i); - } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_RELEASE=")) { - opensslLibsRelease = configCmdLine.at(i); - } else if (configCmdLine.at(i).startsWith("OPENSSL_PATH=")) { - opensslPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); - } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) { - psqlLibs = configCmdLine.at(i); - } else if (configCmdLine.at(i).startsWith("SYBASE=")) { - sybase = configCmdLine.at(i); - } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { - sybaseLibs = configCmdLine.at(i); - } else if (configCmdLine.at(i).startsWith("DBUS_PATH=")) { - dbusPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); - } else if (configCmdLine.at(i).startsWith("DBUS_HOST_PATH=")) { - dbusHostPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); - } else if (configCmdLine.at(i).startsWith("MYSQL_PATH=")) { - mysqlPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); - } else if (configCmdLine.at(i).startsWith("ZLIB_LIBS=")) { - zlibLibs = QDir::fromNativeSeparators(configCmdLine.at(i)); - } - - else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ - ++i; - if (i == argCount) - break; - dictionary[ "VERSION" ] = configCmdLine.at(i); - } - - else if (configCmdLine.at(i) == "-saveconfig") { - ++i; - if (i == argCount) - break; - dictionary[ "CUSTOMCONFIG" ] = "_" + configCmdLine.at(i); - } - else if (configCmdLine.at(i) == "-confirm-license") { dictionary["LICENSE_CONFIRMED"] = "yes"; } - else if (configCmdLine.at(i) == "-make") { - ++i; - if (i == argCount) - break; - QString part = configCmdLine.at(i); - if (!allBuildParts.contains(part)) { - cout << "Unknown part " << part << " passed to -make." << endl; - dictionary["DONE"] = "error"; - } - buildParts += part; - } else if (configCmdLine.at(i) == "-nomake") { - ++i; - if (i == argCount) - break; - QString part = configCmdLine.at(i); - if (!allBuildParts.contains(part)) { - cout << "Unknown part " << part << " passed to -nomake." << endl; - dictionary["DONE"] = "error"; - } - nobuildParts += part; - } - - else if (configCmdLine.at(i) == "-skip") { - ++i; - if (i == argCount) - break; - QString mod = configCmdLine.at(i); - if (!mod.startsWith(QLatin1String("qt"))) - mod.insert(0, QStringLiteral("qt")); - if (!QFileInfo(sourcePath + "/../" + mod).isDir()) { - cout << "Attempting to skip non-existent module " << mod << "." << endl; - dictionary["DONE"] = "error"; - } - skipModules += mod; - } - // Directories ---------------------------------------------- else if (configCmdLine.at(i) == "-prefix") { ++i; @@ -1185,9 +327,6 @@ void Configure::parseCmdLine() break; dictionary[ "CFG_SYSROOT" ] = configCmdLine.at(i); } - else if (configCmdLine.at(i) == "-no-gcc-sysroot") { - dictionary[ "CFG_GCC_SYSROOT" ] = "no"; - } else if (configCmdLine.at(i) == "-hostprefix") { ++i; @@ -1232,95 +371,10 @@ void Configure::parseCmdLine() dictionary[ "MAKE" ] = configCmdLine.at(i); } - else if (configCmdLine.at(i).indexOf(QRegExp("^-(en|dis)able-")) != -1) { - // Scan to see if any specific modules and drivers are enabled or disabled - for (QStringList::Iterator module = modules.begin(); module != modules.end(); ++module) { - if (configCmdLine.at(i) == QString("-enable-") + (*module)) { - enabledModules += (*module); - break; - } - else if (configCmdLine.at(i) == QString("-disable-") + (*module)) { - disabledModules += (*module); - break; - } - } - } - - else if (configCmdLine.at(i) == "-directwrite") { - dictionary["DIRECTWRITE"] = "yes"; - } else if (configCmdLine.at(i) == "-no-directwrite") { - dictionary["DIRECTWRITE"] = "no"; - } - - else if (configCmdLine.at(i) == "-direct2d") { - dictionary["DIRECT2D"] = "yes"; - } else if (configCmdLine.at(i) == "-no-direct2d") { - dictionary["DIRECT2D"] = "no"; - } - - else if (configCmdLine.at(i) == "-nis") { - dictionary["NIS"] = "yes"; - } else if (configCmdLine.at(i) == "-no-nis") { - dictionary["NIS"] = "no"; - } - - else if (configCmdLine.at(i) == "-cups") { - dictionary["QT_CUPS"] = "yes"; - } else if (configCmdLine.at(i) == "-no-cups") { - dictionary["QT_CUPS"] = "no"; - } - - else if (configCmdLine.at(i) == "-iconv") { - dictionary["QT_ICONV"] = "yes"; - } else if (configCmdLine.at(i) == "-no-iconv") { - dictionary["QT_ICONV"] = "no"; - } else if (configCmdLine.at(i) == "-sun-iconv") { - dictionary["QT_ICONV"] = "sun"; - } else if (configCmdLine.at(i) == "-gnu-iconv") { - dictionary["QT_ICONV"] = "gnu"; - } - - else if (configCmdLine.at(i) == "-no-evdev") { - dictionary[ "QT_EVDEV" ] = "no"; - } else if (configCmdLine.at(i) == "-evdev") { - dictionary[ "QT_EVDEV" ] = "yes"; - } - - else if (configCmdLine.at(i) == "-no-mtdev") { - dictionary[ "QT_MTDEV" ] = "no"; - } else if (configCmdLine.at(i) == "-mtdev") { - dictionary[ "QT_MTDEV" ] = "yes"; - } - - else if (configCmdLine.at(i) == "-inotify") { - dictionary["QT_INOTIFY"] = "yes"; - } else if (configCmdLine.at(i) == "-no-inotify") { - dictionary["QT_INOTIFY"] = "no"; - } - - else if (configCmdLine.at(i) == "-largefile") { - dictionary["LARGE_FILE"] = "yes"; - } - - else if (configCmdLine.at(i) == "-fontconfig") { - dictionary["FONT_CONFIG"] = "yes"; - } else if (configCmdLine.at(i) == "-no-fontconfig") { - dictionary["FONT_CONFIG"] = "no"; - } - - else if (configCmdLine.at(i) == "-posix-ipc") { - dictionary["POSIX_IPC"] = "yes"; - } - - else if (configCmdLine.at(i) == "-glib") { - dictionary["QT_GLIB"] = "yes"; - } - else if (configCmdLine.at(i) == "-sysconfdir") { ++i; if (i == argCount) break; - dictionary["QT_INSTALL_SETTINGS"] = configCmdLine.at(i); } @@ -1349,7 +403,6 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - dictionary[ "ANDROID_HOST" ] = configCmdLine.at(i); } @@ -1372,12 +425,6 @@ void Configure::parseCmdLine() } else if (configCmdLine.at(i) == "-android-style-assets") { dictionary[ "ANDROID_STYLE_ASSETS" ] = "yes"; } - - else { - dictionary[ "DONE" ] = "error"; - cout << "Unknown option " << configCmdLine.at(i) << endl; - break; - } } // Ensure that QMAKESPEC exists in the mkspecs folder @@ -1397,12 +444,9 @@ void Configure::parseCmdLine() dictionary[ "DONE" ] = "error"; if (dictionary ["QMAKESPEC_FROM"] == "commandline") { cout << "Invalid option \"" << dictionary["QMAKESPEC"] << "\" for -platform." << endl; - } else if (dictionary ["QMAKESPEC_FROM"] == "env") { - cout << "QMAKESPEC environment variable is set to \"" << dictionary["QMAKESPEC"] - << "\" which is not a supported platform" << endl; } else { // was autodetected from environment cout << "Unable to detect the platform from environment. Use -platform command line" << endl - << "argument or set the QMAKESPEC environment variable and run configure again." << endl; + << "argument and run configure again." << endl; } cout << "See the README file for a list of supported operating systems and compilers." << endl; } else { @@ -1449,173 +493,6 @@ void Configure::parseCmdLine() cout << "Invalid option \"" << dictionary["XQMAKESPEC"] << "\" for -xplatform." << endl; } } - - // Allow tests for private classes to be compiled against internal builds - if (dictionary["BUILDDEV"] == "yes") { - qtConfig << "private_tests"; - if (dictionary["WERROR"] != "no") - qmakeConfig << "warnings_are_errors"; - if (dictionary["HEADERSCLEAN"] != "no") - qmakeConfig << "headersclean"; - } else { - if (dictionary["WERROR"] == "yes") - qmakeConfig << "warnings_are_errors"; - if (dictionary["HEADERSCLEAN"] == "yes") - qmakeConfig << "headersclean"; - } - - if (dictionary["FORCE_ASSERTS"] == "yes") - qtConfig += "force_asserts"; - - for (QStringList::Iterator dis = disabledModules.begin(); dis != disabledModules.end(); ++dis) { - modules.removeAll((*dis)); - } - for (QStringList::Iterator ena = enabledModules.begin(); ena != enabledModules.end(); ++ena) { - if (modules.indexOf((*ena)) == -1) - modules += (*ena); - } - qtConfig += modules; - - for (QStringList::Iterator it = disabledModules.begin(); it != disabledModules.end(); ++it) - qtConfig.removeAll(*it); - - if ((dictionary[ "REDO" ] != "yes") && (dictionary[ "HELP" ] != "yes") - && (dictionary[ "DONE" ] != "error")) - saveCmdLine(); -} - -void Configure::validateArgs() -{ - // Validate the specified config - QString cfgpath = sourcePath + "/src/corelib/global/qconfig-" + dictionary["QCONFIG"] + ".h"; - - // Try internal configurations first. - QStringList possible_configs = QStringList() - << "minimal" - << "small" - << "medium" - << "large" - << "full"; - int index = possible_configs.indexOf(dictionary["QCONFIG"]); - if (index >= 0) { - for (int c = 0; c <= index; c++) { - qtConfig += possible_configs[c] + "-config"; - } - if (dictionary["QCONFIG"] != "full") - dictionary["QCONFIG_PATH"] = cfgpath; - return; - } - - if (!QFileInfo::exists(cfgpath)) { - cfgpath = QFileInfo(dictionary["QCONFIG"]).absoluteFilePath(); - if (!QFileInfo::exists(cfgpath)) { - dictionary[ "DONE" ] = "error"; - cout << "No such configuration \"" << qPrintable(dictionary["QCONFIG"]) << "\"" << endl ; - return; - } - } - dictionary["QCONFIG_PATH"] = cfgpath; -} - -// Output helper functions --------------------------------[ Start ]- -/*! - Determines the length of a string token. -*/ -static int tokenLength(const char *str) -{ - if (*str == 0) - return 0; - - const char *nextToken = strpbrk(str, " _/\n\r"); - if (nextToken == str || !nextToken) - return 1; - - return int(nextToken - str); -} - -/*! - Prints out a string which starts at position \a startingAt, and - indents each wrapped line with \a wrapIndent characters. - The wrap point is set to the console width, unless that width - cannot be determined, or is too small. -*/ -void Configure::desc(const char *description, int startingAt, int wrapIndent) -{ - int linePos = startingAt; - - bool firstLine = true; - const char *nextToken = description; - while (*nextToken) { - int nextTokenLen = tokenLength(nextToken); - if (*nextToken == '\n' // Wrap on newline, duh - || (linePos + nextTokenLen > outputWidth)) // Wrap at outputWidth - { - printf("\n"); - linePos = 0; - firstLine = false; - if (*nextToken == '\n') - ++nextToken; - continue; - } - if (!firstLine && linePos < wrapIndent) { // Indent to wrapIndent - printf("%*s", wrapIndent , ""); - linePos = wrapIndent; - if (*nextToken == ' ') { - ++nextToken; - continue; - } - } - printf("%.*s", nextTokenLen, nextToken); - linePos += nextTokenLen; - nextToken += nextTokenLen; - } -} - -/*! - Prints out an option with its description wrapped at the - description starting point. If \a skipIndent is true, the - indentation to the option is not outputted (used by marked option - version of desc()). Extra spaces between option and its - description is filled with\a fillChar, if there's available - space. -*/ -void Configure::desc(const char *option, const char *description, bool skipIndent, char fillChar) -{ - if (!skipIndent) - printf("%*s", optionIndent, ""); - - int remaining = descIndent - optionIndent - int(strlen(option)); - int wrapIndent = descIndent + qMax(0, 1 - remaining); - printf("%s", option); - - if (remaining > 2) { - printf(" "); // Space in front - for (int i = remaining; i > 2; --i) - printf("%c", fillChar); // Fill, if available space - } - printf(" "); // Space between option and description - - desc(description, wrapIndent, wrapIndent); - printf("\n"); -} - -/*! - Same as above, except it also marks an option with an '*', if - the option is default action. -*/ -void Configure::desc(const char *mark_option, const char *mark, const char *option, const char *description, char fillChar) -{ - const QString markedAs = dictionary.value(mark_option); - if (markedAs == "auto" && markedAs == mark) // both "auto", always => + - printf(" + "); - else if (markedAs == "auto") // setting marked as "auto" and option is default => + - printf(" %c " , (defaultTo(mark_option) == QLatin1String(mark))? '+' : ' '); - else if (QLatin1String(mark) == "auto" && markedAs != "no") // description marked as "auto" and option is available => + - printf(" %c " , checkAvailability(mark_option) ? '+' : ' '); - else // None are "auto", (markedAs == mark) => * - printf(" %c " , markedAs == QLatin1String(mark) ? '*' : ' '); - - desc(option, description, true, fillChar); } /*! @@ -1624,1061 +501,8 @@ void Configure::desc(const char *mark_option, const char *mark, const char *opti */ void Configure::applySpecSpecifics() { - if (dictionary.contains("XQMAKESPEC")) { - //Disable building tools when cross compiling. - nobuildParts << "tools"; - } - - if (dictionary.value("XQMAKESPEC").startsWith("winphone") || dictionary.value("XQMAKESPEC").startsWith("winrt")) { - dictionary[ "STYLE_WINDOWSXP" ] = "no"; - dictionary[ "STYLE_WINDOWSVISTA" ] = "no"; - dictionary[ "GIF" ] = "qt"; - dictionary[ "JPEG" ] = "qt"; - dictionary[ "LIBJPEG" ] = "qt"; - dictionary[ "LIBPNG" ] = "qt"; - dictionary[ "FREETYPE" ] = "yes"; - dictionary[ "OPENGL" ] = "yes"; - dictionary[ "OPENGL_ES_2" ] = "yes"; - dictionary[ "OPENVG" ] = "no"; - dictionary[ "SSL" ] = "yes"; - dictionary[ "OPENSSL" ] = "no"; - dictionary[ "DBUS" ] = "no"; - dictionary[ "ZLIB" ] = "qt"; - dictionary[ "PCRE" ] = "qt"; - dictionary[ "ICU" ] = "qt"; - dictionary[ "LARGE_FILE" ] = "no"; - dictionary[ "ANGLE" ] = "yes"; - dictionary[ "DYNAMICGL" ] = "no"; - } else if (dictionary.value("XQMAKESPEC").startsWith("linux")) { //TODO actually wrong. - //TODO - dictionary[ "STYLE_WINDOWSXP" ] = "no"; - dictionary[ "STYLE_WINDOWSVISTA" ] = "no"; - dictionary[ "KBD_DRIVERS" ] = "tty"; - dictionary[ "GFX_DRIVERS" ] = "linuxfb"; - dictionary[ "MOUSE_DRIVERS" ] = "pc linuxtp"; - dictionary[ "OPENGL" ] = "no"; - dictionary[ "DBUS"] = "no"; - dictionary[ "QT_INOTIFY" ] = "no"; - dictionary[ "QT_CUPS" ] = "no"; - dictionary[ "QT_GLIB" ] = "no"; - dictionary[ "QT_ICONV" ] = "no"; - dictionary[ "QT_EVDEV" ] = "no"; - dictionary[ "QT_MTDEV" ] = "no"; - dictionary[ "FONT_CONFIG" ] = "auto"; - dictionary[ "ANGLE" ] = "no"; - - dictionary["DECORATIONS"] = "default windows styled"; - } else if (platform() == QNX) { - dictionary[ "REDUCE_EXPORTS" ] = "yes"; - dictionary["STACK_PROTECTOR_STRONG"] = "auto"; - dictionary["SLOG2"] = "auto"; - dictionary["QNX_IMF"] = "auto"; - dictionary["PPS"] = "auto"; - dictionary["LGMON"] = "auto"; - dictionary["QT_XKBCOMMON"] = "no"; - dictionary[ "ANGLE" ] = "no"; - dictionary[ "DYNAMICGL" ] = "no"; - dictionary[ "FONT_CONFIG" ] = "auto"; - dictionary[ "ICU" ] = "auto"; - dictionary[ "POLL" ] = "poll"; - dictionary[ "ZLIB" ] = "system"; - } else if (platform() == ANDROID) { - dictionary[ "REDUCE_EXPORTS" ] = "yes"; - dictionary[ "BUILD" ] = "release"; - dictionary[ "BUILDALL" ] = "no"; - dictionary[ "LARGE_FILE" ] = "no"; - dictionary[ "ANGLE" ] = "no"; - dictionary[ "DYNAMICGL" ] = "no"; - dictionary[ "REDUCE_RELOCATIONS" ] = "yes"; - dictionary[ "QT_GETIFADDRS" ] = "no"; - dictionary[ "QT_XKBCOMMON" ] = "no"; + if (platform() == ANDROID) dictionary["ANDROID_STYLE_ASSETS"] = "yes"; - dictionary[ "STYLE_ANDROID" ] = "yes"; - dictionary[ "POLL" ] = "poll"; - dictionary[ "ZLIB" ] = "system"; - } -} - -// Output helper functions ---------------------------------[ Stop ]- - - -bool Configure::displayHelp() -{ - if (dictionary[ "HELP" ] == "yes") { - desc("Usage: configure [options]\n\n", 0, 7); - - desc("Installation options:\n\n"); - - desc("These are optional, but you may specify install directories.\n\n", 0, 1); - - desc( "-prefix <dir>", "The deployment directory, as seen on the target device.\n" - "(default %CD%)\n"); - - desc( "-extprefix <dir>", "The installation directory, as seen on the host machine.\n" - "(default SYSROOT/PREFIX)\n"); - - desc( "-hostprefix [dir]", "The installation directory for build tools running on the\n" - "host machine. If [dir] is not given, the current build\n" - "directory will be used. (default EXTPREFIX)\n"); - - desc("You may use these to change the layout of the install. Note that all directories\n" - "except -sysconfdir should be located under -prefix/-hostprefix:\n\n"); - - desc( "-bindir <dir>", "User executables will be installed to <dir>\n(default PREFIX/bin)"); - desc( "-libdir <dir>", "Libraries will be installed to <dir>\n(default PREFIX/lib)"); - desc( "-headerdir <dir>", "Headers will be installed to <dir>\n(default PREFIX/include)"); - desc( "-archdatadir <dir>", "Architecture-dependent data used by Qt will be installed to <dir>\n(default PREFIX)"); - desc( "-libexecdir <dir>", "Program executables will be installed to <dir>\n(default ARCHDATADIR/bin)"); - desc( "-plugindir <dir>", "Plugins will be installed to <dir>\n(default ARCHDATADIR/plugins)"); - desc( "-importdir <dir>", "Imports for QML1 will be installed to <dir>\n(default ARCHDATADIR/imports)"); - desc( "-qmldir <dir>", "Imports for QML2 will be installed to <dir>\n(default ARCHDATADIR/qml)"); - desc( "-datadir <dir>", "Data used by Qt programs will be installed to <dir>\n(default PREFIX)"); - desc( "-docdir <dir>", "Documentation will be installed to <dir>\n(default DATADIR/doc)"); - desc( "-translationdir <dir>", "Translations of Qt programs will be installed to <dir>\n(default DATADIR/translations)"); - desc( "-examplesdir <dir>", "Examples will be installed to <dir>\n(default PREFIX/examples)"); - desc( "-testsdir <dir>", "Tests will be installed to <dir>\n(default PREFIX/tests)\n"); - - desc( "-hostbindir <dir>", "Host executables will be installed to <dir>\n(default HOSTPREFIX/bin)"); - desc( "-hostlibdir <dir>", "Host libraries will be installed to <dir>\n(default HOSTPREFIX/lib)"); - desc( "-hostdatadir <dir>", "Data used by qmake will be installed to <dir>\n(default HOSTPREFIX)"); - - desc("\nConfigure options:\n\n"); - - desc(" The defaults (*) are usually acceptable. A plus (+) denotes a default value" - " that needs to be evaluated. If the evaluation succeeds, the feature is" - " included. Here is a short explanation of each option:\n\n", 0, 1); - - desc("BUILD", "release","-release", "Compile and link Qt with debugging turned off."); - desc("BUILD", "debug", "-debug", "Compile and link Qt with debugging turned on."); - desc("BUILDALL", "yes", "-debug-and-release", "Compile and link two Qt libraries, with and without debugging turned on.\n"); - - desc("FORCEDEBUGINFO", "yes","-force-debug-info", "Create symbol files for release builds."); - desc("SEPARATE_DEBUG_INFO", "yes","-separate-debug-info", "Strip debug information into a separate file.\n"); - - desc("BUILDDEV", "yes", "-developer-build", "Compile and link Qt with Qt developer options (including auto-tests exporting)\n"); - - desc("RELEASE_TOOLS", "yes", "-optimized-tools", "Build optimized host tools even in debug build."); - desc("RELEASE_TOOLS", "no", "-no-optimized-tools", "Do not build optimized host tools even in debug build.\n"); - - desc("OPENSOURCE", "opensource", "-opensource", "Compile and link the Open-Source Edition of Qt."); - desc("COMMERCIAL", "commercial", "-commercial", "Compile and link the Commercial Edition of Qt.\n"); - - desc( "-c++std <edition>", "Compile Qt with C++ standard edition (c++11, c++14, c++1z)\n" - "Default: highest supported. This option is not supported for MSVC.\n"); - - desc("USE_GOLD_LINKER", "yes", "-use-gold-linker", "Link using the GNU gold linker (gcc only)."); - desc("USE_GOLD_LINKER", "no", "-no-use-gold-linker", "Do not link using the GNU gold linker.\n"); - - desc("ENABLE_NEW_DTAGS", "yes", "-enable-new-dtags", "Use new DTAGS for RPATH (Linux only)."); - desc("ENABLE_NEW_DTAGS", "no", "-disable-new-dtags", "Do not use new DTAGS for RPATH.\n"); - - desc("SHARED", "yes", "-shared", "Create and use shared Qt libraries."); - desc("SHARED", "no", "-static", "Create and use static Qt libraries.\n"); - - desc("STATIC_RUNTIME", "no", "-static-runtime","Statically link the C/C++ runtime library.\n"); - - desc("LTCG", "yes", "-ltcg", "Use Link Time Code Generation. (Release builds only)"); - desc("LTCG", "no", "-no-ltcg", "Do not use Link Time Code Generation.\n"); - - desc( "-make <part>", "Add part to the list of parts to be built at make time"); - for (int i=0; i<defaultBuildParts.size(); ++i) - desc( "", qPrintable(QString(" %1").arg(defaultBuildParts.at(i))), false, ' '); - desc( "-nomake <part>", "Exclude part from the list of parts to be built.\n"); - - desc( "-skip <module>", "Exclude an entire module from the build.\n"); - - desc( "-no-compile-examples", "Install only the sources of examples.\n"); - - desc("WIDGETS", "no", "-no-widgets", "Disable Qt Widgets module.\n"); - desc("GUI", "no", "-no-gui", "Disable Qt GUI module.\n"); - - desc("ACCESSIBILITY", "no", "-no-accessibility", "Disable accessibility support.\n"); - desc( "", "Disabling accessibility is not recommended, as it will break QStyle\n" - "and may break other internal parts of Qt.\n" - "With this switch you create a source incompatible version of Qt,\n" - "which is unsupported.\n"); - desc("ACCESSIBILITY", "yes", "-accessibility", "Enable accessibility support.\n"); - - desc( "-no-sql-<driver>", "Disable SQL <driver> entirely, by default none are turned on."); - desc( "-qt-sql-<driver>", "Enable a SQL <driver> in the Qt Library."); - desc( "-plugin-sql-<driver>", "Enable SQL <driver> as a plugin to be linked to at run time.\n" - "Available values for <driver>:"); - desc("SQL_MYSQL", "auto", "", " mysql", ' '); - desc("SQL_PSQL", "auto", "", " psql", ' '); - desc("SQL_OCI", "auto", "", " oci", ' '); - desc("SQL_ODBC", "auto", "", " odbc", ' '); - desc("SQL_TDS", "auto", "", " tds", ' '); - desc("SQL_DB2", "auto", "", " db2", ' '); - desc("SQL_SQLITE", "auto", "", " sqlite", ' '); - desc("SQL_SQLITE2", "auto", "", " sqlite2", ' '); - desc("SQL_IBASE", "auto", "", " ibase", ' '); - desc( "", "(drivers marked with a '+' have been detected as available on this system)\n", false, ' '); - - desc( "-system-sqlite", "Use sqlite from the operating system.\n"); - - desc("OPENGL", "no","-no-opengl", "Do not support OpenGL."); - desc("OPENGL", "no","-opengl <api>", "Enable OpenGL support with specified API version.\n" - "Available values for <api>:"); - desc("", "no", "", " desktop - Enable support for Desktop OpenGL", ' '); - desc("", "no", "", " dynamic - Enable support for dynamically loaded OpenGL (either desktop or ES)", ' '); - desc("OPENGL_ES_2", "yes", "", " es2 - Enable support for OpenGL ES 2.0\n", ' '); - - desc("OPENVG", "no","-no-openvg", "Disables OpenVG functionality."); - desc("OPENVG", "yes","-openvg", "Enables OpenVG functionality.\n"); - desc( "-force-asserts", "Activate asserts in release mode.\n"); - desc( "-platform <spec>", "The operating system and compiler you are building on.\n(default %QMAKESPEC%)\n"); - desc( "-xplatform <spec>", "The operating system and compiler you are cross compiling to.\n"); - desc( "", "See the README file for a list of supported operating systems and compilers.\n", false, ' '); - - desc( "-sysroot <dir>", "Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths."); - desc( "-no-gcc-sysroot", "When using -sysroot, it disables the passing of --sysroot to the compiler.\n"); - - desc( "-qconfig <local>", "Use src/corelib/global/qconfig-<local>.h rather than the\n" - "default 'full'.\n"); - - desc("NIS", "no", "-no-nis", "Do not compile NIS support."); - desc("NIS", "yes", "-nis", "Compile NIS support.\n"); - - desc("QT_ICONV", "disable", "-no-iconv", "Do not enable support for iconv(3)."); - desc("QT_ICONV", "yes", "-iconv", "Enable support for iconv(3)."); - desc("QT_ICONV", "yes", "-sun-iconv", "Enable support for iconv(3) using sun-iconv."); - desc("QT_ICONV", "yes", "-gnu-iconv", "Enable support for iconv(3) using gnu-libiconv.\n"); - - desc("QT_EVDEV", "no", "-no-evdev", "Do not enable support for evdev."); - desc("QT_EVDEV", "yes", "-evdev", "Enable support for evdev."); - - desc("QT_MTDEV", "no", "-no-mtdev", "Do not enable support for mtdev."); - desc("QT_MTDEV", "yes", "-mtdev", "Enable support for mtdev."); - - desc("QT_INOTIFY", "yes", "-inotify", "Explicitly enable Qt inotify(7) support."); - desc("QT_INOTIFY", "no", "-no-inotify", "Explicitly disable Qt inotify(7) support.\n"); - - desc("QT_EVENTFD", "yes", "-eventfd", "Enable eventfd(7) support in the UNIX event loop."); - desc("QT_EVENTFD", "no", "-no-eventfd", "Disable eventfd(7) support in the UNIX event loop.\n"); - - desc("LARGE_FILE", "yes", "-largefile", "Enables Qt to access files larger than 4 GB.\n"); - - desc("POSIX_IPC", "yes", "-posix-ipc", "Enable POSIX IPC.\n"); - - desc("QT_GLIB", "yes", "-glib", "Compile Glib support.\n"); - - desc("QT_INSTALL_SETTINGS", "auto", "-sysconfdir <dir>", "Settings used by Qt programs will be looked for in\n<dir>.\n"); - - desc("SYSTEM_PROXIES", "yes", "-system-proxies", "Use system network proxies by default."); - desc("SYSTEM_PROXIES", "no", "-no-system-proxies", "Do not use system network proxies by default.\n"); - - desc("WERROR", "yes", "-warnings-are-errors", "Make warnings be treated as errors."); - desc("WERROR", "no", "-no-warnings-are-errors","Make warnings be treated normally."); - - desc( "-qtnamespace <name>", "Wraps all Qt library code in 'namespace name {...}'."); - desc( "-qtlibinfix <infix>", "Renames all Qt* libs to Qt*<infix>.\n"); - desc( "-D <define>", "Add an explicit define to the preprocessor."); - desc( "-I <includepath>", "Add an explicit include path."); - desc( "-L <librarypath>", "Add an explicit library path."); - desc( "-l <libraryname>", "Add an explicit library name, residing in a librarypath.\n"); - - desc("PCH", "no", "-no-pch", "Do not use precompiled header support."); - desc("PCH", "yes", "-pch", "Use precopmiled header support.\n"); - - desc( "-help, -h, -?", "Display this information.\n"); - - // 3rd party stuff options go below here -------------------------------------------------------------------------------- - desc("Third Party Libraries:\n\n"); - - desc("ZLIB", "qt", "-qt-zlib", "Use the zlib bundled with Qt."); - desc("ZLIB", "system", "-system-zlib", "Use zlib from the operating system.\nSee http://www.gzip.org/zlib\n"); - - desc("PCRE", "qt", "-qt-pcre", "Use the PCRE library bundled with Qt."); - desc("PCRE", "system", "-system-pcre", "Use the PCRE library from the operating system.\nSee http://pcre.org/\n"); - - desc("ICU", "yes", "-icu", "Use the ICU library."); - desc("ICU", "no", "-no-icu", "Do not use the ICU library.\nSee http://site.icu-project.org/\n"); - - desc("GIF", "no", "-no-gif", "Do not compile GIF reading support.\n"); - - desc("LIBPNG", "no", "-no-libpng", "Do not compile PNG support."); - desc("LIBPNG", "qt", "-qt-libpng", "Use the libpng bundled with Qt."); - desc("LIBPNG", "system","-system-libpng", "Use libpng from the operating system.\nSee http://www.libpng.org/pub/png\n"); - - desc("LIBJPEG", "no", "-no-libjpeg", "Do not compile JPEG support."); - desc("LIBJPEG", "qt", "-qt-libjpeg", "Use the libjpeg bundled with Qt."); - desc("LIBJPEG", "system","-system-libjpeg", "Use libjpeg from the operating system.\nSee http://www.ijg.org\n"); - - desc("DOUBLECONVERSION", "no", "-no-doubleconversion", "Use sscanf_l and snprintf_l for (imprecise) double conversion."); - desc("DOUBLECONVERSION", "qt", "-qt-doubleconversion", "Use the libdouble-conversion bundled with Qt."); - desc("DOUBLECONVERSION", "system", "-system-doubleconversion", "Use the libdouble-conversion provided by the system."); - - desc("FREETYPE", "no", "-no-freetype", "Do not compile in Freetype2 support."); - desc("FREETYPE", "yes", "-qt-freetype", "Use the libfreetype bundled with Qt."); - desc("FREETYPE", "system","-system-freetype", "Use the libfreetype provided by the system.\n"); - - desc("FONT_CONFIG", "yes", "-fontconfig", "Build with FontConfig support."); - desc("FONT_CONFIG", "no", "-no-fontconfig", "Do not build with FontConfig support.\n"); - - desc("HARFBUZZ", "no", "-no-harfbuzz", "Do not compile in HarfBuzz-NG support."); - desc("HARFBUZZ", "qt", "-qt-harfbuzz", "Use HarfBuzz-NG bundled with Qt to do text shaping.\n" - "It can still be disabled by setting\n" - "the QT_HARFBUZZ environment variable to \"old\"."); - desc("HARFBUZZ", "system","-system-harfbuzz", "Use HarfBuzz-NG from the operating system\n" - "to do text shaping. It can still be disabled\n" - "by setting the QT_HARFBUZZ environment variable to \"old\".\n" - "See http://www.harfbuzz.org\n"); - - if (platform() == QNX) { - desc("SLOG2", "yes", "-slog2", "Compile with slog2 support."); - desc("SLOG2", "no", "-no-slog2", "Do not compile with slog2 support."); - desc("QNX_IMF", "yes", "-imf", "Compile with imf support."); - desc("QNX_IMF", "no", "-no-imf", "Do not compile with imf support."); - desc("PPS", "yes", "-pps", "Compile with PPS support."); - desc("PPS", "no", "-no-pps", "Do not compile with PPS support."); - desc("LGMON", "yes", "-lgmon", "Compile with lgmon support."); - desc("LGMON", "no", "-no-lgmon", "Do not compile with lgmon support.\n"); - } - - desc("ANGLE", "yes", "-angle", "Use the ANGLE implementation of OpenGL ES 2.0."); - desc("ANGLE", "no", "-no-angle", "Do not use ANGLE.\nSee https://chromium.googlesource.com/angle/angle/+/master/README.md\n"); - // Qt\Windows only options go below here -------------------------------------------------------------------------------- - desc("\nQt for Windows only:\n\n"); - - desc("INCREDIBUILD_XGE", "no", "-no-incredibuild-xge", "Do not add IncrediBuild XGE distribution commands to custom build steps."); - desc("INCREDIBUILD_XGE", "yes", "-incredibuild-xge", "Add IncrediBuild XGE distribution commands to custom build steps. This will distribute MOC and UIC steps, and other custom buildsteps which are added to the INCREDIBUILD_XGE variable.\n(The IncrediBuild distribution commands are only added to Visual Studio projects)\n"); - - desc("PLUGIN_MANIFESTS", "no", "-no-plugin-manifests", "Do not embed manifests in plugins."); - desc("PLUGIN_MANIFESTS", "yes", "-plugin-manifests", "Embed manifests in plugins.\n"); - desc("BUILD_QMAKE", "no", "-no-qmake", "Do not compile qmake."); - desc("BUILD_QMAKE", "yes", "-qmake", "Compile qmake.\n"); - - desc( "-qreal [double|float]", "typedef qreal to the specified type. The default is double.\n" - "Note that changing this flag affects binary compatibility.\n"); - - desc("RTTI", "no", "-no-rtti", "Do not compile runtime type information."); - desc("RTTI", "yes", "-rtti", "Compile runtime type information."); - desc("STRIP", "no", "-no-strip", "Do not strip libraries and executables of debug info when installing."); - desc("STRIP", "yes", "-strip", "Strip libraries and executables of debug info when installing.\n"); - - desc("SSE2", "no", "-no-sse2", "Do not compile with use of SSE2 instructions."); - desc("SSE2", "yes", "-sse2", "Compile with use of SSE2 instructions."); - desc("SSE3", "no", "-no-sse3", "Do not compile with use of SSE3 instructions."); - desc("SSE3", "yes", "-sse3", "Compile with use of SSE3 instructions."); - desc("SSSE3", "no", "-no-ssse3", "Do not compile with use of SSSE3 instructions."); - desc("SSSE3", "yes", "-ssse3", "Compile with use of SSSE3 instructions."); - desc("SSE4_1", "no", "-no-sse4.1", "Do not compile with use of SSE4.1 instructions."); - desc("SSE4_1", "yes", "-sse4.1", "Compile with use of SSE4.1 instructions."); - desc("SSE4_2", "no", "-no-sse4.2", "Do not compile with use of SSE4.2 instructions."); - desc("SSE4_2", "yes", "-sse4.2", "Compile with use of SSE4.2 instructions."); - desc("AVX", "no", "-no-avx", "Do not compile with use of AVX instructions."); - desc("AVX", "yes", "-avx", "Compile with use of AVX instructions."); - desc("AVX2", "no", "-no-avx2", "Do not compile with use of AVX2 instructions."); - desc("AVX2", "yes", "-avx2", "Compile with use of AVX2 instructions.\n"); - desc("AVX512", "no", "-no-avx512", "Do not compile with use of AVX512 instructions."); - desc("AVX512", "yes", "-avx512", "Compile with use of AVX512 instructions.\n"); - desc("SSL", "no", "-no-ssl", "Do not compile support for SSL."); - desc("SSL", "yes", "-ssl", "Enable run-time SSL support."); - desc("OPENSSL", "no", "-no-openssl", "Do not compile support for OpenSSL."); - desc("OPENSSL", "yes", "-openssl", "Enable run-time OpenSSL support."); - desc("OPENSSL", "linked","-openssl-linked", "Enable linked OpenSSL support.\n"); - 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", "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."); - desc("WMF_BACKEND", "yes","-wmf-backend", "Compile in the windows media foundation backend into Qt Multimedia.\n"); - desc("QML_DEBUG", "no", "-no-qml-debug", "Do not build the in-process QML debugging support."); - desc("QML_DEBUG", "yes", "-qml-debug", "Build the in-process QML debugging support.\n"); - desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering."); - desc("DIRECTWRITE", "yes", "-directwrite", "Build support for DirectWrite font rendering.\n"); - - desc("DIRECT2D", "no", "-no-direct2d", "Do not build the Direct2D platform plugin."); - desc("DIRECT2D", "yes", "-direct2d", "Build the Direct2D platform plugin (experimental,\n" - "requires Direct2D availability on target systems,\n" - "e.g. Windows 7 with Platform Update, Windows 8, etc.)\n"); - - desc( "-no-style-<style>", "Disable <style> entirely."); - desc( "-qt-style-<style>", "Enable <style> in the Qt Library.\nAvailable styles: "); - - desc("STYLE_WINDOWS", "yes", "", " windows", ' '); - desc("STYLE_WINDOWSXP", "auto", "", " windowsxp", ' '); - desc("STYLE_WINDOWSVISTA", "auto", "", " windowsvista", ' '); - desc("STYLE_FUSION", "yes", "", " fusion", ' '); - desc("NATIVE_GESTURES", "no", "-no-native-gestures", "Do not use native gestures on Windows 7."); - desc("NATIVE_GESTURES", "yes", "-native-gestures", "Use native gestures on Windows 7.\n"); - desc("MSVC_MP", "no", "-no-mp", "Do not use multiple processors for compiling with MSVC"); - desc("MSVC_MP", "yes", "-mp", "Use multiple processors for compiling with MSVC (-MP).\n"); - - desc( "-loadconfig <config>", "Run configure with the parameters from file configure_<config>.cache."); - desc( "-saveconfig <config>", "Run configure and save the parameters in file configure_<config>.cache."); - desc( "-redo", "Run configure with the same parameters as last time.\n"); - desc( "-v, -verbose", "Run configure tests with verbose output.\n"); - return true; - } - return false; -} - -// Locate a file and return its containing directory. -QString Configure::locateFile(const QString &fileName) const -{ - const QString mkspec = dictionary.contains(QStringLiteral("XQMAKESPEC")) - ? dictionary[QStringLiteral("XQMAKESPEC")] : dictionary[QStringLiteral("QMAKESPEC")]; - const QString file = fileName.toLower(); - QStringList pathList; - if (file.endsWith(".h")) { - static const QStringList headerPaths = - Environment::headerPaths(Environment::compilerFromQMakeSpec(mkspec)); - pathList = qmakeIncludes; - pathList += headerPaths; - } else if (file.endsWith(".lib") || file.endsWith(".a")) { - static const QStringList libPaths = - Environment::libraryPaths(Environment::compilerFromQMakeSpec(mkspec)); - pathList = libPaths; - } else { - // Fallback for .exe and .dll (latter are not covered by QStandardPaths). - static const QStringList exePaths = Environment::path(); - pathList = exePaths; - } - return Environment::findFileInPaths(file, pathList); -} - -/*! - Default value for options marked as "auto" if the test passes. - (Used both by the autoDetection() below, and the desc() function - to mark (+) the default option of autodetecting options. -*/ -QString Configure::defaultTo(const QString &option) -{ - // We prefer using the system version of the 3rd party libs - if (option == "ZLIB" - || option == "PCRE" - || option == "LIBJPEG" - || option == "LIBPNG") - return "system"; - - // PNG is always built-in, never a plugin - if (option == "PNG") - return "yes"; - - // These database drivers and image formats can be built-in or plugins. - // Prefer plugins when Qt is shared. - if (dictionary[ "SHARED" ] == "yes") { - if (option == "SQL_MYSQL" - || option == "SQL_MYSQL" - || option == "SQL_ODBC" - || option == "SQL_OCI" - || option == "SQL_PSQL" - || option == "SQL_TDS" - || option == "SQL_DB2" - || option == "SQL_SQLITE" - || option == "SQL_SQLITE2" - || option == "SQL_IBASE" - || option == "JPEG" - || option == "GIF") - return "plugin"; - } - - // By default we do not want to compile OCI driver when compiling with - // MinGW, due to lack of such support from Oracle. It prob. won't work. - // (Customer may force the use though) - if (dictionary["QMAKESPEC"].endsWith("-g++") - && option == "SQL_OCI") - return "no"; - - // keep 'auto' default for msvc, since we can't set the language supported - if (option == "C++STD" - && dictionary["QMAKESPEC"].contains("msvc")) - return "auto"; - - if (option == "SYNCQT" - && (!QFile::exists(sourcePath + "/.git"))) - return "no"; - - return "yes"; -} - -bool Configure::checkAngleAvailability(QString *errorMessage /* = 0 */) const -{ - // Check for Direct X SDK (include lib and direct shader compiler 'fxc'). - // Up to Direct X SDK June 2010 and for MinGW, this is pointed to by the - // DXSDK_DIR variable. Starting with Windows Kit 8, it is included - // in the Windows SDK. Checking for the header is not sufficient since - // it is also present in MinGW. - const QString directXSdk = Environment::detectDirectXSdk(); - const Compiler compiler = Environment::compilerFromQMakeSpec(dictionary[QStringLiteral("QMAKESPEC")]); - if (compiler < CC_MSVC2012 && directXSdk.isEmpty()) { - if (errorMessage) - *errorMessage = QStringLiteral("There is no Direct X SDK installed or the environment variable \"DXSDK_DIR\" is not set."); - return false; - } - const QString compilerHeader = QStringLiteral("d3dcompiler.h"); - if (!findFile(compilerHeader)) { - if (errorMessage) - *errorMessage = QString::fromLatin1("The header '%1' could not be found.").arg(compilerHeader); - return false; - } - if (dictionary["SSE2"] != "no") { - const QString intrinHeader = QStringLiteral("intrin.h"); // Not present on MinGW-32 - if (!findFile(intrinHeader)) { - if (errorMessage) - *errorMessage = QString::fromLatin1("The header '%1' required for SSE2 could not be found.").arg(intrinHeader); - return false; - } - } - - const QString directXLibrary = QStringLiteral("d3d11.lib"); // Ensures at least the June 2010 DXSDK is present - if (!findFile(directXLibrary)) { - if (errorMessage) - *errorMessage = QString::fromLatin1("The library '%1' could not be found.").arg(directXLibrary); - return false; - } - const QString fxcBinary = QStringLiteral("fxc.exe"); - QStringList additionalPaths; - if (!directXSdk.isEmpty()) - additionalPaths.push_back(directXSdk + QStringLiteral("/Utilities/bin/x86")); - QString fxcPath = QStandardPaths::findExecutable(fxcBinary, additionalPaths); - if (fxcPath.isEmpty()) { - if (errorMessage) - *errorMessage = QString::fromLatin1("The shader compiler '%1' could not be found.").arg(fxcBinary); - return false; - } - return true; -} - -QString Configure::checkAvx512Availability() -{ - static const char avx512features[][5] = { "cd", "er", "pf", "bw", "dq", "vl", "ifma", "vbmi" }; - - // try AVX512 Foundation. No Foundation, nothing else works. - if (!tryCompileProject("common/avx512", "AVX512=F")) - return QString(); - - QString available = "avx512f"; - for (size_t i = 0; i < sizeof(avx512features)/sizeof(avx512features[0]); ++i) { - if (tryCompileProject("common/avx512", QStringLiteral("AVX512=%0").arg(avx512features[i]).toUpper())) { - available += " avx512"; - available += avx512features[i]; - } - } - return available; -} - -/*! - Checks the system for the availability of a feature. - Returns true if the feature is available, else false. -*/ - -bool Configure::checkAvailability(const QString &part) -{ - bool available = false; - if (part == "STYLE_WINDOWSXP") - available = (platform() == WINDOWS) && findFile("uxtheme.h"); - - else if (part == "OBJCOPY") - available = tryCompileProject("unix/objcopy"); - - else if (part == "ATOMIC64") - available = tryCompileProject("common/atomic64"); - - else if (part == "ATOMIC64-LIBATOMIC") - available = tryCompileProject("common/atomic64", "LIBS+=-latomic"); - - else if (part == "ATOMICFPTR") - available = tryCompileProject("common/atomicfptr"); - - else if (part == "ZLIB") - available = findFile("zlib.h"); - - else if (part == "PCRE") - available = findFile("pcre.h"); - - else if (part == "ICU") - available = tryCompileProject("unix/icu"); - - else if (part == "ANGLE") { - available = checkAngleAvailability(); - } - - else if (part == "HARFBUZZ") - available = tryCompileProject("unix/harfbuzz"); - - else if (part == "LIBJPEG") - available = findFile("jpeglib.h"); - else if (part == "LIBPNG") - available = findFile("png.h"); - else if (part == "SQL_MYSQL") - available = findFile("mysql.h") && findFile("libmySQL.lib"); - else if (part == "SQL_ODBC") - available = findFile("sql.h") && findFile("sqlext.h") && findFile("odbc32.lib"); - else if (part == "SQL_OCI") - available = findFile("oci.h") && findFile("oci.lib"); - else if (part == "SQL_PSQL") - available = findFile("libpq-fe.h") && findFile("libpq.lib") && findFile("ws2_32.lib") && findFile("advapi32.lib"); - else if (part == "SQL_TDS") - available = findFile("sybfront.h") && findFile("sybdb.h") && findFile("ntwdblib.lib"); - else if (part == "SQL_DB2") - available = findFile("sqlcli.h") && findFile("sqlcli1.h") && findFile("db2cli.lib"); - else if (part == "SQL_SQLITE") - available = true; // Built in, we have a fork - else if (part == "SQL_SQLITE_LIB") { - if (dictionary[ "SQL_SQLITE_LIB" ] == "system") { - if (platform() == QNX) { - available = true; - dictionary[ "QT_LFLAGS_SQLITE" ] += "-lsqlite3 -lz"; - } else { - available = findFile("sqlite3.h") && findFile("sqlite3.lib"); - if (available) - dictionary[ "QT_LFLAGS_SQLITE" ] += "sqlite3.lib"; - } - } else { - available = true; - } - } else if (part == "SQL_SQLITE2") - available = findFile("sqlite.h") && findFile("sqlite.lib"); - else if (part == "SQL_IBASE") - available = findFile("ibase.h") && (findFile("gds32_ms.lib") || findFile("gds32.lib")); - else if (part == "SSE2") - available = tryCompileProject("common/sse2"); - else if (part == "SSE3") - available = tryCompileProject("common/sse3"); - else if (part == "SSSE3") - available = tryCompileProject("common/ssse3"); - else if (part == "SSE4_1") - available = tryCompileProject("common/sse4_1"); - else if (part == "SSE4_2") - available = tryCompileProject("common/sse4_2"); - else if (part == "AVX") - available = tryCompileProject("common/avx"); - else if (part == "AVX2") - available = tryCompileProject("common/avx2"); - else if (part == "OPENSSL") - available = findFile("openssl\\ssl.h"); - else if (part == "LIBPROXY") - available = dictionary.contains("XQMAKESPEC") && tryCompileProject("common/libproxy"); - else if (part == "DBUS") - available = findFile("dbus\\dbus.h"); - else if (part == "INCREDIBUILD_XGE") { - available = !QStandardPaths::findExecutable(QStringLiteral("BuildConsole.exe")).isEmpty() - && !QStandardPaths::findExecutable(QStringLiteral("xgConsole.exe")).isEmpty(); - } else if (part == "WMSDK") { - available = findFile("wmsdk.h"); - } else if (part == "AUDIO_BACKEND") { - available = true; - } else if (part == "WMF_BACKEND") { - available = findFile("mfapi.h") && findFile("mf.lib"); - } else if (part == "DIRECTWRITE") { - available = tryCompileProject("win/directwrite"); - } else if (part == "DIRECTWRITE2") { - available = tryCompileProject("win/directwrite2"); - } else if (part == "DIRECT2D") { - available = tryCompileProject("qpa/direct2d"); - } else if (part == "ICONV") { - available = tryCompileProject("unix/iconv") || tryCompileProject("unix/gnu-libiconv"); - } else if (part == "EVDEV") { - available = tryCompileProject("unix/evdev"); - } else if (part == "MTDEV") { - available = tryCompileProject("unix/mtdev"); - } else if (part == "TSLIB") { - available = tryCompileProject("unix/tslib"); - } else if (part == "INOTIFY") { - available = tryCompileProject("unix/inotify"); - } else if (part == "QT_EVENTFD") { - available = tryCompileProject("unix/eventfd"); - } else if (part == "CUPS") { - available = (platform() != WINDOWS) && (platform() != WINDOWS_RT) && tryCompileProject("unix/cups"); - } else if (part == "STACK_PROTECTOR_STRONG") { - available = (platform() == QNX) && compilerSupportsFlag("qcc -fstack-protector-strong"); - } else if (part == "SLOG2") { - available = tryCompileProject("unix/slog2"); - } else if (part == "QNX_IMF") { - available = tryCompileProject("unix/qqnx_imf"); - } else if (part == "PPS") { - available = (platform() == QNX) && tryCompileProject("unix/pps"); - } else if (part == "LGMON") { - available = (platform() == QNX) && tryCompileProject("unix/lgmon"); - } else if (part == "NEON") { - available = dictionary["QT_CPU_FEATURES"].contains("neon"); - } else if (part == "FONT_CONFIG") { - available = tryCompileProject("unix/fontconfig"); - } else if (part == "DOUBLECONVERSION") { - available = tryCompileProject("unix/doubleconversion"); - } - - return available; -} - -/* - Autodetect options marked as "auto". -*/ -void Configure::autoDetection() -{ - cout << "Running configuration tests..." << endl; - - // Auto-detect CPU architectures. - detectArch(); - - if (dictionary["C++STD"] == "auto" && !dictionary["QMAKESPEC"].contains("msvc")) { - if (!tryCompileProject("common/c++14")) { - dictionary["C++STD"] = "c++11"; - } else if (!tryCompileProject("common/c++1z")) { - dictionary["C++STD"] = "c++14"; - } else { - dictionary["C++STD"] = "c++1z"; - } - } - - if (!dictionary["QMAKESPEC"].contains("msvc")) { - if (tryCompileProject("common/c++default", QString(), false)) { - QFile iiFile(buildPath + "/config.tests/common/c++default/c++default.ii"); - if (iiFile.open(QIODevice::ReadOnly)) { - QString content = QString::fromUtf8(iiFile.readAll()); - QRegExp expr("\\b([0-9]+)L\\b"); - if (expr.indexIn(content) != -1) - dictionary["CFG_STDCXX_DEFAULT"] = expr.cap(1); - } - } - if (dictionary["CFG_STDCXX_DEFAULT"].isEmpty()) { - cout << "Could not determine the C++ standard the compiler uses by default, assuming C++98." << endl; - dictionary["CFG_STDCXX_DEFAULT"] = "199711"; - } - } - - if (dictionary["ATOMIC64"] == "auto") - dictionary["ATOMIC64"] = checkAvailability("ATOMIC64") ? "yes" : - checkAvailability("ATOMIC64-LIBATOMIC") ? "libatomic" : "no"; - - // special case: - if (!checkAvailability("ATOMICFPTR")) { - dictionary["DONE"] = "error"; - cout << "ERROR: detected an std::atomic implementation that fails for function pointers." << endl - << "Please apply the patch corresponding to your Standard Library vendor, found in" << endl - << sourcePath << "/config.tests/common/atomicfptr" << endl; - return; - } - - // Style detection - if (dictionary["STYLE_WINDOWSXP"] == "auto") - dictionary["STYLE_WINDOWSXP"] = checkAvailability("STYLE_WINDOWSXP") ? defaultTo("STYLE_WINDOWSXP") : "no"; - if (dictionary["STYLE_WINDOWSVISTA"] == "auto") // Vista style has the same requirements as XP style - dictionary["STYLE_WINDOWSVISTA"] = checkAvailability("STYLE_WINDOWSXP") ? defaultTo("STYLE_WINDOWSVISTA") : "no"; - - // Compression detection - if (dictionary["ZLIB"] == "auto") - dictionary["ZLIB"] = checkAvailability("ZLIB") ? defaultTo("ZLIB") : "qt"; - - // PCRE detection - if (dictionary["PCRE"] == "auto") - dictionary["PCRE"] = checkAvailability("PCRE") ? defaultTo("PCRE") : "qt"; - - // ICU detection - if (dictionary["ICU"] == "auto") - dictionary["ICU"] = checkAvailability("ICU") ? "yes" : "no"; - - // ANGLE detection - if (dictionary["ANGLE"] == "auto") { - if (dictionary["OPENGL_ES_2"] == "yes") { - dictionary["ANGLE"] = checkAngleAvailability() ? "yes" : "no"; - dictionary["ANGLE_FROM"] = "detected"; - } else { - dictionary["ANGLE"] = "no"; - } - } - - // Dynamic GL. This must be explicitly requested, no autodetection. - if (dictionary["DYNAMICGL"] == "auto") - dictionary["DYNAMICGL"] = "no"; - - // Image format detection - if (dictionary["GIF"] == "auto") - dictionary["GIF"] = defaultTo("GIF"); - if (dictionary["JPEG"] == "auto") - dictionary["JPEG"] = defaultTo("JPEG"); - if (dictionary["PNG"] == "auto") - dictionary["PNG"] = defaultTo("PNG"); - if (dictionary["LIBJPEG"] == "auto") - dictionary["LIBJPEG"] = checkAvailability("LIBJPEG") ? defaultTo("LIBJPEG") : "qt"; - if (dictionary["LIBPNG"] == "auto") - dictionary["LIBPNG"] = checkAvailability("LIBPNG") ? defaultTo("LIBPNG") : "qt"; - - // SQL detection (not on by default) - if (dictionary["SQL_MYSQL"] == "auto") - dictionary["SQL_MYSQL"] = checkAvailability("SQL_MYSQL") ? defaultTo("SQL_MYSQL") : "no"; - if (dictionary["SQL_ODBC"] == "auto") - dictionary["SQL_ODBC"] = checkAvailability("SQL_ODBC") ? defaultTo("SQL_ODBC") : "no"; - if (dictionary["SQL_OCI"] == "auto") - dictionary["SQL_OCI"] = checkAvailability("SQL_OCI") ? defaultTo("SQL_OCI") : "no"; - if (dictionary["SQL_PSQL"] == "auto") - dictionary["SQL_PSQL"] = checkAvailability("SQL_PSQL") ? defaultTo("SQL_PSQL") : "no"; - if (dictionary["SQL_TDS"] == "auto") - dictionary["SQL_TDS"] = checkAvailability("SQL_TDS") ? defaultTo("SQL_TDS") : "no"; - if (dictionary["SQL_DB2"] == "auto") - dictionary["SQL_DB2"] = checkAvailability("SQL_DB2") ? defaultTo("SQL_DB2") : "no"; - if (dictionary["SQL_SQLITE"] == "auto") - dictionary["SQL_SQLITE"] = checkAvailability("SQL_SQLITE") ? defaultTo("SQL_SQLITE") : "no"; - if (dictionary["SQL_SQLITE_LIB"] == "system") - if (!checkAvailability("SQL_SQLITE_LIB")) - dictionary["SQL_SQLITE_LIB"] = "no"; - if (dictionary["SQL_SQLITE2"] == "auto") - dictionary["SQL_SQLITE2"] = checkAvailability("SQL_SQLITE2") ? defaultTo("SQL_SQLITE2") : "no"; - if (dictionary["SQL_IBASE"] == "auto") - dictionary["SQL_IBASE"] = checkAvailability("SQL_IBASE") ? defaultTo("SQL_IBASE") : "no"; - if (dictionary["SSE2"] == "auto") - dictionary["SSE2"] = checkAvailability("SSE2") ? "yes" : "no"; - if (dictionary["SSE3"] == "auto") - dictionary["SSE3"] = checkAvailability("SSE3") ? "yes" : "no"; - if (dictionary["SSSE3"] == "auto") - dictionary["SSSE3"] = checkAvailability("SSSE3") ? "yes" : "no"; - if (dictionary["SSE4_1"] == "auto") - dictionary["SSE4_1"] = checkAvailability("SSE4_1") ? "yes" : "no"; - if (dictionary["SSE4_2"] == "auto") - dictionary["SSE4_2"] = checkAvailability("SSE4_2") ? "yes" : "no"; - if (dictionary["AVX"] == "auto") - dictionary["AVX"] = checkAvailability("AVX") ? "yes" : "no"; - if (dictionary["AVX2"] == "auto") - dictionary["AVX2"] = checkAvailability("AVX2") ? "yes" : "no"; - if (dictionary["AVX512"] == "auto") - dictionary["AVX512"] = checkAvx512Availability(); - if (dictionary["NEON"] == "auto") - dictionary["NEON"] = checkAvailability("NEON") ? "yes" : "no"; - if (dictionary["SSL"] == "auto") { - if (platform() == WINDOWS_RT) { - dictionary["SSL"] = "yes"; - } else { - // On Desktop Windows openssl and ssl always have the same value (for now). OpenSSL is - // the only backend and if it is available and should be built, that also means that - // SSL support in general is enabled. - if (dictionary["OPENSSL"] == "auto") - dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no"; - dictionary["SSL"] = dictionary["OPENSSL"]; - } - } - if (dictionary["OPENSSL"] == "auto") - dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no"; - if (dictionary["LIBPROXY"] == "auto") - dictionary["LIBPROXY"] = checkAvailability("LIBPROXY") ? "yes" : "no"; - if (dictionary["DBUS"] == "auto") - dictionary["DBUS"] = checkAvailability("DBUS") ? "linked" : "runtime"; - if (dictionary["QML_DEBUG"] == "auto") - dictionary["QML_DEBUG"] = dictionary["QML"] == "yes" ? "yes" : "no"; - if (dictionary["AUDIO_BACKEND"] == "auto") - dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no"; - if (dictionary["WMF_BACKEND"] == "auto") - dictionary["WMF_BACKEND"] = checkAvailability("WMF_BACKEND") ? "yes" : "no"; - if (dictionary["WMSDK"] == "auto") - dictionary["WMSDK"] = checkAvailability("WMSDK") ? "yes" : "no"; - - // Detection of IncrediBuild buildconsole - if (dictionary["INCREDIBUILD_XGE"] == "auto") - dictionary["INCREDIBUILD_XGE"] = checkAvailability("INCREDIBUILD_XGE") ? "yes" : "no"; - - // Detection of iconv support - if (dictionary["QT_ICONV"] == "auto") - dictionary["QT_ICONV"] = checkAvailability("ICONV") ? "yes" : "no"; - - // Detection of evdev support - if (dictionary["QT_EVDEV"] == "auto") - dictionary["QT_EVDEV"] = checkAvailability("EVDEV") ? "yes" : "no"; - - // Detection of mtdev support - if (dictionary["QT_MTDEV"] == "auto") - dictionary["QT_MTDEV"] = checkAvailability("MTDEV") ? "yes" : "no"; - - // Detection of tslib support - if (dictionary["QT_TSLIB"] == "auto") - dictionary["QT_TSLIB"] = checkAvailability("TSLIB") ? "yes" : "no"; - - // Detection of inotify - if (dictionary["QT_INOTIFY"] == "auto") - dictionary["QT_INOTIFY"] = checkAvailability("INOTIFY") ? "yes" : "no"; - - // Detection of cups support - if (dictionary["QT_CUPS"] == "auto") - dictionary["QT_CUPS"] = checkAvailability("CUPS") ? "yes" : "no"; - - // Detection of -fstack-protector-strong support - if (dictionary["STACK_PROTECTOR_STRONG"] == "auto") - dictionary["STACK_PROTECTOR_STRONG"] = checkAvailability("STACK_PROTECTOR_STRONG") ? "yes" : "no"; - - if (platform() == QNX && dictionary["SLOG2"] == "auto") { - dictionary["SLOG2"] = checkAvailability("SLOG2") ? "yes" : "no"; - } - - if (platform() == QNX && dictionary["QNX_IMF"] == "auto") { - dictionary["QNX_IMF"] = checkAvailability("QNX_IMF") ? "yes" : "no"; - } - - if (dictionary["PPS"] == "auto") { - dictionary["PPS"] = checkAvailability("PPS") ? "yes" : "no"; - } - - if (platform() == QNX && dictionary["LGMON"] == "auto") { - dictionary["LGMON"] = checkAvailability("LGMON") ? "yes" : "no"; - } - - if (dictionary["QT_EVENTFD"] == "auto") - dictionary["QT_EVENTFD"] = checkAvailability("QT_EVENTFD") ? "yes" : "no"; - - if (dictionary["FONT_CONFIG"] == "auto") - dictionary["FONT_CONFIG"] = checkAvailability("FONT_CONFIG") ? "yes" : "no"; - - if ((dictionary["FONT_CONFIG"] == "yes") && (dictionary["FREETYPE_FROM"] == "default")) - dictionary["FREETYPE"] = "system"; - - if (dictionary["DOUBLECONVERSION"] == "auto") - dictionary["DOUBLECONVERSION"] = checkAvailability("DOUBLECONVERSION") ? "system" : "qt"; - - if (dictionary["DIRECTWRITE"] == "auto") - dictionary["DIRECTWRITE"] = checkAvailability("DIRECTWRITE") ? "yes" : "no"; - - if (dictionary["DIRECTWRITE"] == "no") - dictionary["DIRECTWRITE2"] = "no"; - else if (dictionary["DIRECTWRITE2"] == "auto") - dictionary["DIRECTWRITE2"] = checkAvailability("DIRECTWRITE2") ? "yes" : "no"; - - // Mark all unknown "auto" to the default value.. - for (QMap<QString,QString>::iterator i = dictionary.begin(); i != dictionary.end(); ++i) { - if (i.value() == "auto") - i.value() = defaultTo(i.key()); - } - - cout << "Done running configuration tests." << endl; -} - -bool Configure::verifyConfiguration() -{ - bool prompt = false; - if (dictionary["C++STD"] != "auto" - && dictionary["QMAKESPEC"].contains("msvc")) { - cout << "WARNING: It is not possible to change the C++ standard edition with MSVC compilers. " - "Therefore, the option -c++std " << dictionary["C++STD"] << " was ignored." << endl << endl; - dictionary["C++STD"] = "auto"; - } - - if (dictionary["STATIC_RUNTIME"] == "yes" && dictionary["SHARED"] == "yes") { - cout << "ERROR: -static-runtime requires -static" << endl << endl; - dictionary[ "DONE" ] = "error"; - } - - if (dictionary["SEPARATE_DEBUG_INFO"] == "yes") { - if (dictionary[ "SHARED" ] == "no") { - cout << "ERROR: -separate-debug-info is incompatible with -static" << endl << endl; - dictionary[ "DONE" ] = "error"; - } else if (dictionary[ "BUILD" ] != "debug" - && dictionary[ "BUILDALL" ] == "no" - && dictionary[ "FORCEDEBUGINFO" ] == "no") { - cout << "ERROR: -separate-debug-info needs -debug, -debug-and-release, or -force-debug-info" << endl << endl; - dictionary[ "DONE" ] = "error"; - } else if (dictionary["SEPARATE_DEBUG_INFO"] == "yes" && !checkAvailability("OBJCOPY")) { - cout << "ERROR: -separate-debug-info was requested but this binutils does not support it." << endl; - dictionary[ "DONE" ] = "error"; - } - } - - if (dictionary["SQL_SQLITE_LIB"] == "no" && dictionary["SQL_SQLITE"] != "no") { - cout << "WARNING: Configure could not detect the presence of a system SQLite3 lib." << endl - << "Configure will therefore continue with the SQLite3 lib bundled with Qt." << endl; - dictionary["SQL_SQLITE_LIB"] = "qt"; // Set to Qt's bundled lib an continue - prompt = true; - } - if (dictionary["QMAKESPEC"].endsWith("-g++") - && dictionary["SQL_OCI"] != "no") { - cout << "WARNING: Qt does not support compiling the Oracle database driver with" << endl - << "MinGW, due to lack of such support from Oracle. Consider disabling the" << endl - << "Oracle driver, as the current build will most likely fail." << endl; - prompt = true; - } - if (dictionary["QMAKESPEC"].endsWith("win32-msvc2008") || dictionary["QMAKESPEC"].endsWith("win32-msvc2010")) { - cout << "ERROR: Qt cannot be compiled with Visual Studio 2008 or 2010." << endl; - prompt = true; - } - if (0 != dictionary["ARM_FPU_TYPE"].size()) { - QStringList l= QStringList() - << "softvfp" - << "softvfp+vfpv2" - << "vfpv2"; - if (!(l.contains(dictionary["ARM_FPU_TYPE"]))) - cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl; - } - if (dictionary["DIRECTWRITE"] == "yes" && !checkAvailability("DIRECTWRITE")) { - cout << "WARNING: To be able to compile the DirectWrite font engine you will" << endl - << "need the Microsoft DirectWrite and Microsoft Direct2D development" << endl - << "files such as headers and libraries." << endl; - prompt = true; - } -#if WINVER > 0x0601 - if (dictionary["TARGET_OS"] == "xp") { - cout << "WARNING: Cannot use Windows Kit 8 to build Qt for Windows XP.\n" - "WARNING: Windows SDK v7.1A is recommended.\n"; - } -#endif - - if (dictionary["DIRECT2D"] == "yes" && !checkAvailability("DIRECT2D")) { - cout << "WARNING: To be able to build the Direct2D platform plugin you will" << endl - << "need the Microsoft DirectWrite and Microsoft Direct2D development" << endl - << "files such as headers and libraries." << endl; - prompt = true; - } - - // -angle given on command line, but Direct X cannot be found. - if (dictionary["ANGLE"] != "no") { - QString errorMessage; - if (!checkAngleAvailability(&errorMessage)) { - cout << "WARNING: ANGLE specified, but the DirectX SDK could not be detected:" << endl - << " " << qPrintable(errorMessage) << endl - << "The build will most likely fail." << endl; - prompt = true; - } - } else if (dictionary["ANGLE"] == "no") { - if (dictionary["ANGLE_FROM"] == "detected") { - QString errorMessage; - checkAngleAvailability(&errorMessage); - cout << "WARNING: The DirectX SDK could not be detected:" << endl - << " " << qPrintable(errorMessage) << endl - << "Disabling the ANGLE backend." << endl; - prompt = true; - } - if ((dictionary["OPENGL_ES_2"] == "yes") && !dictionary.contains("XQMAKESPEC")) { - cout << endl << "WARNING: Using OpenGL ES 2.0 without ANGLE." << endl - << "Specify -opengl desktop to use Open GL." << endl - << "The build will most likely fail." << endl; - prompt = true; - } - } - - if (dictionary["DYNAMICGL"] == "yes") { - if (dictionary["OPENGL_ES_2"] == "yes" || dictionary["ANGLE"] != "no") { - cout << "ERROR: Dynamic OpenGL cannot be used with -angle." << endl; - dictionary[ "DONE" ] = "error"; - } - } - - if (dictionary["OPENGL"] == "no" || dictionary["OPENGL_ES_2"] == "no") { - if (dictionary.value("XQMAKESPEC").startsWith("winphone") || - dictionary.value("XQMAKESPEC").startsWith("winrt")) { - cout << "ERROR: Option -no-opengl is not valid for WinRT." << endl; - dictionary[ "DONE" ] = "error"; - } - } - - if ((dictionary["FONT_CONFIG"] == "yes") && (dictionary["FREETYPE_FROM"] == "commandline")) { - if (dictionary["FREETYPE"] == "yes") { - cout << "WARNING: Bundled FreeType can't be used." - " FontConfig use requires system FreeType." << endl; - dictionary["FREETYPE"] = "system"; - dictionary["FREETYPE_FROM"] = "override"; - prompt = true; - } else if (dictionary["FREETYPE"] == "no") { - cout << "WARNING: FreeType can't be disabled." - " FontConfig use requires system FreeType." << endl; - dictionary["FREETYPE"] = "system"; - dictionary["FREETYPE_FROM"] = "override"; - prompt = true; - } - } - - if (prompt) - promptKeyPress(); - - return true; } void Configure::prepareConfigTests() @@ -2700,726 +524,6 @@ void Configure::prepareConfigTests() } } -void Configure::generateOutputVars() -{ - // Generate variables for output - QString build = dictionary[ "BUILD" ]; - bool buildAll = (dictionary[ "BUILDALL" ] == "yes"); - if (build == "debug") { - if (buildAll) - qtConfig += "debug_and_release build_all release"; - qtConfig += "debug"; - } else if (build == "release") { - if (buildAll) - qtConfig += "debug_and_release build_all debug"; - qtConfig += "release"; - } - if (dictionary[ "RELEASE_TOOLS" ] == "yes") - qtConfig += "release_tools"; - - if (dictionary[ "PCH" ] == "yes") - qmakeConfig += "precompile_header"; - else - qmakeVars += "CONFIG -= precompile_header"; - - if (dictionary[ "C++STD" ] == "c++11") - qtConfig += "c++11"; - else if (dictionary[ "C++STD" ] == "c++14") - qtConfig += "c++11 c++14"; - else if (dictionary[ "C++STD" ] == "c++1z") - qtConfig += "c++11 c++14 c++1z"; - if (!dictionary[ "CFG_STDCXX_DEFAULT" ].isEmpty()) - qmakeVars += "QT_COMPILER_STDCXX = " + dictionary[ "CFG_STDCXX_DEFAULT" ]; - - if (dictionary[ "USE_GOLD_LINKER" ] == "yes") - qmakeConfig += "use_gold_linker"; - - if (dictionary[ "ENABLE_NEW_DTAGS" ] == "yes") - qmakeConfig += "enable_new_dtags"; - - if (dictionary[ "SHARED" ] == "no") - qtConfig += "static"; - else - qtConfig += "shared"; - - if (dictionary[ "STATIC_RUNTIME" ] == "yes") - qtConfig += "static_runtime"; - - if (dictionary[ "GUI" ] == "no") { - qtConfig += "no-gui"; - dictionary [ "WIDGETS" ] = "no"; - } - - if (dictionary[ "WIDGETS" ] == "no") - qtConfig += "no-widgets"; - - // Compression -------------------------------------------------- - if (dictionary[ "ZLIB" ] == "qt") - qtConfig += "zlib"; - else if (dictionary[ "ZLIB" ] == "system") - qtConfig += "system-zlib"; - - // PCRE --------------------------------------------------------- - if (dictionary[ "PCRE" ] == "qt") - qmakeConfig += "pcre"; - - // ICU --------------------------------------------------------- - if (dictionary[ "ICU" ] == "yes") - qtConfig += "icu"; - - // ANGLE -------------------------------------------------------- - if (dictionary[ "ANGLE" ] != "no") { - qtConfig += "angle"; - } - - // Dynamic OpenGL loading --------------------------------------- - if (dictionary[ "DYNAMICGL" ] != "no") { - qtConfig += "dynamicgl"; - } - - // Image formates ----------------------------------------------- - if (dictionary[ "GIF" ] == "no") - qtConfig += "no-gif"; - else if (dictionary[ "GIF" ] == "yes") - qtConfig += "gif"; - - if (dictionary[ "JPEG" ] == "no") - qtConfig += "no-jpeg"; - else if (dictionary[ "JPEG" ] == "yes") - qtConfig += "jpeg"; - if (dictionary[ "LIBJPEG" ] == "system") - qtConfig += "system-jpeg"; - - if (dictionary[ "PNG" ] == "no") - qtConfig += "no-png"; - else if (dictionary[ "PNG" ] == "yes") - qtConfig += "png"; - if (dictionary[ "LIBPNG" ] == "system") - qtConfig += "system-png"; - - // Double conversion ----------------------------------------------- - if (dictionary[ "DOUBLECONVERSION" ] == "qt") - qtConfig += "doubleconversion"; - else if (dictionary[ "DOUBLECONVERSION" ] == "system") - qtConfig += "system-doubleconversion"; - else if (dictionary[ "DOUBLECONVERSION" ] == "no") - qtConfig += "no-doubleconversion"; - - // Text rendering -------------------------------------------------- - if (dictionary[ "FREETYPE" ] == "yes") - qtConfig += "freetype"; - else if (dictionary[ "FREETYPE" ] == "system") - qtConfig += "system-freetype"; - - if (dictionary[ "HARFBUZZ" ] == "qt") - qtConfig += "harfbuzz"; - else if (dictionary[ "HARFBUZZ" ] == "system") - qtConfig += "system-harfbuzz"; - - // Styles ------------------------------------------------------- - if (dictionary[ "STYLE_WINDOWS" ] == "yes") - qmakeStyles += "windows"; - - if (dictionary[ "STYLE_FUSION" ] == "yes") - qmakeStyles += "fusion"; - - if (dictionary[ "STYLE_WINDOWSXP" ] == "yes") - qmakeStyles += "windowsxp"; - - if (dictionary[ "STYLE_WINDOWSVISTA" ] == "yes") - qmakeStyles += "windowsvista"; - - if (dictionary[ "STYLE_ANDROID" ] == "yes") - qmakeStyles += "android"; - - // Databases ---------------------------------------------------- - if (dictionary[ "SQL_MYSQL" ] == "yes") - qmakeSql += "mysql"; - else if (dictionary[ "SQL_MYSQL" ] == "plugin") - qmakeSqlPlugins += "mysql"; - - if (dictionary[ "SQL_ODBC" ] == "yes") - qmakeSql += "odbc"; - else if (dictionary[ "SQL_ODBC" ] == "plugin") - qmakeSqlPlugins += "odbc"; - - if (dictionary[ "SQL_OCI" ] == "yes") - qmakeSql += "oci"; - else if (dictionary[ "SQL_OCI" ] == "plugin") - qmakeSqlPlugins += "oci"; - - if (dictionary[ "SQL_PSQL" ] == "yes") - qmakeSql += "psql"; - else if (dictionary[ "SQL_PSQL" ] == "plugin") - qmakeSqlPlugins += "psql"; - - if (dictionary[ "SQL_TDS" ] == "yes") - qmakeSql += "tds"; - else if (dictionary[ "SQL_TDS" ] == "plugin") - qmakeSqlPlugins += "tds"; - - if (dictionary[ "SQL_DB2" ] == "yes") - qmakeSql += "db2"; - else if (dictionary[ "SQL_DB2" ] == "plugin") - qmakeSqlPlugins += "db2"; - - if (dictionary[ "SQL_SQLITE" ] == "yes") - qmakeSql += "sqlite"; - else if (dictionary[ "SQL_SQLITE" ] == "plugin") - qmakeSqlPlugins += "sqlite"; - - if (dictionary[ "SQL_SQLITE_LIB" ] == "system") - qmakeConfig += "system-sqlite"; - - if (dictionary[ "SQL_SQLITE2" ] == "yes") - qmakeSql += "sqlite2"; - else if (dictionary[ "SQL_SQLITE2" ] == "plugin") - qmakeSqlPlugins += "sqlite2"; - - if (dictionary[ "SQL_IBASE" ] == "yes") - qmakeSql += "ibase"; - else if (dictionary[ "SQL_IBASE" ] == "plugin") - qmakeSqlPlugins += "ibase"; - - // Other options ------------------------------------------------ - if (dictionary[ "BUILDALL" ] == "yes") { - qtConfig += "build_all"; - } - if (dictionary[ "SEPARATE_DEBUG_INFO" ] == "yes") - qtConfig += "separate_debug_info"; - if (dictionary[ "FORCEDEBUGINFO" ] == "yes") - qmakeConfig += "force_debug_info"; - qmakeConfig += dictionary[ "BUILD" ]; - - if (buildParts.isEmpty()) { - buildParts = defaultBuildParts; - - if (dictionary["BUILDDEV"] == "yes") - buildParts += "tests"; - } - while (!nobuildParts.isEmpty()) - buildParts.removeAll(nobuildParts.takeFirst()); - if (!buildParts.contains("libs")) - buildParts += "libs"; - buildParts.removeDuplicates(); - if (dictionary[ "COMPILE_EXAMPLES" ] == "yes") - qmakeConfig += "compile_examples"; - - if (dictionary["MSVC_MP"] == "yes") - qmakeConfig += "msvc_mp"; - - if (dictionary[ "SHARED" ] == "yes") { - QString version = dictionary[ "VERSION" ]; - if (!version.isEmpty()) { - qmakeVars += "QMAKE_QT_VERSION_OVERRIDE = " + version.left(version.indexOf('.')); - version.remove(QLatin1Char('.')); - } - } - - if (dictionary["ATOMIC64"] == "libatomic") - qmakeConfig += "atomic64-libatomic"; - - if (dictionary[ "ACCESSIBILITY" ] == "yes") - qtConfig += "accessibility"; - - if (!qmakeLibs.isEmpty()) - qmakeVars += "EXTRA_LIBS += " + formatPaths(qmakeLibs); - - if (!dictionary["QT_LFLAGS_SQLITE"].isEmpty()) - qmakeVars += "QT_LFLAGS_SQLITE += " + dictionary["QT_LFLAGS_SQLITE"]; - - if (dictionary[ "OPENGL" ] == "yes") - qtConfig += "opengl"; - - if (dictionary["OPENGL_ES_2"] == "yes") { - qtConfig += "opengles2"; - qtConfig += "egl"; - } - - if (dictionary["OPENVG"] == "yes") { - qtConfig += "openvg"; - qtConfig += "egl"; - } - - if (dictionary[ "SSL" ] == "yes") - qtConfig += "ssl"; - - if (dictionary[ "OPENSSL" ] == "yes") - qtConfig += "openssl"; - else if (dictionary[ "OPENSSL" ] == "linked") - qtConfig += "openssl-linked"; - - if (dictionary[ "LIBPROXY" ] == "yes") - qtConfig += "libproxy"; - - if (dictionary[ "DBUS" ] == "runtime") - qtConfig += "dbus"; - else if (dictionary[ "DBUS" ] == "linked") - qtConfig += "dbus dbus-linked"; - - // ### Vestige - if (dictionary["AUDIO_BACKEND"] == "yes") - qtConfig += "audio-backend"; - - if (dictionary["QML_DEBUG"] == "no") - qtConfig += "no-qml-debug"; - - if (dictionary["WMF_BACKEND"] == "yes") - qtConfig += "wmf-backend"; - - if (dictionary["DIRECTWRITE"] == "yes") - qtConfig += "directwrite"; - - if (dictionary["DIRECTWRITE2"] == "yes") - qtConfig += "directwrite2"; - - if (dictionary["DIRECT2D"] == "yes") - qtConfig += "direct2d"; - - if (dictionary[ "NATIVE_GESTURES" ] == "yes") - qtConfig += "native-gestures"; - - qtConfig += "qpa"; - - if (dictionary["NIS"] == "yes") - qtConfig += "nis"; - - if (dictionary["QT_CUPS"] == "yes") - qtConfig += "cups"; - - if (dictionary["QT_ICONV"] == "yes") - qtConfig += "iconv"; - else if (dictionary["QT_ICONV"] == "sun") - qtConfig += "sun-libiconv"; - else if (dictionary["QT_ICONV"] == "gnu") - qtConfig += "gnu-libiconv"; - - if (dictionary["QT_EVDEV"] == "yes") - qtConfig += "evdev"; - - if (dictionary["QT_MTDEV"] == "yes") - qtConfig += "mtdev"; - - if (dictionary[ "QT_TSLIB" ] == "yes") - qtConfig += "tslib"; - - if (dictionary["QT_INOTIFY"] == "yes") - qtConfig += "inotify"; - - if (dictionary["QT_EVENTFD"] == "yes") - qtConfig += "eventfd"; - - if (dictionary["FONT_CONFIG"] == "yes") { - qtConfig += "fontconfig"; - qmakeVars += "QMAKE_CFLAGS_FONTCONFIG ="; - qmakeVars += "QMAKE_LIBS_FONTCONFIG = -lfreetype -lfontconfig"; - } - - if (dictionary["QT_GLIB"] == "yes") - qtConfig += "glib"; - - if (dictionary["STACK_PROTECTOR_STRONG"] == "yes") - qtConfig += "stack-protector-strong"; - - if (dictionary["REDUCE_EXPORTS"] == "yes") - qtConfig += "reduce_exports"; - - if (!dictionary["POLL"].isEmpty()) - qtConfig += "poll_" + dictionary["POLL"]; - - // We currently have no switch for QtConcurrent, so add it unconditionally. - qtConfig += "concurrent"; - - if (dictionary[ "SYSTEM_PROXIES" ] == "yes") - qtConfig += "system-proxies"; - - if (dictionary.contains("XQMAKESPEC") && (dictionary["QMAKESPEC"] != dictionary["XQMAKESPEC"])) { - qmakeConfig += "cross_compile"; - dictionary["CROSS_COMPILE"] = "yes"; - } - - // Directories and settings for .qmake.cache -------------------- - - if (dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("linux")) - qtConfig += "rpath"; - - if (!qmakeDefines.isEmpty()) - qmakeVars += QString("EXTRA_DEFINES += ") + qmakeDefines.join(' '); - if (!qmakeIncludes.isEmpty()) - qmakeVars += QString("EXTRA_INCLUDEPATH += ") + formatPaths(qmakeIncludes); - if (!opensslLibs.isEmpty()) - qmakeVars += opensslLibs; - if (dictionary[ "OPENSSL" ] == "linked") { - if (!opensslLibsDebug.isEmpty() || !opensslLibsRelease.isEmpty()) { - if (opensslLibsDebug.isEmpty() || opensslLibsRelease.isEmpty()) { - cout << "Error: either both or none of OPENSSL_LIBS_DEBUG/_RELEASE must be defined." << endl; - exit(1); - } - qmakeVars += opensslLibsDebug; - qmakeVars += opensslLibsRelease; - } else if (opensslLibs.isEmpty()) { - qmakeVars += QString("OPENSSL_LIBS = -lssleay32 -llibeay32"); - } - if (!opensslPath.isEmpty()) { - qmakeVars += QString("OPENSSL_CFLAGS += -I%1/include").arg(opensslPath); - qmakeVars += QString("OPENSSL_LIBS += -L%1/lib").arg(opensslPath); - } - } - 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); - if (dbusHostPath.isEmpty()) - qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusPath); - } - if (!dbusHostPath.isEmpty()) - qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusHostPath); - } - if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) { - qmakeVars += QString("QT_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath); - qmakeVars += QString("QT_LFLAGS_MYSQL = -L%1/lib").arg(mysqlPath); - } - if (!psqlLibs.isEmpty()) - qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); - if (!zlibLibs.isEmpty()) - qmakeVars += zlibLibs; - - { - QStringList lflagsTDS; - if (!sybase.isEmpty()) - lflagsTDS += QString("-L") + formatPath(sybase.section("=", 1) + "/lib"); - if (!sybaseLibs.isEmpty()) - lflagsTDS += sybaseLibs.section("=", 1); - if (!lflagsTDS.isEmpty()) - qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(' '); - } - - if (!qmakeSql.isEmpty()) - qmakeVars += QString("sql-drivers += ") + qmakeSql.join(' '); - if (!qmakeSqlPlugins.isEmpty()) - qmakeVars += QString("sql-plugins += ") + qmakeSqlPlugins.join(' '); - if (!qmakeStyles.isEmpty()) - qmakeVars += QString("styles += ") + qmakeStyles.join(' '); - if (!qmakeStylePlugins.isEmpty()) - qmakeVars += QString("style-plugins += ") + qmakeStylePlugins.join(' '); - - if (!dictionary[ "QMAKESPEC" ].length()) { - cout << "Configure could not detect your compiler. QMAKESPEC must either" << endl - << "be defined as an environment variable, or specified as an" << endl - << "argument with -platform" << endl; - - QStringList winPlatforms; - QDir mkspecsDir(sourcePath + "/mkspecs"); - const QFileInfoList &specsList = mkspecsDir.entryInfoList(); - for (int i = 0; i < specsList.size(); ++i) { - const QFileInfo &fi = specsList.at(i); - if (fi.fileName().left(5) == "win32") { - winPlatforms += fi.fileName(); - } - } - cout << "Available platforms are: " << qPrintable(winPlatforms.join(", ")) << endl; - dictionary[ "DONE" ] = "error"; - } -} - -void Configure::generateCachefile() -{ - // Generate qmodule.pri, which is loaded only by Qt modules - { - FileWriter moduleStream(buildPath + "/mkspecs/qmodule.pri"); - - moduleStream << "QT_BUILD_PARTS += " << buildParts.join(' ') << endl; - if (!skipModules.isEmpty()) - moduleStream << "QT_SKIP_MODULES += " << skipModules.join(' ') << endl; - QString qcpath = dictionary["QCONFIG_PATH"]; - QString qlpath = sourcePath + "/src/corelib/global/"; - if (qcpath.startsWith(qlpath)) - qcpath.remove(0, qlpath.length()); - moduleStream << "QT_QCONFIG_PATH = " << qcpath << endl; - moduleStream << endl; - - moduleStream << "host_build {" << endl; - moduleStream << " QT_CPU_FEATURES." << dictionary["QT_HOST_ARCH"] << - " = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; - moduleStream << "} else {" << endl; - moduleStream << " QT_CPU_FEATURES." << dictionary["QT_ARCH"] << - " = " << dictionary["QT_CPU_FEATURES"] << endl; - moduleStream << "}" << endl; - moduleStream << "QT_COORD_TYPE += " << dictionary["QREAL"] << endl; - - if (dictionary["QT_XKBCOMMON"] == "no") - moduleStream << "DEFINES += QT_NO_XKBCOMMON" << endl; - - // embedded - if (!dictionary["KBD_DRIVERS"].isEmpty()) - moduleStream << "kbd-drivers += "<< dictionary["KBD_DRIVERS"]<<endl; - if (!dictionary["GFX_DRIVERS"].isEmpty()) - moduleStream << "gfx-drivers += "<< dictionary["GFX_DRIVERS"]<<endl; - if (!dictionary["MOUSE_DRIVERS"].isEmpty()) - moduleStream << "mouse-drivers += "<< dictionary["MOUSE_DRIVERS"]<<endl; - if (!dictionary["DECORATIONS"].isEmpty()) - moduleStream << "decorations += "<<dictionary["DECORATIONS"]<<endl; - - moduleStream << "CONFIG += " << qmakeConfig.join(' '); - if (dictionary[ "SSE2" ] == "yes") - moduleStream << " sse2"; - if (dictionary[ "SSE3" ] == "yes") - moduleStream << " sse3"; - if (dictionary[ "SSSE3" ] == "yes") - moduleStream << " ssse3"; - if (dictionary[ "SSE4_1" ] == "yes") - moduleStream << " sse4_1"; - if (dictionary[ "SSE4_2" ] == "yes") - moduleStream << " sse4_2"; - if (dictionary[ "AVX" ] == "yes") - moduleStream << " avx"; - if (dictionary[ "AVX2" ] == "yes") - moduleStream << " avx2"; - if (!dictionary[ "AVX512" ].isEmpty()) - moduleStream << ' ' << dictionary[ "AVX512" ]; - if (dictionary[ "NEON" ] == "yes") - moduleStream << " neon"; - if (dictionary[ "LARGE_FILE" ] == "yes") - moduleStream << " largefile"; - if (dictionary[ "STRIP" ] == "no") - moduleStream << " nostrip"; - if (dictionary[ "LTCG" ] == "yes") - moduleStream << " ltcg"; - moduleStream << endl; - - for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) - moduleStream << (*var) << endl; - - if (!moduleStream.flush()) - dictionary[ "DONE" ] = "error"; - } -} - -void Configure::addSysroot(QString *command) -{ - const QString &sysroot = dictionary["CFG_SYSROOT"]; - if (!sysroot.isEmpty() && dictionary["CFG_GCC_SYSROOT"] == "yes") { - command->append(" QMAKE_LFLAGS+=--sysroot=" + sysroot); - command->append(" QMAKE_CXXFLAGS+=--sysroot=" + sysroot); - } -} - -struct ArchData { - bool isHost; - const char *qmakespec; - const char *key; - const char *subarchKey; - const char *type; - ArchData() {} - ArchData(bool h, const char *t, const char *qm, const char *k, const char *sak) - : isHost(h), qmakespec(qm), key(k), subarchKey(sak), type(t) - {} -}; - -/* - Runs qmake on config.tests/arch/arch.pro, which will detect the target arch - for the compiler we are using -*/ -void Configure::detectArch() -{ - QString oldpwd = QDir::currentPath(); - - QString newpwd = QString("%1/config.tests/arch").arg(buildPath); - if (!QDir().exists(newpwd) && !QDir().mkpath(newpwd)) { - cout << "Failed to create directory " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl; - dictionary["DONE"] = "error"; - return; - } - if (!QDir::setCurrent(newpwd)) { - cout << "Failed to change working directory to " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl; - dictionary["DONE"] = "error"; - return; - } - - QVector<ArchData> qmakespecs; - if (dictionary.contains("XQMAKESPEC")) - qmakespecs << ArchData(false, "target", "XQMAKESPEC", "QT_ARCH", "QT_CPU_FEATURES"); - qmakespecs << ArchData(true, "host", "QMAKESPEC", "QT_HOST_ARCH", "QT_HOST_CPU_FEATURES"); - - for (int i = 0; i < qmakespecs.count(); ++i) { - const ArchData &data = qmakespecs.at(i); - QString qmakespec = dictionary.value(data.qmakespec); - QString key = data.key; - QString subarchKey = data.subarchKey; - - // run qmake - QString command = QString("%1 -spec %2 %3") - .arg(QDir::toNativeSeparators(QDir(newpwd).relativeFilePath(buildPath + "/bin/qmake.exe")), - QDir::toNativeSeparators(qmakespec), - QDir::toNativeSeparators(sourcePath + "/config.tests/arch/arch" - + (data.isHost ? "_host" : "") + ".pro")); - - if (!data.isHost) { - if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone")) - command.append(" QMAKE_LFLAGS+=/ENTRY:main"); - addSysroot(&command); - } - - int returnValue = 0; - Environment::execute(command, &returnValue); - if (returnValue != 0) { - cout << "QMake failed!" << endl; - dictionary["DONE"] = "error"; - return; - } - - // compile - command = dictionary[ "MAKE" ]; - if (command.contains("nmake") || command.contains("jom")) - command += " /NOLOGO"; - command += " -s"; - Environment::execute(command); - - // find the executable that was generated - QString arch_exe; - if (qmakespec.startsWith("android")) { - arch_exe = "libarch.so"; - } else { - arch_exe = "arch.exe"; - } - QFile exe(arch_exe); - if (!exe.open(QFile::ReadOnly)) { // no Text, this is binary - exe.setFileName("arch"); - if (!exe.open(QFile::ReadOnly)) { - cout << "Could not find output file '" << qPrintable(arch_exe) << "' or 'arch' in " << qPrintable(newpwd) << " : " << qPrintable(exe.errorString()) << endl; - dictionary["DONE"] = "error"; - return; - } - } - QByteArray exeContents = exe.readAll(); - exe.close(); - - static const char archMagic[] = "==Qt=magic=Qt== Architecture:"; - int magicPos = exeContents.indexOf(archMagic); - if (magicPos == -1) { - cout << "Internal error, could not find the architecture of the " - << data.type << " executable" << endl; - dictionary["DONE"] = "error"; - return; - } - //cout << "Found magic at offset 0x" << hex << magicPos << endl; - - // the conversion from QByteArray will stop at the ending NUL anyway - QString arch = QString::fromLatin1(exeContents.constData() + magicPos - + sizeof(archMagic) - 1); - dictionary[key] = arch; - - static const char subarchMagic[] = "==Qt=magic=Qt== Sub-architecture:"; - magicPos = exeContents.indexOf(subarchMagic); - if (magicPos == -1) { - cout << "Internal error, could not find the sub-architecture of the " - << data.type << " executable" << endl; - dictionary["DONE"] = "error"; - return; - } - - QString subarch = QString::fromLatin1(exeContents.constData() + magicPos - + sizeof(subarchMagic) - 1); - dictionary[subarchKey] = subarch; - - //cout << "Detected arch '" << qPrintable(arch) << "'\n"; - //cout << "Detected sub-arch '" << qPrintable(subarch) << "'\n"; - - // clean up - Environment::execute(command + " distclean"); - } - - if (!dictionary.contains("QT_HOST_ARCH")) - dictionary["QT_HOST_ARCH"] = "unknown"; - if (!dictionary.contains("QT_ARCH")) { - dictionary["QT_ARCH"] = dictionary["QT_HOST_ARCH"]; - dictionary["QT_CPU_FEATURES"] = dictionary["QT_HOST_CPU_FEATURES"]; - } - - QDir::setCurrent(oldpwd); -} - -bool Configure::tryCompileProject(const QString &projectPath, const QString &extraOptions, - bool distClean) -{ - QString oldpwd = QDir::currentPath(); - - QString newpwd = QString("%1/config.tests/%2").arg(buildPath, projectPath); - if (!QDir().exists(newpwd) && !QDir().mkpath(newpwd)) { - cout << "Failed to create directory " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl; - dictionary["DONE"] = "error"; - return false; - } - if (!QDir::setCurrent(newpwd)) { - cout << "Failed to change working directory to " << qPrintable(QDir::toNativeSeparators(newpwd)) << endl; - dictionary["DONE"] = "error"; - return false; - } - - // run qmake - QString command = QString("%1 %2 %3") - .arg(QDir::toNativeSeparators(QDir(newpwd).relativeFilePath(buildPath + "/bin/qmake.exe")), - QDir::toNativeSeparators(sourcePath + "/config.tests/" + projectPath), - extraOptions); - - if (dictionary.contains("XQMAKESPEC")) { - const QString qmakespec = dictionary["XQMAKESPEC"]; - if (qmakespec.startsWith("winrt") || qmakespec.startsWith("winphone")) - command.append(" QMAKE_LFLAGS+=/ENTRY:main"); - addSysroot(&command); - } - - if (verbose) - cout << qPrintable(command) << endl; - else - command += " 2>&1"; - - int code = 0; - QString output = Environment::execute(command, &code); - //cout << output << endl; - - if (code == 0) { - // compile - command = dictionary[ "MAKE" ]; - if (command.contains("nmake") || command.contains("jom")) - command += " /NOLOGO"; - if (verbose) - cout << qPrintable(command) << endl; - else - command += " -s 2>&1"; - output = Environment::execute(command, &code); - //cout << output << endl; - - // clean up - if (distClean) - Environment::execute(command + " distclean 2>&1"); - } - - QDir::setCurrent(oldpwd); - return code == 0; -} - -bool Configure::compilerSupportsFlag(const QString &compilerAndArgs) -{ - QFile file("conftest.cpp"); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - cout << "could not open temp file for writing" << endl; - return false; - } - if (!file.write("int main() { return 0; }\r\n")) { - cout << "could not write to temp file" << endl; - return false; - } - file.close(); - // compilerAndArgs contains compiler because there is no way to query it - QString command = compilerAndArgs + " -o conftest-out.o conftest.cpp"; - int code = 0; - QString output = Environment::execute(command, &code); - file.remove(); - QFile::remove("conftest-out.o"); - return code == 0; -} - void Configure::generateQDevicePri() { FileWriter deviceStream(buildPath + "/mkspecs/qdevice.pri"); @@ -3462,557 +566,10 @@ void Configure::generateQDevicePri() dictionary[ "DONE" ] = "error"; } -void Configure::generateQConfigPri() -{ - // Generate qconfig.pri - { - FileWriter configStream(buildPath + "/mkspecs/qconfig.pri"); - - configStream << "CONFIG+= "; - configStream << dictionary[ "BUILD" ]; - configStream << (dictionary[ "SHARED" ] == "no" ? " static" : " shared"); - - if (dictionary["STATIC_RUNTIME"] == "yes") - configStream << " static_runtime"; - if (dictionary[ "RTTI" ] == "yes") - configStream << " rtti"; - if (dictionary["INCREDIBUILD_XGE"] == "yes") - configStream << " incredibuild_xge"; - if (dictionary["PLUGIN_MANIFESTS"] == "no") - configStream << " no_plugin_manifest"; - if (dictionary["CROSS_COMPILE"] == "yes") - configStream << " cross_compile"; - - if (dictionary[ "SLOG2" ] == "yes") - configStream << " slog2"; - - if (dictionary[ "QNX_IMF" ] == "yes") - configStream << " qqnx_imf"; - - if (dictionary[ "PPS" ] == "yes") - configStream << " qqnx_pps"; - - if (dictionary[ "LGMON" ] == "yes") - configStream << " lgmon"; - - if (dictionary["DIRECTWRITE"] == "yes") - configStream << " directwrite"; - - if (dictionary["DIRECTWRITE2"] == "yes") - configStream << " directwrite2"; - - if (dictionary["ANDROID_STYLE_ASSETS"] == "yes") - configStream << " android-style-assets"; - - // ### For compatibility only, should be removed later. - configStream << " qpa"; - - configStream << endl; - configStream << "host_build {" << endl; - configStream << " QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; - configStream << " QT_TARGET_ARCH = " << dictionary["QT_ARCH"] << endl; - configStream << "} else {" << endl; - configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; - configStream << "}" << endl; - configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; - - configStream << "#versioning " << endl - << "QT_VERSION = " << dictionary["VERSION"] << endl - << "QT_MAJOR_VERSION = " << dictionary["VERSION_MAJOR"] << endl - << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl - << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; - - configStream << endl - << "QT_EDITION = " << dictionary["EDITION"] << endl; - - if (dictionary["EDITION"] != "OpenSource" && dictionary["EDITION"] != "Preview") { - configStream << "QT_LICHECK = " << dictionary["LICHECK"] << endl; - configStream << "QT_RELEASE_DATE = " << dictionary["RELEASEDATE"] << endl; - } - - if (!dictionary["CFG_SYSROOT"].isEmpty() && dictionary["CFG_GCC_SYSROOT"] == "yes") { - configStream << endl - << "# sysroot" << endl - << "!host_build {" << endl - << " QMAKE_CFLAGS += --sysroot=$$[QT_SYSROOT]" << endl - << " QMAKE_CXXFLAGS += --sysroot=$$[QT_SYSROOT]" << endl - << " QMAKE_LFLAGS += --sysroot=$$[QT_SYSROOT]" << endl - << "}" << endl; - } - - const QString targetOS = dictionary.value("TARGET_OS"); - if (!targetOS.isEmpty()) - configStream << "QMAKE_TARGET_OS = " << targetOS << endl; - - if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) - configStream << "QMAKE_RPATHDIR += " << formatPath(dictionary["QMAKE_RPATHDIR"]) << endl; - - if (!dictionary["QT_LIBINFIX"].isEmpty()) - configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl; - - if (!dictionary["QT_NAMESPACE"].isEmpty()) - configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; - - if (dictionary[ "SHARED" ] == "no") - configStream << "QT_DEFAULT_QPA_PLUGIN = q" << qpaPlatformName() << endl; - - if (!dictionary["QT_GCC_MAJOR_VERSION"].isEmpty()) { - configStream << "QT_GCC_MAJOR_VERSION = " << dictionary["QT_GCC_MAJOR_VERSION"] << endl - << "QT_GCC_MINOR_VERSION = " << dictionary["QT_GCC_MINOR_VERSION"] << endl - << "QT_GCC_PATCH_VERSION = " << dictionary["QT_GCC_PATCH_VERSION"] << endl; - } else if (!dictionary["QT_CL_MAJOR_VERSION"].isEmpty()) { - configStream << "QT_CL_MAJOR_VERSION = " << dictionary["QT_CL_MAJOR_VERSION"] << endl - << "QT_CL_MINOR_VERSION = " << dictionary["QT_CL_MINOR_VERSION"] << endl - << "QT_CL_PATCH_VERSION = " << dictionary["QT_CL_PATCH_VERSION"] << endl; - } - - if (dictionary.value("XQMAKESPEC").startsWith("wince")) { - configStream << "#Qt for Windows CE c-runtime deployment" << endl - << "QT_CE_C_RUNTIME = " << formatPath(dictionary["CE_CRT"]) << endl; - } - - if (!configStream.flush()) - dictionary[ "DONE" ] = "error"; - } -} - -QString Configure::addDefine(QString def) -{ - QString result, defNeg, defD = def; - - defD.replace(QRegExp("=.*"), ""); - def.replace(QRegExp("="), " "); - - if (def.startsWith("QT_NO_")) { - defNeg = defD; - defNeg.replace("QT_NO_", "QT_"); - } else if (def.startsWith("QT_")) { - defNeg = defD; - defNeg.replace("QT_", "QT_NO_"); - } - - if (defNeg.isEmpty()) { - result = "#ifndef $DEFD\n" - "# define $DEF\n" - "#endif\n\n"; - } else { - result = "#if defined($DEFD) && defined($DEFNEG)\n" - "# undef $DEFD\n" - "#elif !defined($DEFD)\n" - "# define $DEF\n" - "#endif\n\n"; - } - result.replace("$DEFNEG", defNeg); - result.replace("$DEFD", defD); - result.replace("$DEF", def); - return result; -} - -void Configure::generateConfigfiles() -{ - { - FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig.h"); - - tmpStream << "#define QT_VERSION_MAJOR " << dictionary["VERSION_MAJOR"] << endl - << "#define QT_VERSION_MINOR " << dictionary["VERSION_MINOR"] << endl - << "#define QT_VERSION_PATCH " << dictionary["VERSION_PATCH"] << endl - << "#define QT_VERSION_STR \"" << dictionary["VERSION"] << "\"\n" - << endl; - - if (dictionary[ "QCONFIG" ] == "full") { - tmpStream << "/* Everything */" << endl; - } else { - tmpStream << "#ifndef QT_BOOTSTRAPPED" << endl; - QFile inFile(dictionary["QCONFIG_PATH"]); - if (inFile.open(QFile::ReadOnly)) { - tmpStream << QTextStream(&inFile).readAll(); - inFile.close(); - } - tmpStream << "#endif // QT_BOOTSTRAPPED" << endl; - } - tmpStream << endl; - - if (dictionary[ "SHARED" ] == "no") { - tmpStream << "/* Qt was configured for a static build */" << endl - << "#if !defined(QT_SHARED) && !defined(QT_STATIC)" << endl - << "# define QT_STATIC" << endl - << "#endif" << endl - << endl; - } - tmpStream << "/* License information */" << endl; - tmpStream << "#define QT_PRODUCT_LICENSEE \"" << dictionary[ "LICENSEE" ] << "\"" << endl; - tmpStream << "#define QT_PRODUCT_LICENSE \"" << dictionary[ "EDITION" ] << "\"" << endl; - tmpStream << endl; - if (dictionary["BUILDDEV"] == "yes") { - dictionary["QMAKE_INTERNAL"] = "yes"; - tmpStream << "/* Used for example to export symbols for the certain autotests*/" << endl; - tmpStream << "#define QT_BUILD_INTERNAL" << endl; - tmpStream << endl; - } - - tmpStream << endl << "// Compiler sub-arch support" << endl; - if (dictionary[ "SSE2" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE2 1" << endl; - if (dictionary[ "SSE3" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE3 1" << endl; - if (dictionary[ "SSSE3" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSSE3 1" << endl; - if (dictionary[ "SSE4_1" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE4_1 1" << endl; - if (dictionary[ "SSE4_2" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_SSE4_2 1" << endl; - if (dictionary[ "AVX" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_AVX 1" << endl; - if (dictionary[ "AVX2" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_AVX2 1" << endl; - foreach (const QString &avx512feature, dictionary[ "AVX512" ].split(' ', QString::SkipEmptyParts)) - tmpStream << "#define QT_COMPILER_SUPPRTS_" << avx512feature.toUpper() << " 1" << endl; - - if (dictionary["QREAL"] != "double") { - tmpStream << "#define QT_COORD_TYPE " << dictionary["QREAL"] << endl; - tmpStream << "#define QT_COORD_TYPE_STRING " << dictionary["QREAL_STRING"] << endl; - } - - tmpStream << endl << "// Compile time features" << endl; - - QStringList qconfigList; - if (dictionary["STYLE_WINDOWS"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWS"; - if (dictionary["STYLE_FUSION"] != "yes") qconfigList += "QT_NO_STYLE_FUSION"; - if (dictionary["STYLE_WINDOWSXP"] != "yes" && dictionary["STYLE_WINDOWSVISTA"] != "yes") - qconfigList += "QT_NO_STYLE_WINDOWSXP"; - if (dictionary["STYLE_WINDOWSVISTA"] != "yes") qconfigList += "QT_NO_STYLE_WINDOWSVISTA"; - - if (dictionary["GIF"] == "yes") qconfigList += "QT_BUILTIN_GIF_READER=1"; - if (dictionary["PNG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_PNG"; - if (dictionary["JPEG"] != "yes") qconfigList += "QT_NO_IMAGEFORMAT_JPEG"; - if (dictionary["ZLIB"] == "no") { - qconfigList += "QT_NO_ZLIB"; - qconfigList += "QT_NO_COMPRESS"; - } - - if (dictionary["ACCESSIBILITY"] == "no") qconfigList += "QT_NO_ACCESSIBILITY"; - if (dictionary["WIDGETS"] == "no") qconfigList += "QT_NO_WIDGETS"; - if (dictionary["GUI"] == "no") qconfigList += "QT_NO_GUI"; - if (dictionary["OPENGL"] == "no") qconfigList += "QT_NO_OPENGL"; - if (dictionary["OPENVG"] == "no") qconfigList += "QT_NO_OPENVG"; - if (dictionary["SSL"] == "no") qconfigList += "QT_NO_SSL"; - if (dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL"; - if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; - if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; - if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; - if (dictionary["HARFBUZZ"] == "no") qconfigList += "QT_NO_HARFBUZZ"; - if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; - - if (dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES"; - if (dictionary["OPENGL_ES_2"] == "yes") qconfigList += "QT_OPENGL_ES_2"; - if (dictionary["DYNAMICGL"] == "yes") qconfigList += "QT_OPENGL_DYNAMIC"; - if (dictionary["SQL_MYSQL"] == "yes") qconfigList += "QT_SQL_MYSQL"; - if (dictionary["SQL_ODBC"] == "yes") qconfigList += "QT_SQL_ODBC"; - if (dictionary["SQL_OCI"] == "yes") qconfigList += "QT_SQL_OCI"; - if (dictionary["SQL_PSQL"] == "yes") qconfigList += "QT_SQL_PSQL"; - if (dictionary["SQL_TDS"] == "yes") qconfigList += "QT_SQL_TDS"; - if (dictionary["SQL_DB2"] == "yes") qconfigList += "QT_SQL_DB2"; - if (dictionary["SQL_SQLITE"] == "yes") qconfigList += "QT_SQL_SQLITE"; - if (dictionary["SQL_SQLITE2"] == "yes") qconfigList += "QT_SQL_SQLITE2"; - if (dictionary["SQL_IBASE"] == "yes") qconfigList += "QT_SQL_IBASE"; - - if (dictionary["POSIX_IPC"] == "yes") - qconfigList += "QT_POSIX_IPC"; - else if ((platform() != ANDROID) && (platform() != WINDOWS) && (platform() != WINDOWS_RT)) - qconfigList << "QT_NO_SYSTEMSEMAPHORE" << "QT_NO_SHAREDMEMORY"; - - if (dictionary["FONT_CONFIG"] == "no") qconfigList += "QT_NO_FONTCONFIG"; - - if (dictionary["NIS"] == "yes") - qconfigList += "QT_NIS"; - else - qconfigList += "QT_NO_NIS"; - - if (dictionary["LARGE_FILE"] == "yes") qconfigList += "QT_LARGEFILE_SUPPORT=64"; - if (dictionary["QT_CUPS"] == "no") qconfigList += "QT_NO_CUPS"; - if (dictionary["QT_ICONV"] == "no") qconfigList += "QT_NO_ICONV"; - if (dictionary["QT_EVDEV"] == "no") qconfigList += "QT_NO_EVDEV"; - if (dictionary["QT_MTDEV"] == "no") qconfigList += "QT_NO_MTDEV"; - if (dictionary["QT_TSLIB"] == "no") qconfigList += "QT_NO_TSLIB"; - if (dictionary["QT_GLIB"] == "no") qconfigList += "QT_NO_GLIB"; - if (dictionary["QT_INOTIFY"] == "no") qconfigList += "QT_NO_INOTIFY"; - if (dictionary["QT_EVENTFD"] == "no") qconfigList += "QT_NO_EVENTFD"; - if (dictionary["ATOMIC64"] == "no") qconfigList += "QT_NO_STD_ATOMIC64"; - - if (dictionary["REDUCE_EXPORTS"] == "yes") qconfigList += "QT_VISIBILITY_AVAILABLE"; - if (dictionary["REDUCE_RELOCATIONS"] == "yes") qconfigList += "QT_REDUCE_RELOCATIONS"; - if (dictionary["QT_GETIFADDRS"] == "no") qconfigList += "QT_NO_GETIFADDRS"; - - qconfigList.sort(); - for (int i = 0; i < qconfigList.count(); ++i) - tmpStream << addDefine(qconfigList.at(i)); - - tmpStream<<"#define QT_QPA_DEFAULT_PLATFORM_NAME \"" << qpaPlatformName() << "\""<<endl; - - if (!tmpStream.flush()) - dictionary[ "DONE" ] = "error"; - } - -} - -QString Configure::formatConfigPath(const char *var) -{ - QString val = dictionary[var]; - if (QFileInfo(val).isRelative()) { - QString pfx = dictionary["QT_INSTALL_PREFIX"]; - val = (val == ".") ? pfx : QDir(pfx).absoluteFilePath(val); - } - return QDir::toNativeSeparators(val); -} - -void Configure::displayConfig() -{ - fstream sout; - sout.open(QString(buildPath + "/config.summary").toLocal8Bit().constData(), - ios::in | ios::out | ios::trunc); - - // Give some feedback - sout << "Environment:" << endl; - QString env = QString::fromLocal8Bit(getenv("INCLUDE")).replace(QRegExp("[;,]"), "\n "); - if (env.isEmpty()) - env = "Unset"; - sout << " INCLUDE=\n " << env << endl; - env = QString::fromLocal8Bit(getenv("LIB")).replace(QRegExp("[;,]"), "\n "); - if (env.isEmpty()) - env = "Unset"; - sout << " LIB=\n " << env << endl; - env = QString::fromLocal8Bit(getenv("PATH")).replace(QRegExp("[;,]"), "\n "); - if (env.isEmpty()) - env = "Unset"; - sout << " PATH=\n " << env << endl; - - if (dictionary[QStringLiteral("EDITION")] != QLatin1String("OpenSource")) { - QString l1 = dictionary[ "LICENSEE" ]; - QString l2 = dictionary[ "LICENSEID" ]; - QString l3 = dictionary["EDITION"] + ' ' + "Edition"; - QString l4 = dictionary[ "EXPIRYDATE" ]; - sout << "Licensee...................." << (l1.isNull() ? "" : l1) << endl; - sout << "License ID.................." << (l2.isNull() ? "" : l2) << endl; - sout << "Product license............." << (l3.isNull() ? "" : l3) << endl; - sout << "Expiry Date................." << (l4.isNull() ? "" : l4) << endl; - sout << endl; - } - - sout << "Configuration:" << endl; - sout << " " << qmakeConfig.join("\n ") << endl; - sout << "Qt Configuration:" << endl; - sout << " " << qtConfig.join("\n ") << endl; - sout << endl; - - if (dictionary.contains("XQMAKESPEC")) - sout << "QMAKESPEC..................." << dictionary[ "XQMAKESPEC" ] << " (" << dictionary["QMAKESPEC_FROM"] << ")" << endl; - else - sout << "QMAKESPEC..................." << dictionary[ "QMAKESPEC" ] << " (" << dictionary["QMAKESPEC_FROM"] << ")" << endl; - if (!dictionary["TARGET_OS"].isEmpty()) - sout << "Target OS..................." << dictionary["TARGET_OS"] << endl; - sout << "Architecture................" << dictionary["QT_ARCH"] - << ", features:" << dictionary["QT_CPU_FEATURES"] << endl; - sout << "Host Architecture..........." << dictionary["QT_HOST_ARCH"] - << ", features:" << dictionary["QT_HOST_CPU_FEATURES"] << endl; - sout << "Maketool...................." << dictionary[ "MAKE" ] << endl; - if (dictionary[ "BUILDALL" ] == "yes") { - sout << "Debug build................." << "yes (combined)" << endl; - sout << "Default build..............." << dictionary[ "BUILD" ] << endl; - } else { - sout << "Debug......................." << (dictionary[ "BUILD" ] == "debug" ? "yes" : "no") << endl; - } - if (dictionary[ "BUILD" ] == "release" || dictionary[ "BUILDALL" ] == "yes") - sout << "Force debug info............" << dictionary[ "FORCEDEBUGINFO" ] << endl; - if (dictionary[ "BUILD" ] == "debug") - sout << "Force optimized tools......." << dictionary[ "RELEASE_TOOLS" ] << endl; - sout << "C++ language standard......." << dictionary[ "C++STD" ] << endl; - sout << "Link Time Code Generation..." << dictionary[ "LTCG" ] << endl; - sout << "Using PCH .................." << dictionary[ "PCH" ] << endl; - sout << "Accessibility support......." << dictionary[ "ACCESSIBILITY" ] << endl; - sout << "RTTI support................" << dictionary[ "RTTI" ] << endl; - sout << "SSE support................." - << (dictionary[ "SSE2" ] == "no" ? "<none>" : "SSE2") - << (dictionary[ "SSE3" ] == "no" ? "" : " SSE3") - << (dictionary[ "SSSE3" ] == "no" ? "" : " SSSE3") - << (dictionary[ "SSE4_1" ] == "no" ? "" : " SSE4.1") - << (dictionary[ "SSE4_2" ] == "no" ? "" : " SSE4.2") - << endl; - sout << "AVX support................." - << (dictionary[ "AVX" ] == "no" ? "<none>" : "AVX") - << (dictionary[ "AVX2" ] == "no" ? "" : " AVX2") - << endl; - sout << "AVX512 support.............." - << (dictionary[ "AVX512" ].isEmpty() ? QString("<none>") : dictionary[ "AVX512" ].toUpper()) << endl; - sout << "NEON support................" << dictionary[ "NEON" ] << endl; - sout << "OpenGL support.............." << dictionary[ "OPENGL" ] << endl; - sout << "Large File support.........." << dictionary[ "LARGE_FILE" ] << endl; - sout << "NIS support................." << dictionary[ "NIS" ] << endl; - sout << "Iconv support..............." << dictionary[ "QT_ICONV" ] << endl; - sout << "Evdev support..............." << dictionary[ "QT_EVDEV" ] << endl; - sout << "Mtdev support..............." << dictionary[ "QT_MTDEV" ] << endl; - sout << "Inotify support............." << dictionary[ "QT_INOTIFY" ] << endl; - sout << "eventfd(7) support.........." << dictionary[ "QT_EVENTFD" ] << endl; - sout << "Glib support................" << dictionary[ "QT_GLIB" ] << endl; - sout << "CUPS support................" << dictionary[ "QT_CUPS" ] << endl; - sout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl; - sout << "SSL support................." << dictionary[ "SSL" ] << endl; - sout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; - sout << "libproxy support............" << dictionary[ "LIBPROXY" ] << endl; - sout << "Qt D-Bus support............" << dictionary[ "DBUS" ] << endl; - sout << "Qt Widgets module support..." << dictionary[ "WIDGETS" ] << endl; - sout << "Qt GUI module support......." << dictionary[ "GUI" ] << endl; - sout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl; - sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl; - sout << "DirectWrite 2 support......." << dictionary[ "DIRECTWRITE2" ] << endl; - sout << "Use system proxies.........." << dictionary[ "SYSTEM_PROXIES" ] << endl; - sout << endl; - - sout << "QPA Backends:" << endl; - sout << " GDI....................." << "yes" << endl; - sout << " Direct2D................" << dictionary[ "DIRECT2D" ] << endl; - sout << endl; - - sout << "Third Party Libraries:" << endl; - sout << " ZLIB support............" << dictionary[ "ZLIB" ] << endl; - sout << " GIF support............." << dictionary[ "GIF" ] << endl; - sout << " JPEG support............" << dictionary[ "JPEG" ] << endl; - sout << " PNG support............." << dictionary[ "PNG" ] << endl; - sout << " DoubleConversion........" << dictionary[ "DOUBLECONVERSION" ] << endl; - sout << " FreeType support........" << dictionary[ "FREETYPE" ] << endl; - sout << " Fontconfig support......" << dictionary[ "FONT_CONFIG" ] << endl; - sout << " HarfBuzz support........" << dictionary[ "HARFBUZZ" ] << endl; - sout << " PCRE support............" << dictionary[ "PCRE" ] << endl; - sout << " ICU support............." << dictionary[ "ICU" ] << endl; - if (platform() == QNX) { - sout << " SLOG2 support..........." << dictionary[ "SLOG2" ] << endl; - sout << " IMF support............." << dictionary[ "QNX_IMF" ] << endl; - sout << " PPS support............." << dictionary[ "PPS" ] << endl; - sout << " LGMON support..........." << dictionary[ "LGMON" ] << endl; - } - sout << " ANGLE..................." << dictionary[ "ANGLE" ] << endl; - sout << " Dynamic OpenGL.........." << dictionary[ "DYNAMICGL" ] << endl; - sout << endl; - - sout << "Styles:" << endl; - sout << " Windows................." << dictionary[ "STYLE_WINDOWS" ] << endl; - sout << " Windows XP.............." << dictionary[ "STYLE_WINDOWSXP" ] << endl; - sout << " Windows Vista..........." << dictionary[ "STYLE_WINDOWSVISTA" ] << endl; - sout << " Fusion.................." << dictionary[ "STYLE_FUSION" ] << endl; - sout << endl; - - sout << "Sql Drivers:" << endl; - sout << " ODBC...................." << dictionary[ "SQL_ODBC" ] << endl; - sout << " MySQL..................." << dictionary[ "SQL_MYSQL" ] << endl; - sout << " OCI....................." << dictionary[ "SQL_OCI" ] << endl; - sout << " PostgreSQL.............." << dictionary[ "SQL_PSQL" ] << endl; - sout << " TDS....................." << dictionary[ "SQL_TDS" ] << endl; - sout << " DB2....................." << dictionary[ "SQL_DB2" ] << endl; - sout << " SQLite.................." << dictionary[ "SQL_SQLITE" ] << " (" << dictionary[ "SQL_SQLITE_LIB" ] << ")" << endl; - sout << " SQLite2................." << dictionary[ "SQL_SQLITE2" ] << endl; - sout << " InterBase..............." << dictionary[ "SQL_IBASE" ] << endl; - sout << endl; - - sout << "Sources are in.............." << QDir::toNativeSeparators(sourcePath) << endl; - sout << "Build is done in............" << QDir::toNativeSeparators(buildPath) << endl; - sout << "Install prefix.............." << QDir::toNativeSeparators(dictionary["QT_INSTALL_PREFIX"]) << endl; - sout << "Headers installed to........" << formatConfigPath("QT_REL_INSTALL_HEADERS") << endl; - sout << "Libraries installed to......" << formatConfigPath("QT_REL_INSTALL_LIBS") << endl; - sout << "Arch-dep. data to..........." << formatConfigPath("QT_REL_INSTALL_ARCHDATA") << endl; - sout << "Plugins installed to........" << formatConfigPath("QT_REL_INSTALL_PLUGINS") << endl; - sout << "Library execs installed to.." << formatConfigPath("QT_REL_INSTALL_LIBEXECS") << endl; - sout << "QML1 imports installed to..." << formatConfigPath("QT_REL_INSTALL_IMPORTS") << endl; - sout << "QML2 imports installed to..." << formatConfigPath("QT_REL_INSTALL_QML") << endl; - sout << "Binaries installed to......." << formatConfigPath("QT_REL_INSTALL_BINS") << endl; - sout << "Arch-indep. data to........." << formatConfigPath("QT_REL_INSTALL_DATA") << endl; - sout << "Docs installed to..........." << formatConfigPath("QT_REL_INSTALL_DOCS") << endl; - sout << "Translations installed to..." << formatConfigPath("QT_REL_INSTALL_TRANSLATIONS") << endl; - sout << "Examples installed to......." << formatConfigPath("QT_REL_INSTALL_EXAMPLES") << endl; - sout << "Tests installed to.........." << formatConfigPath("QT_REL_INSTALL_TESTS") << endl; - - if (checkAvailability("INCREDIBUILD_XGE")) - sout << "Using IncrediBuild XGE......" << dictionary["INCREDIBUILD_XGE"] << endl; - if (!qmakeDefines.isEmpty()) { - sout << "Defines....................."; - for (QStringList::Iterator defs = qmakeDefines.begin(); defs != qmakeDefines.end(); ++defs) - sout << (*defs) << " "; - sout << endl; - } - if (!qmakeIncludes.isEmpty()) { - sout << "Include paths..............."; - for (QStringList::Iterator incs = qmakeIncludes.begin(); incs != qmakeIncludes.end(); ++incs) - sout << (*incs) << " "; - sout << endl; - } - if (!qmakeLibs.isEmpty()) { - sout << "Additional libraries........"; - for (QStringList::Iterator libs = qmakeLibs.begin(); libs != qmakeLibs.end(); ++libs) - sout << (*libs) << " "; - sout << endl; - } - if (dictionary[ "QMAKE_INTERNAL" ] == "yes") { - sout << "Using internal configuration." << endl; - } - if (dictionary[ "SHARED" ] == "no") { - sout << "WARNING: Using static linking will disable the use of plugins." << endl; - sout << " Make sure you compile ALL needed modules into the library." << endl; - } - if (dictionary[ "OPENSSL" ] == "linked") { - if (!opensslLibsDebug.isEmpty() || !opensslLibsRelease.isEmpty()) { - sout << "Using OpenSSL libraries:" << endl; - sout << " debug : " << opensslLibsDebug << endl; - sout << " release: " << opensslLibsRelease << endl; - sout << " both : " << opensslLibs << endl; - } else if (opensslLibs.isEmpty()) { - sout << "NOTE: When linking against OpenSSL, you can override the default" << endl; - sout << "library names through OPENSSL_LIBS and optionally OPENSSL_LIBS_DEBUG/OPENSSL_LIBS_RELEASE" << endl; - sout << "For example:" << endl; - sout << " configure -openssl-linked OPENSSL_LIBS=\"-lssleay32 -llibeay32\"" << endl; - } - } - if (dictionary[ "ZLIB_FORCED" ] == "yes") { - QString which_zlib = "supplied"; - if (dictionary[ "ZLIB" ] == "system") - which_zlib = "system"; - - sout << "NOTE: The -no-zlib option was supplied but is no longer supported." << endl - << endl - << "Qt now requires zlib support in all builds, so the -no-zlib" << endl - << "option was ignored. Qt will be built using the " << which_zlib - << "zlib" << endl; - } - if (dictionary["OBSOLETE_ARCH_ARG"] == "yes") { - sout << endl - << "NOTE: The -arch option is obsolete." << endl - << endl - << "Qt now detects the target and host architectures based on compiler" << endl - << "output. Qt will be built using " << dictionary["QT_ARCH"] << " for the target architecture" << endl - << "and " << dictionary["QT_HOST_ARCH"] << " for the host architecture (note that these two" << endl - << "will be the same unless you are cross-compiling)." << endl - << endl; - } - if (dictionary["RELEASE_TOOLS"] == "yes" && dictionary["BUILD"] != "debug" ) { - sout << endl - << "NOTE: -optimized-tools is not useful in -release mode." << endl; - } - if (!dictionary["PREFIX_COMPLAINTS"].isEmpty()) { - sout << endl - << dictionary["PREFIX_COMPLAINTS"] << endl - << endl; - } - - // display config.summary - sout.seekg(0, ios::beg); - while (sout.good()) { - string str; - getline(sout, str); - cout << str << endl; - } -} - void Configure::generateHeaders() { if (dictionary["SYNCQT"] == "auto") - dictionary["SYNCQT"] = defaultTo("SYNCQT"); + dictionary["SYNCQT"] = QFile::exists(sourcePath + "/.git") ? "yes" : "no"; if (dictionary["SYNCQT"] == "yes") { if (!QStandardPaths::findExecutable(QStringLiteral("perl.exe")).isEmpty()) { @@ -4020,7 +577,7 @@ void Configure::generateHeaders() QStringList args; args << "perl" << "-w"; args += sourcePath + "/bin/syncqt.pl"; - args << "-version" << dictionary["VERSION"] << "-minimal" << "-module" << "QtCore"; + args << "-version" << QT_VERSION_STR << "-minimal" << "-module" << "QtCore"; args += sourcePath; int retc = Environment::execute(args, QStringList(), QStringList()); if (retc) { @@ -4207,11 +764,7 @@ void Configure::generateQConfigCpp() // Generate the new qconfig.cpp file { FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig.cpp"); - tmpStream << "/* Licensed */" << endl - << "static const char qt_configure_licensee_str [512 + 12] = \"qt_lcnsuser=" << dictionary["LICENSEE"] << "\";" << endl - << "static const char qt_configure_licensed_products_str [512 + 12] = \"qt_lcnsprod=" << dictionary["EDITION"] << "\";" << endl - << endl - << "/* Build date */" << endl + tmpStream << "/* Build date */" << endl << "static const char qt_configure_installation [11 + 12] = \"qt_instdate=2012-12-20\";" << endl << endl << "/* Installation Info */" << endl @@ -4239,9 +792,6 @@ void Configure::generateQConfigCpp() << "#ifdef QT_BUILD_QMAKE\n" << "# define QT_CONFIGURE_SYSROOTIFY_PREFIX " << (sysrootifyPrefix ? "true" : "false") << endl << "#endif\n\n" - << "/* strlen( \"qt_lcnsxxxx\") == 12 */" << endl - << "#define QT_CONFIGURE_LICENSEE qt_configure_licensee_str + 12" << endl - << "#define QT_CONFIGURE_LICENSED_PRODUCTS qt_configure_licensed_products_str + 12" << endl << endl << "#define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12\n" << "#ifdef QT_BUILD_QMAKE\n" @@ -4256,7 +806,7 @@ void Configure::generateQConfigCpp() void Configure::buildQmake() { - if (dictionary[ "BUILD_QMAKE" ] == "yes") { + { QStringList args; // Build qmake @@ -4283,61 +833,21 @@ void Configure::buildQmake() << "INC_PATH = " << QDir::toNativeSeparators( (QFile::exists(sourcePath + "/.git") ? ".." : sourcePath) + "/include") << endl; - stream << "QT_VERSION = " << dictionary["VERSION"] << endl - << "QT_MAJOR_VERSION = " << dictionary["VERSION_MAJOR"] << endl - << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl - << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl; + stream << "QT_VERSION = " QT_VERSION_STR << endl + << "QT_MAJOR_VERSION = " QT_STRINGIFY(QT_VERSION_MAJOR) << endl + << "QT_MINOR_VERSION = " QT_STRINGIFY(QT_VERSION_MINOR) << endl + << "QT_PATCH_VERSION = " QT_STRINGIFY(QT_VERSION_PATCH) << endl; if (dictionary[ "QMAKESPEC" ].startsWith("win32-g++")) { stream << "QMAKESPEC = $(SOURCE_PATH)\\mkspecs\\" << dictionary[ "QMAKESPEC" ] << endl - << "EXTRA_CFLAGS = -DUNICODE -ffunction-sections" << endl - << "EXTRA_CXXFLAGS = -std=c++11 -DUNICODE -ffunction-sections" << endl - << "EXTRA_LFLAGS = -Wl,--gc-sections" << endl - << "QTOBJS = qfilesystemengine_win.o \\" << endl - << " qfilesystemiterator_win.o \\" << endl - << " qfsfileengine_win.o \\" << endl - << " qlocale_win.o \\" << endl - << " qsettings_win.o \\" << endl - << " qsystemlibrary.o \\" << endl - << " registry.o" << endl - << "QTSRCS=\"$(SOURCE_PATH)/src/corelib/io/qfilesystemengine_win.cpp\" \\" << endl - << " \"$(SOURCE_PATH)/src/corelib/io/qfilesystemiterator_win.cpp\" \\" << endl - << " \"$(SOURCE_PATH)/src/corelib/io/qfsfileengine_win.cpp\" \\" << endl - << " \"$(SOURCE_PATH)/src/corelib/io/qsettings_win.cpp\" \\" << endl - << " \"$(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp\" \\" << endl\ - << " \"$(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp\" \\" << endl - << " \"$(SOURCE_PATH)/tools/shared/windows/registry.cpp\"" << endl - << "EXEEXT=.exe" << endl - << "LFLAGS=-static -s -lole32 -luuid -ladvapi32 -lkernel32" << endl; - /* - ** SHELL is the full path of sh.exe, unless - ** 1) it is found in the current directory - ** 2) it is not found at all - ** 3) it is overridden on the command line with an existing file - ** ... otherwise it is always sh.exe. Specifically, SHELL from the - ** environment has no effect. - ** - ** This check will fail if SHELL is explicitly set to a not - ** sh-compatible shell. This is not a problem, because configure.bat - ** will not do that. - */ - stream << "ifeq ($(SHELL), sh.exe)" << endl - << " ifeq ($(wildcard $(CURDIR)/sh.exe), )" << endl - << " SH = 0" << endl - << " else" << endl - << " SH = 1" << endl - << " endif" << endl - << "else" << endl - << " SH = 1" << endl - << "endif" << endl - << "\n" - << "ifeq ($(SH), 1)" << endl - << " RM_F = rm -f" << endl - << " RM_RF = rm -rf" << endl - << "else" << endl - << " RM_F = del /f" << endl - << " RM_RF = rmdir /s /q" << endl - << "endif" << endl; - stream << "\n\n"; + << "CONFIG_CXXFLAGS = -std=c++11 -ffunction-sections" << endl + << "CONFIG_LFLAGS = -Wl,--gc-sections" << endl; + + QFile in(sourcePath + "/qmake/Makefile.unix.win32"); + if (in.open(QFile::ReadOnly | QFile::Text)) + stream << in.readAll(); + QFile in2(sourcePath + "/qmake/Makefile.unix.mingw"); + if (in2.open(QFile::ReadOnly | QFile::Text)) + stream << in2.readAll(); } else { stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl; } @@ -4402,63 +912,33 @@ void Configure::buildQmake() } -void Configure::generateMakefiles() +void Configure::configure() { - QString pwd = QDir::currentPath(); - { - QString sourcePathMangled = sourcePath; - QString buildPathMangled = buildPath; - if (dictionary.contains("TOPLEVEL")) { - sourcePathMangled = QFileInfo(sourcePath).path(); - buildPathMangled = QFileInfo(buildPath).path(); - } - QStringList args; - args << buildPath + "/bin/qmake" << sourcePathMangled; - - QDir::setCurrent(buildPathMangled); - if (int exitCode = Environment::execute(args, QStringList(), QStringList())) { - cout << "Qmake failed, return code " << exitCode << endl << endl; - dictionary[ "DONE" ] = "error"; - } - } - QDir::setCurrent(pwd); -} + FileWriter ci(buildPath + "/config.tests/configure.cfg"); + ci << "# Feature defaults set by configure command line\n" + << "config.input.qt_edition = " << dictionary["EDITION"] << "\n" + << "config.input.qt_licheck = " << dictionary["LICHECK"] << "\n" + << "config.input.qt_release_date = " << dictionary["RELEASEDATE"]; + if (!ci.flush()) { + dictionary[ "DONE" ] = "error"; + return; + } -void Configure::showSummary() -{ - QString make = dictionary[ "MAKE" ]; - cout << endl << endl << "Qt is now configured for building. Just run " << qPrintable(make) << "." << endl; - cout << "To reconfigure, run " << qPrintable(make) << " confclean and configure." << endl << endl; -} + QStringList args; + args << buildPath + "/bin/qmake" + << sourcePathMangled + << "--" << configCmdLine; -Configure::ProjectType Configure::projectType(const QString& proFileName) -{ - QFile proFile(proFileName); - if (proFile.open(QFile::ReadOnly)) { - QString buffer = proFile.readLine(1024); - while (!buffer.isEmpty()) { - QStringList segments = buffer.split(QRegExp("\\s")); - QStringList::Iterator it = segments.begin(); - - if (segments.size() >= 3) { - QString keyword = (*it++); - QString operation = (*it++); - QString value = (*it++); - - if (keyword == "TEMPLATE") { - if (value == "lib") - return Lib; - else if (value == "subdirs") - return Subdirs; - } - } - // read next line - buffer = proFile.readLine(1024); - } - proFile.close(); + QString pwd = QDir::currentPath(); + QDir::setCurrent(buildPathMangled); + if (int exitCode = Environment::execute(args, QStringList(), QStringList())) { + cout << "Qmake failed, return code " << exitCode << endl << endl; + dictionary[ "DONE" ] = "error"; } - // Default to app handling - return App; + QDir::setCurrent(pwd); + + if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error")) + saveCmdLine(); } bool Configure::showLicense(QString orgLicenseFile) @@ -4505,6 +985,7 @@ bool Configure::showLicense(QString orgLicenseFile) accept = tolower(accept); if (accept == 'y') { + configCmdLine << "-confirm-license"; return true; } else if (accept == 'n') { return false; @@ -4578,6 +1059,7 @@ void Configure::readLicense() } else if (openSource) { cout << endl << "Cannot find the GPL license files! Please download the Open Source version of the library." << endl; dictionary["DONE"] = "error"; + return; } else { QString tpLicense = sourcePath + "/LICENSE.PREVIEW.COMMERCIAL"; if (QFile::exists(tpLicense)) { @@ -4599,25 +1081,38 @@ void Configure::readLicense() } else if (dictionary["LICHECK"].isEmpty()) { // licheck executable shows license cout << "You have already accepted the terms of the license." << endl << endl; } + + if (dictionary["BUILDTYPE"] == "none") { + if (openSource) + configCmdLine << "-opensource"; + else + configCmdLine << "-commercial"; + } } -void Configure::reloadCmdLine() +bool Configure::reloadCmdLine(int idx) { - if (dictionary[ "REDO" ] == "yes") { - QFile inFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache"); - if (inFile.open(QFile::ReadOnly)) { - QTextStream inStream(&inFile); - while (!inStream.atEnd()) - configCmdLine += inStream.readLine().trimmed(); - inFile.close(); + QFile inFile(buildPathMangled + "/config.opt"); + if (!inFile.open(QFile::ReadOnly)) { + inFile.setFileName(buildPath + "/config.opt"); + if (!inFile.open(QFile::ReadOnly)) { + inFile.setFileName(buildPath + "/configure.cache"); + if (!inFile.open(QFile::ReadOnly)) { + cout << "No config.opt present - cannot redo configuration." << endl; + return false; + } + } } - } + QTextStream inStream(&inFile); + while (!inStream.atEnd()) + configCmdLine.insert(idx++, inStream.readLine().trimmed()); + return true; } void Configure::saveCmdLine() { if (dictionary[ "REDO" ] != "yes") { - QFile outFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache"); + QFile outFile(buildPathMangled + "/config.opt"); if (outFile.open(QFile::WriteOnly | QFile::Text)) { QTextStream outStream(&outFile); for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) { @@ -4656,26 +1151,8 @@ QString Configure::platformName() const } } -QString Configure::qpaPlatformName() const -{ - switch (platform()) { - default: - case WINDOWS: - return QStringLiteral("windows"); - case WINDOWS_RT: - return QStringLiteral("winrt"); - case QNX: - return QStringLiteral("qnx"); - case ANDROID: - return QStringLiteral("android"); - case OTHER: - return QStringLiteral("xcb"); - } -} - int Configure::platform() const { - const QString qMakeSpec = dictionary.value("QMAKESPEC"); const QString xQMakeSpec = dictionary.value("XQMAKESPEC"); if ((xQMakeSpec.startsWith("winphone") || xQMakeSpec.startsWith("winrt"))) diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index bd90ead703..c8d4d3df53 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -43,129 +43,51 @@ public: ~Configure(); void parseCmdLine(); - void validateArgs(); - bool displayHelp(); - QString defaultTo(const QString &option); - bool checkAvailability(const QString &part); void generateQConfigCpp(); void buildQmake(); - void autoDetection(); - bool verifyConfiguration(); - void generateOutputVars(); + void prepareConfigureInput(); + void configure(); + void generateHeaders(); - void generateCachefile(); - void displayConfig(); - void generateMakefiles(); - void generateConfigfiles(); - void detectArch(); - void generateQConfigPri(); void generateQDevicePri(); void prepareConfigTests(); - void showSummary(); - QString firstLicensePath(); bool showLicense(QString licenseFile); void readLicense(); - QString addDefine(QString def); - - enum ProjectType { - App, - Lib, - Subdirs - }; - - ProjectType projectType( const QString& proFileName ); bool isDone(); bool isOk(); int platform() const; QString platformName() const; - QString qpaPlatformName() const; private: - bool checkAngleAvailability(QString *errorMessage = 0) const; - QString checkAvx512Availability(); - int verbose; // Our variable dictionaries QMap<QString,QString> dictionary; - QStringList allBuildParts; - QStringList defaultBuildParts; - QStringList buildParts; - QStringList nobuildParts; - QStringList skipModules; - QStringList licensedModules; - QStringList allSqlDrivers; - QStringList disabledModules; - QStringList enabledModules; - QStringList modules; -// QStringList sqlDrivers; QStringList configCmdLine; - QStringList qmakeConfig; - QStringList qtConfig; - - QStringList qmakeSql; - QStringList qmakeSqlPlugins; - - QStringList qmakeStyles; - QStringList qmakeStylePlugins; - - QStringList qmakeVars; - QStringList qmakeDefines; - QStringList qmakeIncludes; - QStringList qmakeLibs; - QString opensslLibs; - QString opensslLibsDebug; - QString opensslLibsRelease; - QString opensslPath; - QString dbusPath; - QString dbusHostPath; - QString mysqlPath; - QString psqlLibs; - QString zlibLibs; - QString sybase; - QString sybaseLibs; QString outputLine; QTextStream outStream; QString sourcePath, buildPath; + QString sourcePathMangled, buildPathMangled; QDir sourceDir, buildDir; - // Variables for usage output - int optionIndent; - int descIndent; - int outputWidth; - QString confStrOffsets[2]; QString confStrings[2]; int confStringOff; void addConfStr(int group, const QString &val); QString formatPath(const QString &path); - QString formatPaths(const QStringList &paths); - QString locateFile(const QString &fileName) const; - bool findFile(const QString &fileName) const { return !locateFile(fileName).isEmpty(); } - static QString findFileInPaths(const QString &fileName, const QStringList &paths); - void reloadCmdLine(); + bool reloadCmdLine(int idx); void saveCmdLine(); - void addSysroot(QString *command); - bool tryCompileProject(const QString &projectPath, const QString &extraOptions = QString(), - bool distClean = true); - bool compilerSupportsFlag(const QString &compilerAndArgs); - - void desc(const char *description, int startingAt = 0, int wrapIndent = 0); - void desc(const char *option, const char *description, bool skipIndent = false, char fillChar = '.'); - void desc(const char *mark_option, const char *mark, const char *option, const char *description, char fillChar = '.'); void applySpecSpecifics(); - - QString formatConfigPath(const char *var); }; class FileWriter : public QTextStream diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index 1df8be38af..e585b16ea7 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -62,7 +62,6 @@ struct CompilerInfo{ const char *executable; } compiler_info[] = { // The compilers here are sorted in a reversed-preferred order - {CC_BORLAND, "Borland C++", 0, "bcc32.exe"}, {CC_MINGW, "MinGW (Minimalist GNU for Windows)", 0, "g++.exe"}, {CC_INTEL, "Intel(R) C++ Compiler for 32-bit applications", 0, "icl.exe"}, // xilink.exe, xilink5.exe, xilink6.exe, xilib.exe {CC_MSVC2012, "Microsoft (R) Visual Studio 2012 C/C++ Compiler (11.0)", "Software\\Microsoft\\VisualStudio\\SxS\\VC7\\11.0", "cl.exe"}, // link.exe, lib.exe @@ -113,9 +112,6 @@ QString Environment::detectQMakeSpec() case CC_MINGW: spec = "win32-g++"; break; - case CC_BORLAND: - spec = "win32-borland"; - break; default: break; } @@ -123,60 +119,6 @@ QString Environment::detectQMakeSpec() return spec; } -Compiler Environment::compilerFromQMakeSpec(const QString &qmakeSpec) -{ - if (qmakeSpec == QLatin1String("win32-msvc2017")) - return CC_MSVC2017; - if (qmakeSpec == QLatin1String("win32-msvc2015")) - return CC_MSVC2015; - if (qmakeSpec == QLatin1String("win32-msvc2013")) - return CC_MSVC2013; - if (qmakeSpec == QLatin1String("win32-msvc2012")) - return CC_MSVC2012; - if (qmakeSpec == QLatin1String("win32-icc")) - return CC_INTEL; - if (qmakeSpec == QLatin1String("win32-g++")) - return CC_MINGW; - if (qmakeSpec == QLatin1String("win32-borland")) - return CC_BORLAND; - return CC_UNKNOWN; -} - -QString Environment::gccVersion() -{ - CompilerInfo *info = compilerInfo(CC_MINGW); - int returnValue = 0; - QString version = execute(QStringLiteral("%1 -dumpversion").arg(info->executable), &returnValue); - if (returnValue != 0) { - cout << "Could not get mingw version" << returnValue << qPrintable(version); - version.resize(0); - } - return version; -} - -QString Environment::msvcVersion() -{ - int returnValue = 0; - QString tempSourceName; - { // QTemporaryFile needs to go out of scope, otherwise cl.exe refuses to open it. - QTemporaryFile tempSource(QDir::tempPath() + QLatin1String("/XXXXXX.cpp")); - tempSource.setAutoRemove(false); - if (!tempSource.open()) - return QString(); - tempSource.write("_MSC_FULL_VER\n"); - tempSourceName = tempSource.fileName(); - } - QString version = execute(QLatin1String("cl /nologo /EP \"") - + QDir::toNativeSeparators(tempSourceName) + QLatin1Char('"'), - &returnValue).trimmed(); - QFile::remove(tempSourceName); - if (returnValue || version.size() < 9 || !version.at(0).isDigit()) - return QString(); - version.insert(4, QLatin1Char('.')); - version.insert(2, QLatin1Char('.')); - return version; -} - /*! Returns the enum of the compiler which was detected on the system. The compilers are detected in the order as entered into the @@ -461,189 +403,4 @@ QString Environment::execute(const QString &command, int *returnCode) return output; } -/*! - Copies the \a srcDir contents into \a destDir. - - Returns true if copying was successful. -*/ -bool Environment::cpdir(const QString &srcDir, const QString &destDir) -{ - QString cleanSrcName = QDir::cleanPath(srcDir); - QString cleanDstName = QDir::cleanPath(destDir); - -#ifdef CONFIGURE_DEBUG_CP_DIR - qDebug() << "Attempt to cpdir " << cleanSrcName << "->" << cleanDstName; -#endif - if(!QFile::exists(cleanDstName) && !QDir().mkpath(cleanDstName)) { - qDebug() << "cpdir: Failure to create " << cleanDstName; - return false; - } - - bool result = true; - QDir dir = QDir(cleanSrcName); - QFileInfoList allEntries = dir.entryInfoList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot); - for (int i = 0; result && (i < allEntries.count()); ++i) { - QFileInfo entry = allEntries.at(i); - bool intermediate = true; - if (entry.isDir()) { - intermediate = cpdir(QString("%1/%2").arg(cleanSrcName).arg(entry.fileName()), - QString("%1/%2").arg(cleanDstName).arg(entry.fileName())); - } else { - QString destFile = QString("%1/%2").arg(cleanDstName).arg(entry.fileName()); -#ifdef CONFIGURE_DEBUG_CP_DIR - qDebug() << "About to cp (file)" << entry.absoluteFilePath() << "->" << destFile; -#endif - QFile::remove(destFile); - intermediate = QFile::copy(entry.absoluteFilePath(), destFile); - SetFileAttributes((wchar_t*)destFile.utf16(), FILE_ATTRIBUTE_NORMAL); - } - if (!intermediate) { - qDebug() << "cpdir: Failure for " << entry.fileName() << entry.isDir(); - result = false; - } - } - return result; -} - -bool Environment::rmdir(const QString &name) -{ - bool result = true; - QString cleanName = QDir::cleanPath(name); - - QDir dir = QDir(cleanName); - QFileInfoList allEntries = dir.entryInfoList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot); - for (int i = 0; result && (i < allEntries.count()); ++i) { - QFileInfo entry = allEntries.at(i); - if (entry.isDir()) { - result &= rmdir(entry.absoluteFilePath()); - } else { - result &= QFile::remove(entry.absoluteFilePath()); - } - } - result &= dir.rmdir(cleanName); - return result; -} - -static QStringList splitPathList(const QString &path) -{ -#if defined(Q_OS_WIN) - QRegExp splitReg(QStringLiteral("[;,]")); -#else - QRegExp splitReg(QStringLiteral("[:]")); -#endif - QStringList result = path.split(splitReg, QString::SkipEmptyParts); - const QStringList::iterator end = result.end(); - for (QStringList::iterator it = result.begin(); it != end; ++it) { - // Remove any leading or trailing ", this is commonly used in the environment - // variables - if (it->startsWith('"')) - it->remove(0, 1); - if (it->endsWith('"')) - it->chop(1); - *it = QDir::cleanPath(*it); - if (it->endsWith(QLatin1Char('/'))) - it->chop(1); - } - return result; -} - -QString Environment::findFileInPaths(const QString &fileName, const QStringList &paths) -{ - if (!paths.isEmpty()) { - QDir d; - const QChar separator = QDir::separator(); - foreach (const QString &path, paths) - if (d.exists(path + separator + fileName)) - return path; - } - return QString(); -} - -QStringList Environment::path() -{ - return splitPathList(QString::fromLocal8Bit(qgetenv("PATH"))); -} - -static QStringList mingwPaths(const QString &mingwPath, const QString &pathName) -{ - QStringList ret; - QDir mingwDir(mingwPath); - const QFileInfoList subdirs = mingwDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); - for (int i = 0 ;i < subdirs.length(); ++i) { - const QFileInfo &fi = subdirs.at(i); - const QString name = fi.fileName(); - if (name == pathName) - ret += fi.absoluteFilePath(); - else if (name.contains(QLatin1String("mingw"))) { - ret += fi.absoluteFilePath() + QLatin1Char('/') + pathName; - } - } - return ret; -} - -// Return MinGW location from "c:\mingw\bin" -> "c:\mingw" -static inline QString detectMinGW() -{ - const QString gcc = QStandardPaths::findExecutable(QLatin1String("g++.exe")); - return gcc.isEmpty() ? - gcc : QFileInfo(QFileInfo(gcc).absolutePath()).absolutePath(); -} - -// Detect Direct X SDK up tp June 2010. Included in Windows Kit 8. -QString Environment::detectDirectXSdk() -{ - const QByteArray directXSdkEnv = qgetenv("DXSDK_DIR"); - if (directXSdkEnv.isEmpty()) - return QString(); - QString directXSdk = QDir::cleanPath(QString::fromLocal8Bit(directXSdkEnv)); - if (directXSdk.endsWith(QLatin1Char('/'))) - directXSdk.truncate(directXSdk.size() - 1); - return directXSdk; -} - -QStringList Environment::headerPaths(Compiler compiler) -{ - QStringList headerPaths; - if (compiler == CC_MINGW) { - const QString mingwPath = detectMinGW(); - headerPaths = mingwPaths(mingwPath, QLatin1String("include")); - // Additional compiler paths - const QFileInfoList mingwConfigs = QDir(mingwPath + QLatin1String("/lib/gcc")).entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); - for (int i = 0; i < mingwConfigs.length(); ++i) { - const QDir mingwLibDir = mingwConfigs.at(i).absoluteFilePath(); - foreach (const QFileInfo &version, mingwLibDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot)) - headerPaths += version.absoluteFilePath() + QLatin1String("/include"); - } - } else { - headerPaths = splitPathList(QString::fromLocal8Bit(getenv("INCLUDE"))); - } - - // Add Direct X SDK for ANGLE - const QString directXSdk = detectDirectXSdk(); - if (!directXSdk.isEmpty()) // Add Direct X SDK for ANGLE - headerPaths += directXSdk + QLatin1String("/include"); - return headerPaths; -} - -QStringList Environment::libraryPaths(Compiler compiler) -{ - QStringList libraryPaths; - if (compiler == CC_MINGW) { - libraryPaths = mingwPaths(detectMinGW(), "lib"); - } else { - libraryPaths = splitPathList(QString::fromLocal8Bit(qgetenv("LIB"))); - } - - // Add Direct X SDK for ANGLE - const QString directXSdk = detectDirectXSdk(); - if (!directXSdk.isEmpty()) { -#ifdef Q_OS_WIN64 - libraryPaths += directXSdk + QLatin1String("/lib/x64"); -#else - libraryPaths += directXSdk + QLatin1String("/lib/x86"); -#endif - } - return libraryPaths; -} - QT_END_NAMESPACE diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 04b42f45ff..aa8e7fd8bc 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -33,7 +33,6 @@ QT_BEGIN_NAMESPACE enum Compiler { CC_UNKNOWN = 0, - CC_BORLAND = 0x01, CC_MINGW = 0x02, CC_INTEL = 0x03, CC_MSVC2005 = 0x80, @@ -51,21 +50,9 @@ class Environment public: static Compiler detectCompiler(); static QString detectQMakeSpec(); - static Compiler compilerFromQMakeSpec(const QString &qmakeSpec); - static QString gccVersion(); - static QString msvcVersion(); static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv); static QString execute(const QString &command, int *returnCode = 0); - static bool cpdir(const QString &srcDir, const QString &destDir); - static bool rmdir(const QString &name); - - static QString findFileInPaths(const QString &fileName, const QStringList &paths); - static QStringList path(); - - static QString detectDirectXSdk(); - static QStringList headerPaths(Compiler compiler); - static QStringList libraryPaths(Compiler compiler); private: static Compiler detectedCompiler; diff --git a/tools/configure/main.cpp b/tools/configure/main.cpp index d4f654150e..91a99c16c2 100644 --- a/tools/configure/main.cpp +++ b/tools/configure/main.cpp @@ -42,11 +42,8 @@ int runConfigure( int argc, char** argv ) return 3; app.parseCmdLine(); - app.validateArgs(); if (!app.isOk()) return 3; - if( app.displayHelp() ) - return 1; // Read license now, and exit if it doesn't pass. // This lets the user see the command-line options of configure @@ -78,32 +75,11 @@ int runConfigure( int argc, char** argv ) if (!app.isOk()) return 3; - // Auto-detect modules and settings. - app.autoDetection(); - - // After reading all command-line arguments, and doing all the - // auto-detection, it's time to do some last minute validation. - // If the validation fails, we cannot continue. - if (!app.verifyConfiguration()) + // run qmake based configure + app.configure(); + if (!app.isOk()) return 3; - app.generateOutputVars(); - - if( !app.isDone() ) - app.generateCachefile(); - if( !app.isDone() ) - app.generateConfigfiles(); - if (!app.isDone()) - app.generateQConfigPri(); - if (!app.isDone()) - app.displayConfig(); - if( !app.isDone() ) - app.generateMakefiles(); - if( !app.isDone() ) - app.showSummary(); - if( !app.isOk() ) - return 2; - return 0; } |