feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

IncrediBuild: Rework CommandBuilder

Browse Source 
Simplify interfaces. Also persist all command line settings,
make overriding default arguments explicit.

Change-Id: Ifb7e791dfc07ae9a88cfd769b9d21c5ee242e31d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-08-06 18:11:52 +02:00
parent f00b088a1d
commit e04b9a5348
10 changed files with 121 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/incredibuild/cmakecommandbuilder.cpp
View File

@@ -25,7 +25,6 @@
#include "cmakecommandbuilder.h"
#include <coreplugin/icore.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildstep.h>
#include <projectexplorer/buildsteplist.h>
@@ -34,8 +33,8 @@
#include <projectexplorer/toolchain.h>
#include <projectexplorer/project.h>
#include <QFileInfo>
#include <QMessageBox>
#include <utils/qtcprocess.h>
#include <QRegularExpression>
#include <QStandardPaths>
@@ -59,24 +58,15 @@ bool CMakeCommandBuilder::canMigrate(BuildStepList *buildStepList)
return false;
}
QString CMakeCommandBuilder::defaultCommand()
QString CMakeCommandBuilder::defaultCommand() const
{
if (!m_defaultMake.isEmpty())
return m_defaultMake;
m_defaultMake = "cmake";
QString cmake = QStandardPaths::findExecutable(m_defaultMake);
if (!cmake.isEmpty())
m_defaultMake = cmake;
return m_defaultMake;
const QString defaultCMake = "cmake";
const QString cmake = QStandardPaths::findExecutable(defaultCMake);
return cmake.isEmpty() ? defaultCMake : cmake;
}
QStringList CMakeCommandBuilder::defaultArguments()
QString CMakeCommandBuilder::defaultArguments() const
{
if (!m_defaultArgs.isEmpty())
return m_defaultArgs;
// Build folder or "."
QString buildDir;
BuildConfiguration *buildConfig = buildStep()->buildConfiguration();
@@ -86,12 +76,7 @@ QStringList CMakeCommandBuilder::defaultArguments()
if (buildDir.isEmpty())
buildDir = ".";
m_defaultArgs.append("--build");
m_defaultArgs.append(buildDir);
m_defaultArgs.append("--target");
m_defaultArgs.append("all");
return m_defaultArgs;
return Utils::QtcProcess::joinArgs({"--build", buildDir, "--target", "all"});
}
QString CMakeCommandBuilder::setMultiProcessArg(QString args)