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

initial fix for [Bug 186412] -shared option not checked by default for Shared Library artifact

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-05-11 10:36:16 +00:00
parent ed17c0ef66
commit a253a6510b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ public class ManagedOptionValueHandler implements
break; break;
case IOption.INCLUDE_PATH: case IOption.INCLUDE_PATH:
case IOption.UNDEF_INCLUDE_PATH: case IOption.UNDEF_INCLUDE_PATH:
if (Arrays.equals(option.getIncludePaths(), (String[])defaultValue)) { if (Arrays.equals(option.getBasicStringListValue(), (String[])defaultValue)) {
return true; return true;
} }
break; break;
@ -136,7 +136,7 @@ public class ManagedOptionValueHandler implements
break; break;
case IOption.PREPROCESSOR_SYMBOLS: case IOption.PREPROCESSOR_SYMBOLS:
case IOption.UNDEF_PREPROCESSOR_SYMBOLS: case IOption.UNDEF_PREPROCESSOR_SYMBOLS:
if (Arrays.equals(option.getDefinedSymbols(), (String[])defaultValue)) { if (Arrays.equals(option.getBasicStringListValue(), (String[])defaultValue)) {
return true; return true;
} }
break; break;

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

@ -2595,7 +2595,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
new FileContextData(inputFileLocation, outputFileLocation, option, this)); new FileContextData(inputFileLocation, outputFileLocation, option, this));
if(info != null){ if(info != null){
macroSubstitutor.setMacroContextInfo(info); macroSubstitutor.setMacroContextInfo(info);
String[] list = CdtVariableResolver.resolveStringListValues(option.getStringListValue(), macroSubstitutor, true); String[] list = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
if(list != null){ if(list != null){
for (int j = 0; j < list.length; j++) { for (int j = 0; j < list.length; j++) {
String temp = list[j]; String temp = list[j];
@ -2614,7 +2614,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
new FileContextData(inputFileLocation, outputFileLocation, option, this)); new FileContextData(inputFileLocation, outputFileLocation, option, this));
if(info != null) { if(info != null) {
macroSubstitutor.setMacroContextInfo(info); macroSubstitutor.setMacroContextInfo(info);
String[] paths = CdtVariableResolver.resolveStringListValues(option.getIncludePaths(), macroSubstitutor, true); String[] paths = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
if(paths != null){ if(paths != null){
for (int j = 0; j < paths.length; j++) { for (int j = 0; j < paths.length; j++) {
String temp = paths[j]; String temp = paths[j];
@ -2633,7 +2633,7 @@ public class Tool extends HoldsOptions implements ITool, IOptionCategory, IMatch
new FileContextData(inputFileLocation, outputFileLocation, option, this)); new FileContextData(inputFileLocation, outputFileLocation, option, this));
if(info != null){ if(info != null){
macroSubstitutor.setMacroContextInfo(info); macroSubstitutor.setMacroContextInfo(info);
String[] symbols = CdtVariableResolver.resolveStringListValues(option.getDefinedSymbols(), macroSubstitutor, true); String[] symbols = CdtVariableResolver.resolveStringListValues(option.getBasicStringListValue(), macroSubstitutor, true);
if(symbols != null){ if(symbols != null){
for (int j = 0; j < symbols.length; j++) { for (int j = 0; j < symbols.length; j++) {
String temp = symbols[j]; String temp = symbols[j];