forked from qt-creator/qt-creator
Unify generic and autotools make steps, by moving the better maintained logic from the generic make step to the base make step. Add fallback code for restoring settings from previous autotools make steps, since a key was named slightly different. The autotools make step was behaving a little bit better when there is no C++ toolchain set in the kit, but on the other hand would just take the make command from a random existing toolchain, which can be wrong too. Anyhow, this must be fixed in a follow-up patch for all make steps. Change-Id: I47af7d327feb9336790d30c8b9a4968c25b25db3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
84 lines
2.7 KiB
C++
84 lines
2.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 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 "genericmakestep.h"
|
|
#include "genericprojectconstants.h"
|
|
|
|
#include <projectexplorer/projectexplorerconstants.h>
|
|
|
|
using namespace ProjectExplorer;
|
|
|
|
namespace GenericProjectManager {
|
|
namespace Internal {
|
|
|
|
const char GENERIC_MS_ID[] = "GenericProjectManager.GenericMakeStep";
|
|
|
|
GenericMakeStep::GenericMakeStep(BuildStepList *parent, const QString &buildTarget)
|
|
: MakeStep(parent, GENERIC_MS_ID, buildTarget, {"all", "clean"})
|
|
{
|
|
}
|
|
|
|
//
|
|
// GenericMakeAllStepFactory
|
|
//
|
|
|
|
GenericMakeAllStepFactory::GenericMakeAllStepFactory()
|
|
{
|
|
struct Step : GenericMakeStep
|
|
{
|
|
Step(BuildStepList *bsl) : GenericMakeStep(bsl, QString("all")) { }
|
|
};
|
|
|
|
registerStep<Step>(GENERIC_MS_ID);
|
|
setDisplayName(MakeStep::defaultDisplayName());
|
|
setSupportedProjectType(Constants::GENERICPROJECT_ID);
|
|
setSupportedStepLists({ProjectExplorer::Constants::BUILDSTEPS_BUILD,
|
|
ProjectExplorer::Constants::BUILDSTEPS_DEPLOY});
|
|
}
|
|
|
|
//
|
|
// GenericMakeCleanStepFactory
|
|
//
|
|
|
|
GenericMakeCleanStepFactory::GenericMakeCleanStepFactory()
|
|
{
|
|
struct Step : GenericMakeStep
|
|
{
|
|
Step(BuildStepList *bsl) : GenericMakeStep(bsl)
|
|
{
|
|
setBuildTarget("clean", true);
|
|
setClean(true);
|
|
}
|
|
};
|
|
|
|
registerStep<Step>(GENERIC_MS_ID);
|
|
setDisplayName(MakeStep::defaultDisplayName());
|
|
setSupportedProjectType(Constants::GENERICPROJECT_ID);
|
|
setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_CLEAN);
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace GenericProjectManager
|