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

In case the custom builder does not have the build path specified, use the one from the configuration builder

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-03-16 09:27:30 +00:00
parent c224cc8341
commit db758116da
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
View file

@ -1585,7 +1585,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider
return new Path(command); return new Path(command);
} }
private String getBuildPathAttribute(){ public String getBuildPathAttribute(){
if(buildPath == null){ if(buildPath == null){
if(superClass != null){ if(superClass != null){
return ((Builder)superClass).getBuildPathAttribute(); return ((Builder)superClass).getBuildPathAttribute();

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

@ -278,6 +278,10 @@ public class BuilderFactory {
args.put(IBuilder.ID, ManagedBuildManager.calculateChildId(cfg.getId(), null)); args.put(IBuilder.ID, ManagedBuildManager.calculateChildId(cfg.getId(), null));
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());
if(builder.getBuildPathAttribute() == null){
//set the build path from the cfg settings
builder.setBuildPath(cfg.getEditableBuilder().getBuildPath());
}
return builder; return builder;
} }