[Jcl-checkins-diff] SF.net SVN: jcl:[2776] trunk/jcl/source/common/JclBorlandTools.pas

[<ou...@us...>]

Revision: 2776
          http://jcl.svn.sourceforge.net/jcl/?rev=2776&view=rev
Author:   outchy
Date:     2009-05-30 11:15:10 +0000 (Sat, 30 May 2009)

Log Message:
-----------
Mantis 4731: TJclBorRADToolInstallation.SubstitutePath doesn't substitute System Variables.

Modified Paths:
--------------
    trunk/jcl/source/common/JclBorlandTools.pas

Modified: trunk/jcl/source/common/JclBorlandTools.pas
===================================================================
--- trunk/jcl/source/common/JclBorlandTools.pas	2009-05-30 11:05:11 UTC (rev 2775)
+++ trunk/jcl/source/common/JclBorlandTools.pas	2009-05-30 11:15:10 UTC (rev 2776)
@@ -47,7 +47,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                        $ }
+{ Last modified: $Date::                                                                         $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -3700,6 +3700,14 @@
   if FEnvironmentVariables = nil then
   begin
     FEnvironmentVariables := TStringList.Create;
+
+    // at first get system environment variables
+    JclSysInfo.GetEnvironmentVars(FEnvironmentVariables, True);
+    for I := FEnvironmentVariables.count-1 downto 0 do
+      if FEnvironmentVariables.Names[I] = EmptyStr then
+        FEnvironmentVariables.Delete(I);
+
+    // read environment variable overrides
     if ((VersionNumber >= 6) or (RadToolKind = brBorlandDevStudio)) and
       ConfigData.SectionExists(EnvVariablesKeyName) then
     begin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.