From e2765098db18a7570b04fe3e30ded728aa97120a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Jun 2013 16:23:24 +0200 Subject: don't claim that we need perl for shadow builds any more amends 0a1b89bff, which took care only of the unix version. Change-Id: Idb82881a9c47e67c973500721fd499bcf41a848b Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 98b59ab6fd..f92fad1d69 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -151,12 +151,6 @@ Configure::Configure(int& argc, char** argv) const QString installPath = buildPath; #endif if (sourceDir != buildDir) { //shadow builds! - if (QStandardPaths::findExecutable(QStringLiteral("perl.exe")).isEmpty()) { - cout << "Error: Creating a shadow build of Qt requires" << endl - << "perl to be in the PATH environment"; - exit(0); // Exit cleanly for Ctrl+C - } - cout << "Preparing build tree..." << endl; QDir(buildPath).mkpath("bin"); -- cgit v1.2.3 From 65b749f5ea056261a8c29866cee38b17a52a8556 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Jun 2013 11:00:19 +0200 Subject: don't try to not build non-existing parts Change-Id: I20896f15f7ab91aac8a9b6977fd3a253bc0e187d Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index f92fad1d69..50e491f20c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1570,8 +1570,8 @@ void Configure::desc(const char *mark_option, const char *mark, const char *opti void Configure::applySpecSpecifics() { if (dictionary.contains("XQMAKESPEC")) { - //Disable building tools, docs and translations when cross compiling. - nobuildParts << "docs" << "translations" << "tools"; + //Disable building tools when cross compiling. + nobuildParts << "tools"; } if (dictionary.value("XQMAKESPEC").startsWith("wince")) { -- cgit v1.2.3 From 1aaeb9538b8f001cee80eef75a15176e0d3910ed Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Jun 2013 11:21:40 +0200 Subject: complain about bad arguments to -make/-nomake Task-number: QTBUG-5366 Change-Id: I461a6c85fcee4a0216571d294171652b05ee6a34 Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 16 ++++++++++++++-- tools/configure/configureapp.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 50e491f20c..0ac3730b4e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -171,6 +171,8 @@ Configure::Configure(int& argc, char** argv) } defaultBuildParts << QStringLiteral("libs") << QStringLiteral("tools") << QStringLiteral("examples"); + allBuildParts = defaultBuildParts; + allBuildParts << QStringLiteral("tests"); dictionary[ "QT_SOURCE_TREE" ] = sourcePath; dictionary[ "QT_BUILD_TREE" ] = buildPath; dictionary[ "QT_INSTALL_PREFIX" ] = installPath; @@ -1001,12 +1003,22 @@ void Configure::parseCmdLine() ++i; if (i == argCount) break; - buildParts += configCmdLine.at(i); + 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; - nobuildParts.append(configCmdLine.at(i)); + 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") { diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 3014e409f9..8f95e1fb95 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -104,6 +104,7 @@ private: // Our variable dictionaries QMap dictionary; + QStringList allBuildParts; QStringList defaultBuildParts; QStringList buildParts; QStringList nobuildParts; -- cgit v1.2.3