mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-09 19:43:27 +02:00
Code Issues Wiki Activity

Fix for [Bug 183863] Makefile generation is switched on for the target build in case of the managed build capable builder is being used for the configuration

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-04-25 08:33:32 +00:00
parent 8fde3d9842
commit 3e71672938
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2065,12 +2065,20 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider
else if(!cfg.supportsBuild(false)) else if(!cfg.supportsBuild(false))
return true; return true;
} }
Boolean attr = getManagedBuildOnAttribute();
if(attr != null)
return attr.booleanValue();
return true;
}
public Boolean getManagedBuildOnAttribute(){
if(managedBuildOn == null){ if(managedBuildOn == null){
if(superClass != null) if(superClass != null)
return superClass.isManagedBuildOn(); return ((Builder)superClass).getManagedBuildOnAttribute();
return true; return null;
} }
return managedBuildOn.booleanValue(); return managedBuildOn;
} }
public void setManagedBuildOn(boolean on) throws CoreException { public void setManagedBuildOn(boolean on) throws CoreException {

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

@ -278,9 +278,17 @@ 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());
IBuilder cfgBuilder = cfg.getEditableBuilder();
if(builder.getBuildPathAttribute() == null){ if(builder.getBuildPathAttribute() == null){
//set the build path from the cfg settings //set the build path from the cfg settings
builder.setBuildPath(cfg.getEditableBuilder().getBuildPath()); builder.setBuildPath(cfgBuilder.getBuildPath());
}
if(builder.getManagedBuildOnAttribute() == null){
try {
builder.setManagedBuildOn(cfgBuilder.isManagedBuildOn());
} catch (CoreException e) {
ManagedBuilderCorePlugin.log(e);
}
} }
return builder; return builder;
} }