mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Bug 571458: Return verdict of all configs

Browse source 
When invoking the headless build, the verdict should be the "sum" of
all the build configurations. If one build configuration fails, then
the verdict of the build should also be "failed".

Contributed by STMicroelectronics

Change-Id: Ic3237d3531657f7f89c9338142ebf8fdb477c481
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@st.com>
This commit is contained in:
Torbjörn SVENSSON 2021-02-24 11:44:46 +01:00
parent 1404e46d70
commit afd8342ec0
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/HeadlessBuilder.java
View file

@ -271,18 +271,28 @@ public class HeadlessBuilder implements IApplication {
/*
* Build the given configurations using the specified build type (FULL, CLEAN, INCREMENTAL)
*/
protected void buildConfigurations(Map<IProject, Set<ICConfigurationDescription>> projConfigs,
final IProgressMonitor monitor, final int buildType) throws CoreException {
protected boolean buildConfigurations(Map<IProject, Set<ICConfigurationDescription>> projConfigs,
final IProgressMonitor monitor, final int buildType, List<String> allBuildErrors) throws CoreException {
boolean buildSuccessful = true;
for (Map.Entry<IProject, Set<ICConfigurationDescription>> entry : projConfigs.entrySet()) {
Set<ICConfigurationDescription> cfgDescs = entry.getValue();
IConfiguration[] configs = new IConfiguration[cfgDescs.size()];
int i = 0;
for (ICConfigurationDescription cfgDesc : cfgDescs)
configs[i++] = ManagedBuildManager.getConfigurationForDescription(cfgDesc);
for (ICConfigurationDescription cfgDesc : cfgDescs) {
IConfiguration[] configs = new IConfiguration[] {
ManagedBuildManager.getConfigurationForDescription(cfgDesc) };
ManagedBuildManager.buildConfigurations(configs, null, new SubProgressMonitor(monitor, 1), true,
buildType);
buildSuccessful = buildSuccessful && isProjectSuccesfullyBuild(entry.getKey());
if (printErrorMarkers) {
accumulateErrorMarkers(entry.getKey(), allBuildErrors);
}
}
ManagedBuildManager.buildConfigurations(configs, null, new SubProgressMonitor(monitor, 1), true, buildType);
}
return buildSuccessful;
}
/**
@ -538,7 +548,8 @@ public class HeadlessBuilder implements IApplication {
for (String regEx : projectRegExToClean)
matchConfigurations(regEx, allProjects, configsToBuild);
// Clean the list of configurations
buildConfigurations(configsToBuild, monitor, IncrementalProjectBuilder.CLEAN_BUILD);
buildConfigurations(configsToBuild, monitor, IncrementalProjectBuilder.CLEAN_BUILD,
new ArrayList<>());
}
// Build the projects the user wants building
@ -547,26 +558,18 @@ public class HeadlessBuilder implements IApplication {
ACBuilder.setAllConfigBuild(true);
System.out.println(HeadlessBuildMessages.HeadlessBuilder_building_all);
root.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
for (IProject p : root.getProjects()) {
buildSuccessful = buildSuccessful && isProjectSuccesfullyBuild(p);
if (printErrorMarkers) {
accumulateErrorMarkers(p, allBuildErrors);
}
}
// Collect build configurations for all projects in workspace
matchConfigurations(".*", allProjects, configsToBuild); //$NON-NLS-1$
} else {
// Resolve the regular expression project names to build configurations
for (String regEx : projectRegExToBuild)
matchConfigurations(regEx, allProjects, configsToBuild);
// Build the list of configurations
buildConfigurations(configsToBuild, monitor, IncrementalProjectBuilder.FULL_BUILD);
for (IProject p : configsToBuild.keySet()) {
buildSuccessful = buildSuccessful && isProjectSuccesfullyBuild(p);
if (printErrorMarkers) {
accumulateErrorMarkers(p, allBuildErrors);
}
}
}
// Build the list of configurations
buildSuccessful = buildConfigurations(configsToBuild, monitor, IncrementalProjectBuilder.FULL_BUILD,
allBuildErrors);
} finally {
// Reset the tool options
if (!savedToolOptions.isEmpty())