mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 17:55:39 +02:00
Code Issues Wiki Activity

Fix for [Bug 185710] Error parsers settings are ignored

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-05-07 09:56:00 +00:00
parent f303c6143a
commit 403e59ebed
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java
View file

@ -274,8 +274,11 @@ public class BuilderFactory {
private static IBuilder createBuilder(IConfiguration cfg, Map args){ private static IBuilder createBuilder(IConfiguration cfg, Map args){
IToolChain tCh = cfg.getToolChain(); IToolChain tCh = cfg.getToolChain();
if(args.get(IBuilder.ID) == null) boolean isMakeTargetBuild = false;
if(args.get(IBuilder.ID) == null){
args.put(IBuilder.ID, ManagedBuildManager.calculateChildId(cfg.getId(), null)); args.put(IBuilder.ID, ManagedBuildManager.calculateChildId(cfg.getId(), null));
isMakeTargetBuild = true;
}
MapStorageElement el = new BuildArgsStorageElement(args, null); MapStorageElement el = new BuildArgsStorageElement(args, null);
Builder builder = new Builder(tCh, el, ManagedBuildManager.getVersion().toString()); Builder builder = new Builder(tCh, el, ManagedBuildManager.getVersion().toString());
IBuilder cfgBuilder = cfg.getEditableBuilder(); IBuilder cfgBuilder = cfg.getEditableBuilder();
@ -290,6 +293,16 @@ public class BuilderFactory {
ManagedBuilderCorePlugin.log(e); ManagedBuilderCorePlugin.log(e);
} }
} }
if(isMakeTargetBuild){
String [] ids = builder.getCustomizedErrorParserIds();
if(ids != null && ids.length == 0){
builder.setCustomizedErrorParserIds(null);
}
String id = builder.getErrorParserIds();
if(id == null)
builder.setErrorParserIds(cfgBuilder.getErrorParserIds());
}
return builder; return builder;
} }

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

@ -54,7 +54,6 @@ import org.eclipse.cdt.managedbuilder.internal.buildmodel.DescriptionBuilder;
import org.eclipse.cdt.managedbuilder.internal.buildmodel.IBuildModelBuilder; import org.eclipse.cdt.managedbuilder.internal.buildmodel.IBuildModelBuilder;
import org.eclipse.cdt.managedbuilder.internal.buildmodel.IConfigurationBuildState; import org.eclipse.cdt.managedbuilder.internal.buildmodel.IConfigurationBuildState;
import org.eclipse.cdt.managedbuilder.internal.buildmodel.IProjectBuildState; import org.eclipse.cdt.managedbuilder.internal.buildmodel.IProjectBuildState;
import org.eclipse.cdt.managedbuilder.internal.buildmodel.IRebuildState;
import org.eclipse.cdt.managedbuilder.internal.buildmodel.ParallelBuilder; import org.eclipse.cdt.managedbuilder.internal.buildmodel.ParallelBuilder;
import org.eclipse.cdt.managedbuilder.internal.buildmodel.StepBuilder; import org.eclipse.cdt.managedbuilder.internal.buildmodel.StepBuilder;
import org.eclipse.cdt.managedbuilder.macros.BuildMacroException; import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;