Add %SYSTEMDRIVE% to the list of Windows variables preserved. (Chris Prince)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1324 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index cb58f68b4f72792c9105f7ae0ea95f1af29006ae..5db1f53ad0e45c6eba1656a18281b571abc47a72 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1028,8 +1028,10 @@ and suffixes appropriate for the platform.
 Note that the
 .B win32
 platform adds the
+.B SYSTEMDRIVE
+and
 .B SYSTEMROOT
-variable from the user's external environment
+variables from the user's external environment
 to the construction environment's
 .B ENV
 dictionary.
@@ -3633,8 +3635,10 @@ env.Platform('posix')
 Note that the
 .B win32
 platform adds the
+.B SYSTEMDRIVE
+and
 .B SYSTEMROOT
-variable from the user's external environment
+variables from the user's external environment
 to the construction environment's
 .B ENV
 dictionary.

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 88b202beb65e9a6de024118f633c4fc41194f623..b01a41dfd40d43c02cbdda0ea9caa48467016a5f 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -448,6 +448,9 @@ RELEASE 0.97 - XXX
   - Look in the right directory, not always the local directory, for a
     same-named file or directory conflict on disk.
 
+  - On Windows, preserve the external environment's %SYSTEMDRIVE%
+    variable, too.
+
   From Kevin Quick:
 
   - Fix the Builder name returned from ListBuilders and other instances

diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py
index 6faf606d70a9ca2bac1bc8e5d4c9e54866005882..6188098735f688921531bc85f9acfd4be30b3f73 100644 (file)
--- a/src/engine/SCons/Platform/win32.py
+++ b/src/engine/SCons/Platform/win32.py
@@ -232,9 +232,11 @@ def generate(env):
     # environment's ENV.  This is a potential slippery slope, because we
     # *don't* want to make builds dependent on the user's environment by
     # default.  We're doing this for SYSTEMROOT, though, because it's
-    # needed for anything that uses sockets, and seldom changes.  Weigh
-    # the impact carefully before adding other variables to this list.
-    import_env = [ 'SYSTEMROOT', 'TEMP', 'TMP' ]
+    # needed for anything that uses sockets, and seldom changes, and
+    # for SYSTEMDRIVE because it's related.
+    #
+    # Weigh the impact carefully before adding other variables to this list.
+    import_env = [ 'SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP' ]
     for var in import_env:
         v = os.environ.get(var)
         if v: