- In modern code we've been exposing DescribableList directly since it's a lot richer.

- calling prebuild after build wrappers to align the semantics with freestyle projects.
This commit is contained in:
Kohsuke Kawaguchi committed 2011-09-23 23:25:12 -07:00
1 parent cd968ce2d8
commit 0841fd6421
2 files changed
+24 -17

No files matched your search

@@ -591,17 +591,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
} else {
// do builds here
try {
// run pre build steps
if(!preBuild(listener,project.getPrebuilders())){
r = FAILURE;
return r;
}
if(!build(listener,project.getPrebuilders())){
r = FAILURE;
return r;
}
List<BuildWrapper> wrappers = new ArrayList<BuildWrapper>();
for (BuildWrapper w : project.getBuildWrappersList())
wrappers.add(w);
@@ -617,11 +606,20 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
e.buildEnvVars(envVars); // #3502: too late for getEnvironment to do this
}
// run pre build steps
if(!preBuild(listener,project.getPrebuilders())){
r = FAILURE;
return r;
}
if(!preBuild(listener, project.getPublishers())){
r = FAILURE;
return r;
}
if(!build(listener,project.getPrebuilders().toList())){
r = FAILURE;
return r;
}
String settingsConfigId = project.getSettingConfigId();
if (!StringUtils.isBlank(settingsConfigId)) {
@@ -805,7 +803,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
proceedPostSteps = false;
}
if(proceedPostSteps){
if(!build(listener,project.getPostbuilders())){
if(!build(listener,project.getPostbuilders().toList())){
r = FAILURE;
}
}