AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Determine MSVC version by evaluating macro _MSC_FULL_VER

Browse Source 
The previously used regular expression failed for messages
in local languages, particularly for the French message containing
a non-breaking space.

Task-number: QTBUG-56388
Change-Id: Ie757617f1b3a31820d0ed274c4b157d544ac1ea6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Friedemann Kleint 2016-10-27 12:51:43 +02:00
parent 456f0e0f1a
commit 1bd53131d8
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/configure/environment.cpp
View File

@ -40,6 +40,7 @@
#include <qfile.h>
#include <qfileinfo.h>
#include <qstandardpaths.h>
#include <qtemporaryfile.h>
#include <process.h>
#include <errno.h>
@ -172,25 +173,23 @@ QString Environment::gccVersion()
QString Environment::msvcVersion()
{
int returnValue = 0;
// Extract version from standard error output of "cl /?"
const QString command = QFile::decodeName(qgetenv("ComSpec"))
+ QLatin1String(" /c ") + QLatin1String(compilerInfo(CC_MSVC2015)->executable)
+ QLatin1String(" /? 2>&1");
SetEnvironmentVariable(L"CL", NULL); // May contain /nologo, which suppresses the version.
QString version = execute(command, &returnValue);
if (returnValue != 0) {
cout << "Could not get cl version" << returnValue << qPrintable(version) << '\n';;
version.clear();
} else {
QRegExp versionRegexp(QStringLiteral("^.*\\b(\\d{2,2}\\.\\d{2,2}\\.\\d{5,5})\\b.*$"));
Q_ASSERT(versionRegexp.isValid());
if (versionRegexp.exactMatch(version)) {
version = versionRegexp.cap(1);
} else {
cout << "Unable to determine cl version from the output of \""
<< qPrintable(command) << "\"\n";
}
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;
}