diff options
| author | Steven Knight <knight@baldmt.com> | 2005-08-13 00:56:13 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-08-13 00:56:13 (GMT) |
| commit | 90376f36df71401df8e7cf71fead9b7869153159 (patch) | |
| tree | b2ee287041efacbaaa6f4cdd226f62590bff0e09 | |
| parent | 055a212a12d75036cdfbaf2b954e39908a2fbac1 (diff) | |
| download | SCons-90376f36df71401df8e7cf71fead9b7869153159.zip SCons-90376f36df71401df8e7cf71fead9b7869153159.tar.gz SCons-90376f36df71401df8e7cf71fead9b7869153159.tar.bz2 | |
Add %SYSTEMDRIVE% to the list of Windows variables preserved. (Chris Prince)
| -rw-r--r-- | doc/man/scons.1 | 8 | ||||
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 8 |
3 files changed, 14 insertions, 5 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1 index cb58f68..5db1f53 100644 --- 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 88b202b..b01a41d 100644 --- 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 6faf606..6188098 100644 --- 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: |