Commit d13fca02 authored by Daniel Teske's avatar Daniel Teske
Browse files

Readding MakeSteps to the clean step list should set them up correctly



That is set the argument to "clean" and ensure that the return value is
ignored.

Change-Id: I1f15ad464e6f4608d7eb698365846a4c765f1d22
Reviewed-by: default avatarTobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: default avatarAndre Hartmann <aha_1980@gmx.de>
parent 097850c8
......@@ -41,6 +41,7 @@
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <utils/qtcprocess.h>
......@@ -348,7 +349,12 @@ BuildStep *MakeStepFactory::create(BuildStepList *parent, const QString &id)
{
if (!canCreate(parent, id))
return 0;
return new MakeStep(parent);
MakeStep *step = new MakeStep(parent);
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
step->setClean(true);
step->setAdditionalArguments("clean");
}
return step;
}
bool MakeStepFactory::canClone(BuildStepList *parent, BuildStep *source) const
......
......@@ -42,6 +42,7 @@
#include <projectexplorer/toolchain.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/gnumakeparser.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <coreplugin/variablemanager.h>
#include <utils/stringutils.h>
#include <utils/qtcassert.h>
......@@ -323,7 +324,12 @@ ProjectExplorer::BuildStep *GenericMakeStepFactory::create(ProjectExplorer::Buil
{
if (!canCreate(parent, id))
return 0;
return new GenericMakeStep(parent);
GenericMakeStep *step = new GenericMakeStep(parent);
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
step->setClean(true);
step->setBuildTarget("clean", /* on = */ true);
}
return step;
}
bool GenericMakeStepFactory::canClone(ProjectExplorer::BuildStepList *parent,
......
......@@ -447,7 +447,12 @@ ProjectExplorer::BuildStep *MakeStepFactory::create(ProjectExplorer::BuildStepLi
{
if (!canCreate(parent, id))
return 0;
return new MakeStep(parent);
MakeStep *step = new MakeStep(parent);
if (parent->id() == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) {
step->setClean(true);
step->setUserArguments("clean");
}
return step;
}
bool MakeStepFactory::canClone(ProjectExplorer::BuildStepList *parent, ProjectExplorer::BuildStep *source) const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment