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

Tool-chain modifications fixes

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-04-24 08:01:07 +00:00
parent 5162005b2c
commit cd5c882069
1 changed files with 69 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChain.java
View file

@ -25,6 +25,7 @@ import java.util.StringTokenizer;
import org.eclipse.cdt.build.internal.core.scannerconfig.CfgDiscoveredPathManager.PathInfoCache; import org.eclipse.cdt.build.internal.core.scannerconfig.CfgDiscoveredPathManager.PathInfoCache;
import org.eclipse.cdt.core.settings.model.ICStorageElement; import org.eclipse.cdt.core.settings.model.ICStorageElement;
import org.eclipse.cdt.core.settings.model.extension.CTargetPlatformData; import org.eclipse.cdt.core.settings.model.extension.CTargetPlatformData;
import org.eclipse.cdt.core.settings.model.util.CDataUtil;
import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyType; import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyType;
import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue; import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue;
import org.eclipse.cdt.managedbuilder.core.IBuildObject; import org.eclipse.cdt.managedbuilder.core.IBuildObject;
@ -112,6 +113,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
private BooleanExpressionApplicabilityCalculator booleanExpressionCalculator; private BooleanExpressionApplicabilityCalculator booleanExpressionCalculator;
private List identicalList; private List identicalList;
private Set unusedChildrenSet;
private IFolderInfo parentFolderInfo; private IFolderInfo parentFolderInfo;
@ -966,7 +968,7 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
* @see org.eclipse.cdt.core.build.managed.IToolChain#getTools() * @see org.eclipse.cdt.core.build.managed.IToolChain#getTools()
*/ */
public ITool[] getTools() { public ITool[] getTools() {
ITool tools[] = getAllTools(); ITool tools[] = getAllTools(false);
if(!isExtensionToolChain){ if(!isExtensionToolChain){
for(int i = 0; i < tools.length; i++){ for(int i = 0; i < tools.length; i++){
if(tools[i].isExtensionElement()){ if(tools[i].isExtensionElement()){
@ -979,11 +981,11 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
return tools; return tools;
} }
public ITool[] getAllTools() { public ITool[] getAllTools(boolean includeCurrentUnused) {
ITool[] tools = null; ITool[] tools = null;
// Merge our tools with our superclass' tools // Merge our tools with our superclass' tools
if (getSuperClass() != null) { if (getSuperClass() != null) {
tools = ((ToolChain)getSuperClass()).getAllTools(); tools = ((ToolChain)getSuperClass()).getAllTools(false);
} }
// Our tools take precedence // Our tools take precedence
if (tools != null) { if (tools != null) {
@ -1021,20 +1023,20 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
} }
} }
if(!isExtensionToolChain){ // if(!isExtensionToolChain){
for(int i = 0; i < tools.length; i++){ // for(int i = 0; i < tools.length; i++){
if(tools[i].getParent() != this){ // if(tools[i].getParent() != this){
ArrayList list = new ArrayList(Arrays.asList(tools)); // ArrayList list = new ArrayList(Arrays.asList(tools));
for(int k = 0; k < list.size(); k++){ // for(int k = 0; k < list.size(); k++){
if(((ITool)list.get(k)).getParent() != this){ // if(((ITool)list.get(k)).getParent() != this){
list.remove(k); // list.remove(k);
} // }
} // }
tools = (ITool[])list.toArray(new ITool[list.size()]); // tools = (ITool[])list.toArray(new ITool[list.size()]);
break; // break;
} // }
} // }
} // }
} else { } else {
tools = new ITool[getToolList().size()]; tools = new ITool[getToolList().size()];
Iterator iter = getToolList().listIterator(); Iterator iter = getToolList().listIterator();
@ -1044,7 +1046,28 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
tools[i++] = (ITool)tool; tools[i++] = (ITool)tool;
} }
} }
return tools; if(includeCurrentUnused)
return tools;
return filterUsedTools(tools, true);
}
private ITool[] filterUsedTools(ITool tools[], boolean used){
Set set = getUnusedChilrenSet();
if(set.size() == 0)
return used ? tools : new ITool[0];
List list = new ArrayList(tools.length);
for(int i = 0; i < tools.length; i++){
if(set.contains(tools[i].getId()) != used)
list.add(tools[i]);
}
return (ITool[])list.toArray(new ITool[list.size()]);
}
public ITool[] getUnusedTools(){
ITool[] all = getAllTools(true);
return filterUsedTools(all, false);
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -1115,6 +1138,9 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
public void removeTool(Tool tool){ public void removeTool(Tool tool){
getToolList().remove(tool); getToolList().remove(tool);
getToolMap().remove(tool.getId()); getToolMap().remove(tool.getId());
ITool extTool = ManagedBuildManager.getExtensionTool(tool);
if(extTool.getParent() == getSuperClass())
addUnusedChild(extTool);
} }
/* /*
@ -2673,4 +2699,28 @@ public class ToolChain extends HoldsOptions implements IToolChain, IBuildPropert
return getSuperClassNum() - other.getSuperClassNum(); return getSuperClassNum() - other.getSuperClassNum();
} }
private Set getUnusedChilrenSet(){
if(unusedChildrenSet == null){
String childIds[] = CDataUtil.stringToArray(unusedChildren, ";");
if(childIds == null)
unusedChildrenSet = new HashSet();
else {
unusedChildrenSet = new HashSet();
unusedChildrenSet.addAll(Arrays.asList(childIds));
}
}
return unusedChildrenSet;
}
private void addUnusedChild(ITool tool){
Set set = getUnusedChilrenSet();
set.add(tool.getId());
unusedChildrenSet = set;
unusedChildren = translateUnusedIdSetToString(set);
}
private String translateUnusedIdSetToString(Set set){
return CDataUtil.arrayToString(set.toArray(), ";");
}
} }