forked from qt-creator/qt-creator
5ddd83247c
The default command is supposed to be a placeholder not
an entry done by the user.
Allow entering an empty string again to rely on the default.
As on it fix place holders inside strings.
Amends e04b9a5348.
Change-Id: I111c843d9620ecc8cf5a7a3c63ca7ac92e588e0c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
92 lines
3.1 KiB
C++
92 lines
3.1 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2020 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** 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
|
|
** 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.
|
|
**
|
|
** 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.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "makecommandbuilder.h"
|
|
|
|
#include <projectexplorer/buildconfiguration.h>
|
|
#include <projectexplorer/buildstep.h>
|
|
#include <projectexplorer/buildsteplist.h>
|
|
#include <projectexplorer/kitinformation.h>
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
#include <projectexplorer/target.h>
|
|
#include <projectexplorer/toolchain.h>
|
|
#include <projectexplorer/project.h>
|
|
|
|
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> // Compile-time only
|
|
|
|
#include <QDebug>
|
|
#include <QFileInfo>
|
|
#include <QRegularExpression>
|
|
|
|
using namespace ProjectExplorer;
|
|
|
|
namespace IncrediBuild {
|
|
namespace Internal {
|
|
|
|
QList<Utils::Id> MakeCommandBuilder::migratableSteps() const
|
|
{
|
|
return {QmakeProjectManager::Constants::MAKESTEP_BS_ID};
|
|
}
|
|
|
|
QString MakeCommandBuilder::defaultCommand() const
|
|
{
|
|
BuildConfiguration *buildConfig = buildStep()->buildConfiguration();
|
|
if (buildConfig) {
|
|
Target *target = buildStep()->target();
|
|
if (target) {
|
|
ToolChain *toolChain = ToolChainKitAspect::toolChain(target->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID);
|
|
if (toolChain)
|
|
return toolChain->makeCommand(buildConfig->environment()).toUserOutput();
|
|
}
|
|
}
|
|
|
|
return QString();
|
|
}
|
|
|
|
QString MakeCommandBuilder::setMultiProcessArg(QString args)
|
|
{
|
|
QString cmd = command();
|
|
QFileInfo fileInfo(cmd);
|
|
|
|
// jom -j 200
|
|
if (fileInfo.baseName().compare("jom", Qt::CaseSensitivity::CaseInsensitive) == 0) {
|
|
QRegularExpression regExp("\\s*\\-j\\s+\\d+");
|
|
args.remove(regExp);
|
|
args.append(" -j 200");
|
|
}
|
|
// make -j200
|
|
else if ((fileInfo.baseName().compare("make", Qt::CaseSensitivity::CaseInsensitive) == 0)
|
|
|| (fileInfo.baseName().compare("gmake", Qt::CaseSensitivity::CaseInsensitive) == 0)) {
|
|
QRegularExpression regExp("\\s*\\-j\\d+");
|
|
args.remove(regExp);
|
|
args.append(" -j200");
|
|
}
|
|
|
|
return args;
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace IncrediBuild
|