diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-08-11 14:16:08 (GMT) |
---|---|---|
committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-08-11 14:16:08 (GMT) |
commit | ba4128383be023bef949dbacf568af08d7f884ea (patch) | |
tree | 0825ed063398db41a03c76d900a6786a698e1e20 /tools/configure | |
parent | 73a86eaf8136959cbac60af540ee8faadf454015 (diff) | |
download | Qt-ba4128383be023bef949dbacf568af08d7f884ea.zip Qt-ba4128383be023bef949dbacf568af08d7f884ea.tar.gz Qt-ba4128383be023bef949dbacf568af08d7f884ea.tar.bz2 |
Add -script/-no-script option to configure.exe as well
The options were added to the configure script (Unix/Mac) already,
so bring Windows configure in sync.
Diffstat (limited to 'tools/configure')
-rw-r--r-- | tools/configure/configureapp.cpp | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f32e7dc..9f6d0e0 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -241,6 +241,7 @@ Configure::Configure( int& argc, char** argv ) dictionary[ "CE_CRT" ] = "no"; dictionary[ "CETEST" ] = "auto"; dictionary[ "CE_SIGNATURE" ] = "no"; + dictionary[ "SCRIPT" ] = "yes"; dictionary[ "SCRIPTTOOLS" ] = "yes"; dictionary[ "XMLPATTERNS" ] = "auto"; dictionary[ "PHONON" ] = "auto"; @@ -836,6 +837,10 @@ void Configure::parseCmdLine() dictionary[ "DBUS" ] = "yes"; } else if( configCmdLine.at(i) == "-dbus-linked" ) { dictionary[ "DBUS" ] = "linked"; + } else if( configCmdLine.at(i) == "-no-script" ) { + dictionary[ "SCRIPT" ] = "no"; + } else if( configCmdLine.at(i) == "-script" ) { + dictionary[ "SCRIPT" ] = "yes"; } else if( configCmdLine.at(i) == "-no-scripttools" ) { dictionary[ "SCRIPTTOOLS" ] = "no"; } else if( configCmdLine.at(i) == "-scripttools" ) { @@ -1430,9 +1435,8 @@ bool Configure::displayHelp() "[-no-openssl] [-no-dbus] [-dbus] [-dbus-linked] [-platform <spec>]\n" "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n" "[-phonon] [-no-phonon-backend] [-phonon-backend]\n" - "[-no-multimedia] [-multimedia]\n" - "[-no-webkit] [-webkit]\n" - "[-no-scripttools] [-scripttools]\n" + "[-no-multimedia] [-multimedia] [-no-webkit] [-webkit]\n" + "[-no-script] [-script] [-no-scripttools] [-scripttools]\n" "[-graphicssystem raster|opengl]\n\n", 0, 7); desc("Installation options:\n\n"); @@ -1609,6 +1613,8 @@ bool Configure::displayHelp() desc("MULTIMEDIA", "yes","-multimedia", "Compile in multimedia module"); desc("WEBKIT", "no", "-no-webkit", "Do not compile in the WebKit module"); desc("WEBKIT", "yes", "-webkit", "Compile in the WebKit module (WebKit is built if a decent C++ compiler is used.)"); + desc("SCRIPT", "no", "-no-script", "Do not build the QtScript module."); + desc("SCRIPT", "yes", "-script", "Build the QtScript module."); desc("SCRIPTTOOLS", "no", "-no-scripttools", "Do not build the QtScriptTools module."); desc("SCRIPTTOOLS", "yes", "-scripttools", "Build the QtScriptTools module."); @@ -1879,7 +1885,7 @@ bool Configure::checkAvailability(const QString &part) available = true; } else if (part == "WEBKIT") { available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++"); - } else if (part == "SCRIPTTOOLS") { + } else if (part == "SCRIPT" || part == "SCRIPTTOOLS") { available = true; } @@ -1957,6 +1963,8 @@ void Configure::autoDetection() dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no"; if (dictionary["DBUS"] == "auto") dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no"; + if (dictionary["SCRIPT"] == "auto") + dictionary["SCRIPT"] = checkAvailability("SCRIPT") ? "yes" : "no"; if (dictionary["SCRIPTTOOLS"] == "auto") dictionary["SCRIPTTOOLS"] = checkAvailability("SCRIPTTOOLS") ? "yes" : "no"; if (dictionary["XMLPATTERNS"] == "auto") @@ -2300,8 +2308,17 @@ void Configure::generateOutputVars() if (dictionary[ "CETEST" ] == "yes") qtConfig += "cetest"; - if (dictionary[ "SCRIPTTOOLS" ] == "yes") + if (dictionary[ "SCRIPT" ] == "yes") + qtConfig += "script"; + + if (dictionary[ "SCRIPTTOOLS" ] == "yes") { + if (dictionary[ "SCRIPT" ] == "no") { + cout << "QtScriptTools was requested, but it can't be built due to QtScript being " + "disabled." << endl; + dictionary[ "DONE" ] = "error"; + } qtConfig += "scripttools"; + } if (dictionary[ "XMLPATTERNS" ] == "yes") qtConfig += "xmlpatterns"; @@ -2677,6 +2694,7 @@ void Configure::generateConfigfiles() if(dictionary["PHONON"] == "no") qconfigList += "QT_NO_PHONON"; if(dictionary["MULTIMEDIA"] == "no") qconfigList += "QT_NO_MULTIMEDIA"; if(dictionary["XMLPATTERNS"] == "no") qconfigList += "QT_NO_XMLPATTERNS"; + if(dictionary["SCRIPT"] == "no") qconfigList += "QT_NO_SCRIPT"; if(dictionary["SCRIPTTOOLS"] == "no") qconfigList += "QT_NO_SCRIPTTOOLS"; if(dictionary["OPENGL_ES_CM"] == "yes" || @@ -2936,6 +2954,7 @@ void Configure::displayConfig() cout << "Phonon support.............." << dictionary[ "PHONON" ] << endl; cout << "Multimedia support.........." << dictionary[ "MULTIMEDIA" ] << endl; cout << "WebKit support.............." << dictionary[ "WEBKIT" ] << endl; + cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl; cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl; cout << "Graphics System............." << dictionary[ "GRAPHICS_SYSTEM" ] << endl; cout << "Qt3 compatibility..........." << dictionary[ "QT3SUPPORT" ] << endl << endl; |