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

Add a makestep that cleans up

Browse Source 
Make clean and rebuild all work.
This commit is contained in:
dt
2009-04-07 15:00:16 +02:00
parent 3d863b211a
commit 0a406dbe1f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -506,6 +506,10 @@ void CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
if (!copw.buildDirectory().isEmpty()) if (!copw.buildDirectory().isEmpty())
setValue("all", "buildDirectory", copw.buildDirectory()); setValue("all", "buildDirectory", copw.buildDirectory());
//TODO save arguments somewhere copw.arguments() //TODO save arguments somewhere copw.arguments()
MakeStep *cleanMakeStep = new MakeStep(this);
insertCleanStep(0, cleanMakeStep);
cleanMakeStep->setValue("clean", true);
} else { } else {
// We have a user file, but we could still be missing the cbp file // We have a user file, but we could still be missing the cbp file
// TODO check that we have a cbp file and if not, open up a dialog ? // TODO check that we have a cbp file and if not, open up a dialog ?

4
src/plugins/cmakeprojectmanager/makestep.cpp
View File

@@ -99,10 +99,14 @@ bool MakeStep::init(const QString &buildConfiguration)
setCommand(buildConfiguration, "make"); // TODO give full path here? setCommand(buildConfiguration, "make"); // TODO give full path here?
#endif // Q_OS_WIN #endif // Q_OS_WIN
if (value("clean").isValid() && value("clean").toBool()) {
setArguments(buildConfiguration, QStringList() << "clean");
} else {
QStringList arguments = value(buildConfiguration, "buildTargets").toStringList(); QStringList arguments = value(buildConfiguration, "buildTargets").toStringList();
arguments << additionalArguments(buildConfiguration); arguments << additionalArguments(buildConfiguration);
setArguments(buildConfiguration, arguments); // TODO setArguments(buildConfiguration, arguments); // TODO
setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration)); setEnvironment(buildConfiguration, m_pro->environment(buildConfiguration));
}
return AbstractProcessStep::init(buildConfiguration); return AbstractProcessStep::init(buildConfiguration);
} }