1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00

Fixed the bug related to the incorrect checking of the macros referenced in the environment variable definitions

This commit is contained in:
Mikhail Sennikovsky 2005-05-23 16:15:47 +00:00
parent 2853cf688d
commit d916648fee

View file

@ -799,8 +799,15 @@ public class EnvironmentBlock extends AbstractCOptionPage {
if(macroProvider != null){ if(macroProvider != null){
IMacroContextInfo macroContextInfo = macroProvider.getMacroContextInfo(contextType,contextData); IMacroContextInfo macroContextInfo = macroProvider.getMacroContextInfo(contextType,contextData);
if(macroContextInfo != null){ if(macroContextInfo != null){
EnvironmentVariableProvider provider = (EnvironmentVariableProvider)ManagedBuildManager.getEnvironmentVariableProvider();
EnvVarCollector v = provider.getVariables(fCurrentContextInfo,true);
if(v != null){
EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$ EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$
MacroResolver.checkIntegrity(macroContextInfo,substitutor); IBuildEnvironmentVariable vars[] = v.toArray(false);
for(int i = 0; i < vars.length; i++){
MacroResolver.checkMacros(vars[i].getValue(), substitutor);
}
}
} }
} }
updateState(null); updateState(null);