diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-19 22:27:45 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-19 22:27:45 (GMT) |
| commit | 0ffaa445c912caef643ad78e2203c7463ca388ab (patch) | |
| tree | 3ed11b71685a544eb2fafacc1a95dfccd82f6ea8 /src | |
| parent | 29ad561d6bb373384273e24047efa79a88d406e7 (diff) | |
| download | SCons-0ffaa445c912caef643ad78e2203c7463ca388ab.zip SCons-0ffaa445c912caef643ad78e2203c7463ca388ab.tar.gz SCons-0ffaa445c912caef643ad78e2203c7463ca388ab.tar.bz2 | |
Spell the Windows environment variables consistently "SystemDrive"
and "SystemRoot" instead of "SYSTEMDRIVE" and "SYSTEMROOT".
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 12 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/Perforce.py | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 6eb5d5b..6d5aa37 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -39,6 +39,9 @@ RELEASE X.X.X - XXX for the Microsoft linker, the OS/2 ilink linker and the Phar Lap linkloc linker. + - Spell the Windows environment variables consistently "SystemDrive" + and "SystemRoot" instead of "SYSTEMDRIVE" and "SYSTEMROOT". + From Robert P. J. Day: - User's Guide updates. diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 79d73b3..890b925 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -192,7 +192,7 @@ def escape(x): def get_system_root(): # A resonable default if we can't read the registry try: - val = os.environ['SYSTEMROOT'] + val = os.environ['SystemRoot'] except KeyError: val = "C:/WINDOWS" pass @@ -268,8 +268,8 @@ def generate(env): # contain an ENV and a PATH. if not cmd_interp: systemroot = r'C:\Windows' - if os.environ.has_key('SYSTEMROOT'): - systemroot = os.environ['SYSTEMROOT'] + if os.environ.has_key('SystemRoot'): + systemroot = os.environ['SystemRoot'] tmp_path = systemroot + os.pathsep + \ os.path.join(systemroot,'System32') tmp_pathext = '.com;.exe;.bat;.cmd' @@ -291,12 +291,12 @@ def generate(env): # Import things from the external environment to the construction # 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 + # default. We're doing this for SystemRoot, though, because it's # needed for anything that uses sockets, and seldom changes, and - # for SYSTEMDRIVE because it's related. + # for SystemDrive because it's related. # # Weigh the impact carefully before adding other variables to this list. - import_env = [ 'SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP' ] + import_env = [ 'SystemDrive', 'SystemRoot', 'TEMP', 'TMP' ] for var in import_env: v = os.environ.get(var) if v: diff --git a/src/engine/SCons/Tool/Perforce.py b/src/engine/SCons/Tool/Perforce.py index ba3a953..8d30d12 100644 --- a/src/engine/SCons/Tool/Perforce.py +++ b/src/engine/SCons/Tool/Perforce.py @@ -47,7 +47,7 @@ from SCons.Tool.PharLapCommon import addPathIfNotExists # Variables that we want to import from the base OS environment. _import_env = [ 'P4PORT', 'P4CLIENT', 'P4USER', 'USER', 'USERNAME', 'P4PASSWD', - 'P4CHARSET', 'P4LANGUAGE', 'SYSTEMROOT' ] + 'P4CHARSET', 'P4LANGUAGE', 'SystemRoot' ] PerforceAction = SCons.Action.Action('$P4COM', '$P4COMSTR') |