From d916648fee2e45ad65944debfad71c20b4ca404c Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Mon, 23 May 2005 16:15:47 +0000 Subject: [PATCH] Fixed the bug related to the incorrect checking of the macros referenced in the environment variable definitions --- .../managedbuilder/internal/ui/EnvironmentBlock.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java index db25b173cca..95bdca14761 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java @@ -799,8 +799,15 @@ public class EnvironmentBlock extends AbstractCOptionPage { if(macroProvider != null){ IMacroContextInfo macroContextInfo = macroProvider.getMacroContextInfo(contextType,contextData); if(macroContextInfo != null){ - EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$ - MacroResolver.checkIntegrity(macroContextInfo,substitutor); + EnvironmentVariableProvider provider = (EnvironmentVariableProvider)ManagedBuildManager.getEnvironmentVariableProvider(); + EnvVarCollector v = provider.getVariables(fCurrentContextInfo,true); + if(v != null){ + EnvVarUIMacroSubstitutor substitutor = new EnvVarUIMacroSubstitutor(macroContextInfo, null, " "); //$NON-NLS-2$ + IBuildEnvironmentVariable vars[] = v.toArray(false); + for(int i = 0; i < vars.length; i++){ + MacroResolver.checkMacros(vars[i].getValue(), substitutor); + } + } } } updateState(null);