From aaae0227983551cd492fffdfed8a220e464c5f5e Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Tue, 18 Apr 2006 21:51:06 +0000 Subject: [PATCH] Build Model and Internal Builder fixes and enhancements --- .../cdt/managedbuilder/internal/buildmodel/BuildStep.java | 2 +- .../cdt/managedbuilder/internal/buildmodel/StepBuilder.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java index bc1b06ac4df..5350e294f74 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStep.java @@ -248,7 +248,7 @@ public class BuildStep implements IBuildStep { step = fBuildDescription.getConfiguration().getPostbuildStep(); } - if(step != null){ + if(step != null && (step = step.trim()).length() > 0){ String commands[] = step.split(";"); //$NON-NLS-1$ if(cwd == null) cwd = calcCWD(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/StepBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/StepBuilder.java index c0d3a392e21..83ff5bf39f9 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/StepBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/StepBuilder.java @@ -92,8 +92,9 @@ public class StepBuilder implements IBuildModelBuilder { break; } } + status = postProcess(status, monitor); } - return postProcess(status, monitor); + return status; } protected int postProcess(int status, IProgressMonitor monitor){ @@ -138,6 +139,9 @@ public class StepBuilder implements IBuildModelBuilder { } protected void cleanOutputs(IProgressMonitor monitor){ + if(fStep == fStep.getBuildDescription().getInputStep()) + return; + IBuildResource bRcs[] = fStep.getOutputResources(); for(int i = 0; i < bRcs.length; i++){ IResource rc = BuildDescriptionManager.findResourceForBuildResource(bRcs[i]);