Commits

Steven Knight  committed 5999f53

Use consistent spelling of SystemDrive and SystemRoot for those
environment variables.

  • Participants
  • Parent commits 81c52f0
  • Branches vs_revamp

Comments (0)

Files changed (6)

File QMTest/scons_tdb.py

    'MSDEVDIR',
    'OS',
    'PATHEXT',
-   'SYSTEMROOT',
+   'SystemRoot',
    'TEMP',
    'TMP',
    'USERNAME',

File bin/scons-test.py

         'MSDEVDIR',
         'OS',
         'PATHEXT',
-        'SYSTEMROOT',
+        'SystemRoot',
         'TEMP',
         'TMP',
         'USERNAME',

File doc/man/scons.1

 Note that the
 .B win32
 platform adds the
-.B SYSTEMDRIVE
+.B SystemDrive
 and
-.B SYSTEMROOT
+.B SystemRoot
 variables from the user's external environment
 to the construction environment's
 .B ENV
 P4PASSWD,
 P4PORT,
 P4USER,
-SYSTEMROOT,
+SystemRoot,
 USER,
 and
 USERNAME.
 Note that the
 .B win32
 platform adds the
-.B SYSTEMDRIVE
+.B SystemDrive
 and
-.B SYSTEMROOT
+.B SystemRoot
 variables from the user's external environment
 to the construction environment's
 .B ENV

File src/engine/SCons/Platform/win32.py

         return _system_root
 
     # A resonable default if we can't read the registry
-    val = os.environ.get('SYSTEMROOT', "C:/WINDOWS")
+    val = os.environ.get('SystemRoot', "C:/WINDOWS")
 
     if SCons.Util.can_read_reg:
         try:
     # 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:

File src/engine/SCons/Tool/Perforce.py

 
 # 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')
 

File test/QT/installed.py

                   ENV={'PATH':ENV_PATH,
                        'PATHEXT':os.environ.get('PATHEXT'),
                        'HOME':os.getcwd(),
-                       'SYSTEMROOT':ENV.get('SYSTEMROOT')},
+                       'SystemRoot':ENV.get('SystemRoot')},
                        # moc / uic want to write stuff in ~/.qt
                   CXXFILESUFFIX=".cpp")