feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
110f8491c902e2a656f957ea60a7841c6778d729
qt-creator/src/plugins/qmakeprojectmanager/makefileparse.cpp

529 lines
23 KiB
C++
Raw Normal View History

Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
/****************************************************************************
**
Update License according to agreement with Free Qt Foundation * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-15 14:57:40 +01:00
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
Update License according to agreement with Free Qt Foundation * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-15 14:57:40 +01:00
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
**
Update License according to agreement with Free Qt Foundation * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-15 14:57:40 +01:00
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
**
****************************************************************************/
#include "makefileparse.h"
#include <qtsupport/qtversionmanager.h>
#include <qtsupport/baseqtversion.h>
#include <utils/qtcprocess.h>
#include <QDebug>
#include <QDir>
#include <QFileInfo>
QRegExp include cleanup This patch adds the missing include statements for QRegExp. Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-09 23:02:32 +01:00
#include <QRegExp>
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
#include <QTextStream>
#include <QLoggingCategory>
using namespace QmakeProjectManager;
using namespace Internal;
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
using Utils::FilePath;
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
using Utils::QtcProcess;
using QtSupport::QtVersionManager;
using QtSupport::BaseQtVersion;
static QString findQMakeLine(const QString &makefile, const QString &key)
{
QFile fi(makefile);
if (fi.exists() && fi.open(QFile::ReadOnly)) {
QTextStream ts(&fi);
while (!ts.atEnd()) {
const QString line = ts.readLine();
if (line.startsWith(key))
return line;
}
}
return QString();
}
/// This function trims the "#Command /path/to/qmake" from the line
static QString trimLine(const QString &line)
{
// Actually the first space after #Command: /path/to/qmake
const int firstSpace = line.indexOf(QLatin1Char(' '), 11);
return line.mid(firstSpace).trimmed();
}
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
void MakeFileParse::parseArgs(const QString &args, const QString &project,
QList<QMakeAssignment> *assignments,
QList<QMakeAssignment> *afterAssignments)
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
{
QRegExp regExp(QLatin1String("([^\\s\\+-]*)\\s*(\\+=|=|-=|~=)(.*)"));
bool after = false;
bool ignoreNext = false;
m_unparsedArguments = args;
QtcProcess::ArgIterator ait(&m_unparsedArguments);
while (ait.next()) {
if (ignoreNext) {
// Ignoring
ignoreNext = false;
ait.deleteArg();
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
} else if (ait.value() == project) {
ait.deleteArg();
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
} else if (ait.value() == QLatin1String("-after")) {
after = true;
ait.deleteArg();
} else if (ait.value().contains(QLatin1Char('='))) {
if (regExp.exactMatch(ait.value())) {
QMakeAssignment qa;
qa.variable = regExp.cap(1);
qa.op = regExp.cap(2);
qa.value = regExp.cap(3).trimmed();
if (after)
afterAssignments->append(qa);
else
assignments->append(qa);
} else {
qDebug()<<"regexp did not match";
}
ait.deleteArg();
} else if (ait.value() == QLatin1String("-o")) {
ignoreNext = true;
ait.deleteArg();
#if defined(Q_OS_WIN32)
} else if (ait.value() == QLatin1String("-win32")) {
#elif defined(Q_OS_MAC)
} else if (ait.value() == QLatin1String("-macx")) {
#elif defined(Q_OS_QNX6)
} else if (ait.value() == QLatin1String("-qnx6")) {
#else
} else if (ait.value() == QLatin1String("-unix")) {
#endif
ait.deleteArg();
}
}
}
void dumpQMakeAssignments(const QList<QMakeAssignment> &list)
{
foreach (const QMakeAssignment &qa, list) {
qCDebug(MakeFileParse::logging()) << " " << qa.variable << qa.op << qa.value;
}
}
void MakeFileParse::parseAssignments(QList<QMakeAssignment> *assignments)
{
bool foundSeparateDebugInfo = false;
bool foundForceDebugInfo = false;
QList<QMakeAssignment> oldAssignments = *assignments;
assignments->clear();
foreach (const QMakeAssignment &qa, oldAssignments) {
if (qa.variable == QLatin1String("CONFIG")) {
QStringList values = qa.value.split(QLatin1Char(' '));
QStringList newValues;
foreach (const QString &value, values) {
if (value == QLatin1String("debug")) {
if (qa.op == QLatin1String("+=")) {
m_qmakeBuildConfig.explicitDebug = true;
m_qmakeBuildConfig.explicitRelease = false;
} else {
m_qmakeBuildConfig.explicitDebug = false;
m_qmakeBuildConfig.explicitRelease = true;
}
} else if (value == QLatin1String("release")) {
if (qa.op == QLatin1String("+=")) {
m_qmakeBuildConfig.explicitDebug = false;
m_qmakeBuildConfig.explicitRelease = true;
} else {
m_qmakeBuildConfig.explicitDebug = true;
m_qmakeBuildConfig.explicitRelease = false;
}
} else if (value == QLatin1String("debug_and_release")) {
if (qa.op == QLatin1String("+=")) {
m_qmakeBuildConfig.explicitBuildAll = true;
m_qmakeBuildConfig.explicitNoBuildAll = false;
} else {
m_qmakeBuildConfig.explicitBuildAll = false;
m_qmakeBuildConfig.explicitNoBuildAll = true;
}
} else if (value == QLatin1String("x86")) {
if (qa.op == QLatin1String("+="))
m_config.archConfig = QMakeStepConfig::X86;
else
m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("x86_64")) {
if (qa.op == QLatin1String("+="))
m_config.archConfig = QMakeStepConfig::X86_64;
else
m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("ppc")) {
if (qa.op == QLatin1String("+="))
Fix build on PPC: PPC is defined to 1 $ powerpc-poky-linux-gcc -dM -E -xc /dev/null | grep -i PPC #define _ARCH_PPC 1 #define __PPC__ 1 #define __PPC 1 #define PPC 1 Not on PPC64, though (only __PPC__ and __PPC64__ are defined). Change-Id: Ib57b52598e2f452985e9fffd145812f5098e441d Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 15:14:04 -07:00
m_config.archConfig = QMakeStepConfig::PowerPC;
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
else
m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("ppc64")) {
if (qa.op == QLatin1String("+="))
Fix build on PPC: PPC is defined to 1 $ powerpc-poky-linux-gcc -dM -E -xc /dev/null | grep -i PPC #define _ARCH_PPC 1 #define __PPC__ 1 #define __PPC 1 #define PPC 1 Not on PPC64, though (only __PPC__ and __PPC64__ are defined). Change-Id: Ib57b52598e2f452985e9fffd145812f5098e441d Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-14 15:14:04 -07:00
m_config.archConfig = QMakeStepConfig::PowerPC64;
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
else
m_config.archConfig = QMakeStepConfig::NoArch;
} else if (value == QLatin1String("iphonesimulator")) {
if (qa.op == QLatin1String("+="))
m_config.osType = QMakeStepConfig::IphoneSimulator;
else
m_config.osType = QMakeStepConfig::NoOsType;
} else if (value == QLatin1String("iphoneos")) {
if (qa.op == QLatin1String("+="))
m_config.osType = QMakeStepConfig::IphoneOS;
else
m_config.osType = QMakeStepConfig::NoOsType;
} else if (value == QLatin1String("qml_debug")) {
if (qa.op == QLatin1String("+="))
m_config.linkQmlDebuggingQQ2 = true;
else
m_config.linkQmlDebuggingQQ2 = false;
} else if (value == QLatin1String("qtquickcompiler")) {
if (qa.op == QLatin1String("+="))
m_config.useQtQuickCompiler = true;
else
m_config.useQtQuickCompiler = false;
} else if (value == QLatin1String("force_debug_info")) {
if (qa.op == QLatin1String("+="))
foundForceDebugInfo = true;
else
foundForceDebugInfo = false;
} else if (value == QLatin1String("separate_debug_info")) {
if (qa.op == QLatin1String("+="))
foundSeparateDebugInfo = true;
else
foundSeparateDebugInfo = false;
} else {
newValues.append(value);
}
Qmake: Do not turn a CONFIG variable with spaces into several When e.g. examining 'CONFIG+=foo bar' Creator would turn that into CONFIG+=foo and 'CONFIG+=foo bar', which seems wrong to me. Task-number: QTCREATORBUG-16492 Change-Id: I37b83f1e8415d421abb2df7a9466651bff502d17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-24 10:35:23 +02:00
}
if (!newValues.isEmpty()) {
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
QMakeAssignment newQA = qa;
newQA.value = newValues.join(QLatin1Char(' '));
Qmake: Do not turn a CONFIG variable with spaces into several When e.g. examining 'CONFIG+=foo bar' Creator would turn that into CONFIG+=foo and 'CONFIG+=foo bar', which seems wrong to me. Task-number: QTCREATORBUG-16492 Change-Id: I37b83f1e8415d421abb2df7a9466651bff502d17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-24 10:35:23 +02:00
assignments->append(newQA);
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
}
} else {
assignments->append(qa);
}
}
if (foundForceDebugInfo && foundSeparateDebugInfo) {
m_config.separateDebugInfo = true;
} else if (foundForceDebugInfo) {
// Found only force_debug_info, so readd it
QMakeAssignment newQA;
newQA.variable = QLatin1String("CONFIG");
newQA.op = QLatin1String("+=");
newQA.value = QLatin1String("force_debug_info");
assignments->append(newQA);
} else if (foundSeparateDebugInfo) {
// Found only separate_debug_info, so readd it
QMakeAssignment newQA;
newQA.variable = QLatin1String("CONFIG");
newQA.op = QLatin1String("+=");
newQA.value = QLatin1String("separate_debug_info");
assignments->append(newQA);
}
}
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
static FilePath findQMakeBinaryFromMakefile(const QString &makefile)
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
{
QFile fi(makefile);
if (fi.exists() && fi.open(QFile::ReadOnly)) {
QTextStream ts(&fi);
QRegExp r1(QLatin1String("QMAKE\\s*=(.*)"));
while (!ts.atEnd()) {
QString line = ts.readLine();
if (r1.exactMatch(line)) {
QFileInfo qmake(r1.cap(1).trimmed());
QString qmakePath = qmake.filePath();
if (!QString::fromLatin1(QTC_HOST_EXE_SUFFIX).isEmpty()
&& !qmakePath.endsWith(QLatin1String(QTC_HOST_EXE_SUFFIX))) {
qmakePath.append(QLatin1String(QTC_HOST_EXE_SUFFIX));
}
// Is qmake still installed?
QFileInfo fi(qmakePath);
if (fi.exists())
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
return FilePath::fromFileInfo(fi);
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
}
}
}
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
return FilePath();
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
}
MakeFileParse::MakeFileParse(const QString &makefile)
{
qCDebug(logging()) << "Parsing makefile" << makefile;
if (!QFileInfo::exists(makefile)) {
qCDebug(logging()) << "**doesn't exist";
m_state = MakefileMissing;
return;
}
// Qt Version!
m_qmakePath = findQMakeBinaryFromMakefile(makefile);
qCDebug(logging()) << " qmake:" << m_qmakePath;
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
QString project = findQMakeLine(makefile, QLatin1String("# Project:")).trimmed();
if (project.isEmpty()) {
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
m_state = CouldNotParse;
qCDebug(logging()) << "**No Project line";
return;
}
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
project.remove(0, project.indexOf(QLatin1Char(':')) + 1);
project = project.trimmed();
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
// Src Pro file
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
m_srcProFile = QDir::cleanPath(QFileInfo(makefile).absoluteDir().filePath(project));
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
qCDebug(logging()) << " source .pro file:" << m_srcProFile;
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
QString command = findQMakeLine(makefile, QLatin1String("# Command:")).trimmed();
if (command.isEmpty()) {
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
m_state = CouldNotParse;
qCDebug(logging()) << "**No Command line found";
return;
}
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
command = trimLine(command);
parseCommandLine(command, project);
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
m_state = Okay;
}
MakeFileParse::MakefileState MakeFileParse::makeFileState() const
{
return m_state;
}
Utils: Rename FileName to FilePath More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-05-28 13:49:26 +02:00
Utils::FilePath MakeFileParse::qmakePath() const
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
{
return m_qmakePath;
}
QString MakeFileParse::srcProFile() const
{
return m_srcProFile;
}
QMakeStepConfig MakeFileParse::config() const
{
return m_config;
}
QString MakeFileParse::unparsedArguments() const
{
return m_unparsedArguments;
}
BaseQtVersion::QmakeBuildConfigs MakeFileParse::effectiveBuildConfig(BaseQtVersion::QmakeBuildConfigs defaultBuildConfig) const
{
BaseQtVersion::QmakeBuildConfigs buildConfig = defaultBuildConfig;
if (m_qmakeBuildConfig.explicitDebug)
QmakeProjectManager: Don't rerun qmake for debug builds With a release Qt build. Wrong bit fiddeling. Task-number: QTCREATORBUG-14129 Change-Id: I7021ff74c9936e6007eec863e4ebfd948e6dbe90 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 14:39:39 +01:00
buildConfig = buildConfig | BaseQtVersion::DebugBuild;
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
else if (m_qmakeBuildConfig.explicitRelease)
buildConfig = buildConfig & ~BaseQtVersion::DebugBuild;
if (m_qmakeBuildConfig.explicitBuildAll)
QmakeProjectManager: Don't rerun qmake for debug builds With a release Qt build. Wrong bit fiddeling. Task-number: QTCREATORBUG-14129 Change-Id: I7021ff74c9936e6007eec863e4ebfd948e6dbe90 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-12 14:39:39 +01:00
buildConfig = buildConfig | BaseQtVersion::BuildAll;
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
else if (m_qmakeBuildConfig.explicitNoBuildAll)
buildConfig = buildConfig &~ BaseQtVersion::BuildAll;
return buildConfig;
}
const QLoggingCategory &MakeFileParse::logging()
{
Remove hard-coded disabling of debug logs Instead, set the default level of all logs to QtWarningMsg. The call to setFilterRules overrides the user preferences in qtlogging.ini. Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: hjk <hjk@qt.io>
2018-10-12 09:33:30 +03:00
static const QLoggingCategory category("qtc.qmakeprojectmanager.import", QtWarningMsg);
Fix importing creating additional kits on OS X Extract the whole makefile parsing code into a separate class, to make the code more manageable. Also fix some bugs on importing additional flags like qt quick compiler or separate debug info. Task-number: QTCREATORBUG-13947 Change-Id: Id04bff191c188f95230274d990b1676e9b2f419d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-04 17:14:28 +01:00
return category;
}
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
void MakeFileParse::parseCommandLine(const QString &command, const QString &project)
Qmake: Add tests for MakefileParser Change-Id: I6206faad1e98f0867aba67b05b64916deb77b9f8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 13:03:00 +02:00
{
QList<QMakeAssignment> assignments;
QList<QMakeAssignment> afterAssignments;
// Split up args into assignments and other arguments, writes m_unparsedArguments
Qmake: Fix Makefile tests Task-number: QTCREATORBUG-16981 Change-Id: Ia8cc0f84e3dab2d5eeeb634bb76403b5a84ef563 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 15:11:10 +02:00
parseArgs(command, project, &assignments, &afterAssignments);
Qmake: Add tests for MakefileParser Change-Id: I6206faad1e98f0867aba67b05b64916deb77b9f8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 13:03:00 +02:00
qCDebug(logging()) << " Initial assignments:";
dumpQMakeAssignments(assignments);
// Filter out CONFIG arguments we know into m_qmakeBuildConfig and m_config
parseAssignments(&assignments);
qCDebug(logging()) << " After parsing";
dumpQMakeAssignments(assignments);
qCDebug(logging()) << " Explicit Debug" << m_qmakeBuildConfig.explicitDebug;
qCDebug(logging()) << " Explicit Release" << m_qmakeBuildConfig.explicitRelease;
qCDebug(logging()) << " Explicit BuildAll" << m_qmakeBuildConfig.explicitBuildAll;
qCDebug(logging()) << " Explicit NoBuildAll" << m_qmakeBuildConfig.explicitNoBuildAll;
qCDebug(logging()) << " TargetArch" << m_config.archConfig;
qCDebug(logging()) << " OsType" << m_config.osType;
qCDebug(logging()) << " LinkQmlDebuggingQQ2" << m_config.linkQmlDebuggingQQ2;
qCDebug(logging()) << " Qt Quick Compiler" << m_config.useQtQuickCompiler;
qCDebug(logging()) << " Separate Debug Info" << m_config.separateDebugInfo;
// Create command line of all unfiltered arguments
foreach (const QMakeAssignment &qa, assignments)
QtcProcess::addArg(&m_unparsedArguments, qa.variable + qa.op + qa.value);
if (!afterAssignments.isEmpty()) {
QtcProcess::addArg(&m_unparsedArguments, QLatin1String("-after"));
foreach (const QMakeAssignment &qa, afterAssignments)
QtcProcess::addArg(&m_unparsedArguments, qa.variable + qa.op + qa.value);
}
}
// Unit tests:
#ifdef WITH_TESTS
# include <QTest>
# include "qmakeprojectmanagerplugin.h"
# include "projectexplorer/outputparser_test.h"
using namespace QmakeProjectManager::Internal;
using namespace ProjectExplorer;
void QmakeProjectManagerPlugin::testMakefileParser_data()
{
QTest::addColumn<QString>("command");
QTest::addColumn<QString>("project");
QTest::addColumn<QString>("unparsedArguments");
QTest::addColumn<int>("archConfig");
QTest::addColumn<int>("osType");
QTest::addColumn<bool>("linkQmlDebuggingQQ2");
QTest::addColumn<bool>("useQtQuickCompiler");
QTest::addColumn<bool>("separateDebugInfo");
QTest::addColumn<int>("effectiveBuildConfig");
QTest::newRow("Qt 5.7")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra1")
<< QString::fromLatin1("SOMETHING=ELSE -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra2")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra3")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug SOMETHING=ELSE CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra4")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug SOMETHING=ELSE -o Makefile ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra5")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile SOMETHING=ELSE ../untitled7/untitled7.pro")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.7 extra6")
<< QString::fromLatin1("-spec linux-g++ CONFIG+=debug CONFIG+=qml_debug -o Makefile ../untitled7/untitled7.pro SOMETHING=ELSE")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra1")
<< QString::fromLatin1("SOMETHING=ELSE -o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra2")
<< QString::fromLatin1("-o Makefile SOMETHING=ELSE ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra3")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro SOMETHING=ELSE -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra4")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ SOMETHING=ELSE CONFIG+=debug CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra5")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug SOMETHING=ELSE CONFIG+=qml_debug")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
QTest::newRow("Qt 5.8 extra6")
<< QString::fromLatin1("-o Makefile ../untitled7/untitled7.pro -spec linux-g++ CONFIG+=debug CONFIG+=qml_debug SOMETHING=ELSE")
<< QString::fromLatin1("../untitled7/untitled7.pro")
<< QString::fromLatin1("-spec linux-g++ SOMETHING=ELSE")
<< static_cast<int>(QMakeStepConfig::NoArch) << static_cast<int>(QMakeStepConfig::NoOsType)
<< true << false << false << 2;
}
void QmakeProjectManagerPlugin::testMakefileParser()
{
QFETCH(QString, command);
QFETCH(QString, project);
QFETCH(QString, unparsedArguments);
QFETCH(int, archConfig);
QFETCH(int, osType);
QFETCH(bool, linkQmlDebuggingQQ2);
QFETCH(bool, useQtQuickCompiler);
QFETCH(bool, separateDebugInfo);
QFETCH(int, effectiveBuildConfig);
MakeFileParse parser("/tmp/something");
parser.parseCommandLine(command, project);
QCOMPARE(Utils::QtcProcess::splitArgs(parser.unparsedArguments()),
Utils::QtcProcess::splitArgs(unparsedArguments));
QmakeProjectManager: Modernize modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-equals-default Change-Id: I7642992eee6838bb2566921de87390c1771ebcbe Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-12 23:59:51 +02:00
QCOMPARE(parser.effectiveBuildConfig(nullptr), effectiveBuildConfig);
Qmake: Add tests for MakefileParser Change-Id: I6206faad1e98f0867aba67b05b64916deb77b9f8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-07 13:03:00 +02:00
const QMakeStepConfig qmsc = parser.config();
QCOMPARE(qmsc.archConfig, static_cast<QMakeStepConfig::TargetArchConfig>(archConfig));
QCOMPARE(qmsc.osType, static_cast<QMakeStepConfig::OsType>(osType));
QCOMPARE(qmsc.linkQmlDebuggingQQ2, linkQmlDebuggingQQ2);
QCOMPARE(qmsc.useQtQuickCompiler, useQtQuickCompiler);
QCOMPARE(qmsc.separateDebugInfo, separateDebugInfo);
}
#endif
Copy Permalink