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

Fix for bug 59238 - Tool command option not getting cloned

Browse source
This commit is contained in:
Sean Evoy 2004-06-14 18:07:25 +00:00
parent 066c13ce24
commit 7e9807c15f
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java
View file

@ -87,26 +87,39 @@ public class Configuration extends BuildObject implements IConfiguration {
* Create a new configuration based on one already defined. * Create a new configuration based on one already defined.
* *
* @param target The <code>Target</code> the receiver will be added to. * @param target The <code>Target</code> the receiver will be added to.
* @param parent The <code>IConfiguration</code> to copy the settings from. * @param parentConfig The <code>IConfiguration</code> to copy the settings from.
* @param id A unique ID for the configuration. * @param id A unique ID for the configuration.
*/ */
public Configuration(Target target, IConfiguration parent, String id) { public Configuration(Target target, IConfiguration parentConfig, String id) {
this.id = id; this.id = id;
this.name = parent.getName(); this.name = parentConfig.getName();
this.target = target; this.target = target;
this.parent = parent;
// If this contructor is called to clone an existing
// configuration, the parent of the parent should be stored.
// As of 2.0, there is still one single level of inheritence to
// worry about
parent = parentConfig.getParent() == null ? parentConfig : parentConfig.getParent();
// Check that the tool and the project match // Check that the tool and the project match
IProject project = (IProject) target.getOwner(); IProject project = (IProject) target.getOwner();
// Get the tool references from the parent // Get the tool references from the parent
List parentToolRefs = ((Configuration)parent).getLocalToolReferences(); List parentToolRefs = ((Configuration)parentConfig).getLocalToolReferences();
Iterator iter = parentToolRefs.listIterator(); Iterator iter = parentToolRefs.listIterator();
while (iter.hasNext()) { while (iter.hasNext()) {
ToolReference toolRef = (ToolReference)iter.next(); ToolReference toolRef = (ToolReference)iter.next();
// Make a new ToolReference based on the tool in the ref // Make a new ToolReference based on the tool in the ref
ToolReference newRef = new ToolReference(this, toolRef.getTool()); ITool parentTool = toolRef.getTool();
ToolReference newRef = new ToolReference(this, parentTool);
// The reference may have a different command than the parent tool
String refCmd = toolRef.getToolCommand();
if (!refCmd.equals(parentTool.getToolCommand())) {
newRef.setToolCommand(refCmd);
}
List optRefs = toolRef.getOptionReferenceList(); List optRefs = toolRef.getOptionReferenceList();
Iterator optIter = optRefs.listIterator(); Iterator optIter = optRefs.listIterator();
while (optIter.hasNext()) { while (optIter.hasNext()) {