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

Follow-up for the fix for [Bug 162143] [MBS] Internal builder forgets about deltas when failures occur

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-05-03 14:00:27 +00:00
parent c5f3842ca8
commit 3127a209e4
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java
View file

@ -875,17 +875,17 @@ public class CommonBuilder extends ACBuilder {
try { try {
int flags = 0; int flags = 0;
IResourceDelta delta = getDelta(currentProject); IResourceDelta delta = getDelta(currentProject);
if(delta != null){
flags = BuildDescriptionManager.REBUILD | BuildDescriptionManager.REMOVED | BuildDescriptionManager.DEPS;
// delta = getDelta(currentProject);
}
boolean buildIncrementaly = delta != null;
BuildStateManager bsMngr = BuildStateManager.getInstance(); BuildStateManager bsMngr = BuildStateManager.getInstance();
IProjectBuildState pBS = bsMngr.getProjectBuildState(currentProject); IProjectBuildState pBS = bsMngr.getProjectBuildState(currentProject);
IConfigurationBuildState cBS = pBS.getConfigurationBuildState(cfg.getId(), true); IConfigurationBuildState cBS = pBS.getConfigurationBuildState(cfg.getId(), true);
// if(delta != null){
flags = BuildDescriptionManager.REBUILD | BuildDescriptionManager.REMOVED | BuildDescriptionManager.DEPS;
// delta = getDelta(currentProject);
// }
boolean buildIncrementaly = delta != null;
IBuildDescription des = BuildDescriptionManager.createBuildDescription(cfg, cBS, delta, flags); IBuildDescription des = BuildDescriptionManager.createBuildDescription(cfg, cBS, delta, flags);
DescriptionBuilder dBuilder = null; DescriptionBuilder dBuilder = null;
@ -1454,6 +1454,16 @@ public class CommonBuilder extends ACBuilder {
protected void clean(CfgBuildInfo bInfo, IProgressMonitor monitor) throws CoreException{ protected void clean(CfgBuildInfo bInfo, IProgressMonitor monitor) throws CoreException{
if (shouldBuild(CLEAN_BUILD, bInfo.getBuilder())) { if (shouldBuild(CLEAN_BUILD, bInfo.getBuilder())) {
BuildStateManager bsMngr = BuildStateManager.getInstance();
IProject project = bInfo.getProject();
IConfiguration cfg = bInfo.getConfiguration();
IProjectBuildState pbs = bsMngr.getProjectBuildState(project);
IConfigurationBuildState cbs = pbs.getConfigurationBuildState(cfg.getId(), false);
if(cbs != null){
pbs.removeConfigurationBuildState(cfg.getId());
bsMngr.setProjectBuildState(project, pbs);
}
boolean performExternalClean = true; boolean performExternalClean = true;
if(shouldCleanProgrammatically(bInfo)){ if(shouldCleanProgrammatically(bInfo)){
try { try {