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

AutoTools: Prefer build step ids for setting up the build configuration

Browse Source 
Essentially a proof-of-concept that knowing the actual classes is
not needed.

Change-Id: I82b1664c93a25e418860bda77f66ec77144cf658
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-06-26 12:48:53 +02:00
parent 7ebfa87dc2
commit 5d6c84777a
6 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -26,12 +26,9 @@
****************************************************************************/
#include "autotoolsbuildconfiguration.h"
#include "makestep.h"
#include "autotoolsproject.h"
#include "autotoolsprojectconstants.h"
#include "autogenstep.h"
#include "autoreconfstep.h"
#include "configurestep.h"
#include <coreplugin/icore.h>
#include <projectexplorer/buildinfo.h>
@@ -72,26 +69,20 @@ void AutotoolsBuildConfiguration::initialize(const BuildInfo &info)
// ### Build Steps Build ###
// autogen.sh or autoreconf
QFile autogenFile(target()->project()->projectDirectory().toString() + "/autogen.sh");
if (autogenFile.exists()) {
auto autogenStep = new AutogenStep(buildSteps);
buildSteps->appendStep(autogenStep);
} else {
auto autoreconfStep = new AutoreconfStep(buildSteps);
buildSteps->appendStep(autoreconfStep);
}
if (autogenFile.exists())
buildSteps->appendStep(Constants::AUTOGEN_STEP_ID);
else
buildSteps->appendStep(Constants::AUTORECONF_STEP_ID);
// ./configure.
auto configureStep = new ConfigureStep(buildSteps);
buildSteps->appendStep(configureStep);
buildSteps->appendStep(Constants::CONFIGURE_STEP_ID);
// make
auto makeStep = new MakeStep(buildSteps);
buildSteps->appendStep(makeStep);
buildSteps->appendStep(Constants::MAKE_STEP_ID);
// ### Build Steps Clean ###
BuildStepList *cleanSteps = stepList(BUILDSTEPS_CLEAN);
auto cleanMakeStep = new MakeStep(cleanSteps);
cleanSteps->appendStep(cleanMakeStep);
cleanSteps->appendStep(Constants::MAKE_STEP_ID);
}