mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-14 20:45:22 +02:00
Code Issues Wiki Activity

Bug #223059 : Problems setting per resource tool settings

Browse source
This commit is contained in:
Oleg Krasilnikov 2008-03-19 09:35:59 +00:00
parent fd23b527a9
commit 7d4b0fd582
1 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Tool.java
View file

@ -3942,61 +3942,55 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
return true; return true;
} }
} }
//envVarBuildPathList;
// Managed Build model attributes
// unusedChildren;
// isAbstract;
Tool superTool = (Tool)superClass; Tool superTool = (Tool)superClass;
if(command != null && !command.equals(superTool.getToolCommand())) if(command != null && !command.equals(superTool.getToolCommand()))
return true; return true;
//inputExtensions;
//interfaceExtensions; //(header extensions)
//natureFilter;
//outputExtensions;
//outputFlag;
//outputPrefix;
if(errorParserIds != null && !errorParserIds.equals(superTool.getErrorParserIds())) if(errorParserIds != null && !errorParserIds.equals(superTool.getErrorParserIds()))
return true; return true;
if(commandLinePattern != null && !commandLinePattern.equals(superTool.getCommandLinePattern())) if(commandLinePattern != null && !commandLinePattern.equals(superTool.getCommandLinePattern()))
return true; return true;
//versionsSupported;
//convertToId;
//advancedInputCategory;
if(customBuildStep != null && customBuildStep.booleanValue() != superTool.getCustomBuildStep()) if(customBuildStep != null && customBuildStep.booleanValue() != superTool.getCustomBuildStep())
return true; return true;
if(announcement != null && !announcement.equals(superTool.getAnnouncement())) if(announcement != null && !announcement.equals(superTool.getAnnouncement()))
return true; return true;
//commandLineGeneratorElement
//commandLineGenerator
//dependencyGeneratorElement
//dependencyGenerator
//iconPathURL;
//pathconverterElement
//optionPathConverter
//supportedProperties
//supportsManagedBuild
//isTest;
// Miscellaneous
//isExtensionTool
//isDirty
//resolved
//previousMbsVersionConversionElement
//currentMbsVersionConversionElement
//rebuildState
//booleanExpressionCalculator
//typeToDataMap
//fDataMapInited;
//identicalList;
if(discoveredInfoMap != null && discoveredInfoMap.size() != 0) if(discoveredInfoMap != null && discoveredInfoMap.size() != 0)
return true; return true;
//scannerConfigDiscoveryProfileId
if (isAnyOptionModified(this, tool))
return true;
return false;
}
private boolean isAnyOptionModified(ITool t1, ITool t2) {
for (IOption op1 : t1.getOptions()) {
for (IOption op2 : t2.getOptions()) {
// find matching option
try {
if (op1.getValueType() == op2.getValueType() &&
op1.getName().equals(op2.getName())) {
Object ob1 = op1.getValue();
Object ob2 = op2.getValue();
if (ob1 == null && ob2 == null)
break;
// values are different ?
if ((ob1 == null || ob2 == null) ||
!(ob1.equals(ob2) ))
return true;
else
break;
}
} catch (BuildException e) {
return true; // unprobable
}
}
}
return false; return false;
} }