diff options
| author | Mikhail Sennikovsky | 2005-05-23 16:15:47 +0000 |
|---|---|---|
| committer | Mikhail Sennikovsky | 2005-05-23 16:15:47 +0000 |
| commit | d916648fee2e45ad65944debfad71c20b4ca404c (patch) | |
| tree | 6af273a334b8067e11be7e52b4bec48e353230e1 /build/org.eclipse.cdt.managedbuilder.ui/src | |
| parent | 2853cf688d3aaab6ddd8892794375b1b95a898d8 (diff) | |
| download | org.eclipse.cdt-d916648fee2e45ad65944debfad71c20b4ca404c.tar.gz org.eclipse.cdt-d916648fee2e45ad65944debfad71c20b4ca404c.tar.xz org.eclipse.cdt-d916648fee2e45ad65944debfad71c20b4ca404c.zip | |
Fixed the bug related to the incorrect checking of the macros referenced in the environment variable definitions
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.ui/src')
| -rw-r--r-- | build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/EnvironmentBlock.java | 11 |
1 files 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); |