Refactor the Windows registry stuff from Defaults.py to Utils.py (Charles Crain).

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

diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 5b985959afc7937a050631e24ac747d32c43c7c4..056b1f30926b1ab92c4c2103cd1bf8679440b17b 100644 (file)
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -43,6 +43,7 @@ import SCons.Scanner.C
 import SCons.Scanner.Prog
 import string
 import SCons.Errors
+import SCons.Util
 
 CFile = SCons.Builder.Builder(name = 'CFile',
                               action = { '.l'    : '$LEXCOM',
@@ -82,40 +83,6 @@ Library = SCons.Builder.Builder(name = 'Library',
 
 CScan = SCons.Scanner.C.CScan()
 
-# attempt to load the windows registry module:
-_can_read_reg = 0
-try:
-    import _winreg
-
-    _can_read_reg = 1
-    hkey_mod = _winreg
-
-    RegOpenKeyEx = _winreg.OpenKeyEx
-    RegEnumKey = _winreg.EnumKey
-    RegEnumValue = _winreg.EnumValue
-    RegError = _winreg.error
-
-except ImportError:
-    try:
-        import win32api
-        import win32con
-        _can_read_reg = 1
-        hkey_mod = win32con
-
-        RegOpenKeyEx = win32api.RegOpenKeyEx
-        RegEnumKey = win32api.RegEnumKey
-        RegEnumValue = win32api.RegEnumValue
-        RegError = win32api.error
-
-    except ImportError:
-        pass
-
-if _can_read_reg:
-    HKEY_CLASSES_ROOT = hkey_mod.HKEY_CLASSES_ROOT
-    HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
-    HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
-    HKEY_USERS = hkey_mod.HKEY_USERS
-
 def get_devstudio_versions ():
     """
     Get list of devstudio versions from the Windows registry.  Return a
@@ -125,27 +92,27 @@ def get_devstudio_versions ():
     found.
     """
 
-    if not _can_read_reg:
+    if not SCons.Util.can_read_reg:
         raise InternalError, "No Windows registry module was found"
 
     K = 'Software\\Microsoft\\Devstudio'
     L = []
-    for base in (HKEY_CLASSES_ROOT,
-                 HKEY_LOCAL_MACHINE,
-                 HKEY_CURRENT_USER,
-                 HKEY_USERS):
+    for base in (SCons.Util.HKEY_CLASSES_ROOT,
+                 SCons.Util.HKEY_LOCAL_MACHINE,
+                 SCons.Util.HKEY_CURRENT_USER,
+                 SCons.Util.HKEY_USERS):
         try:
-            k = RegOpenKeyEx(base,K)
+            k = SCons.Util.RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
-                    p = RegEnumKey(k,i)
+                    p = SCons.Util.RegEnumKey(k,i)
                     if p[0] in '123456789' and p not in L:
                         L.append(p)
-                except RegError:
+                except SCons.Util.RegError:
                     break
                 i = i + 1
-        except RegError:
+        except SCons.Util.RegError:
             pass
     
     if not L:
@@ -171,22 +138,22 @@ def get_msvc_path (path, version, platform='x86'):
     K = ('Software\\Microsoft\\Devstudio\\%s\\' +
          'Build System\\Components\\Platforms\\Win32 (%s)\\Directories') % \
         (version,platform)
-    for base in (HKEY_CLASSES_ROOT,
-                 HKEY_LOCAL_MACHINE,
-                 HKEY_CURRENT_USER,
-                 HKEY_USERS):
+    for base in (SCons.Util.HKEY_CLASSES_ROOT,
+                 SCons.Util.HKEY_LOCAL_MACHINE,
+                 SCons.Util.HKEY_CURRENT_USER,
+                 SCons.Util.HKEY_USERS):
         try:
-            k = RegOpenKeyEx(base,K)
+            k = SCons.Util.RegOpenKeyEx(base,K)
             i = 0
             while 1:
                 try:
-                    (p,v,t) = RegEnumValue(k,i)
+                    (p,v,t) = SCons.Util.RegEnumValue(k,i)
                     if string.upper(p) == path:
                         return v
                     i = i + 1
-                except RegError:
+                except SCons.Util.RegError:
                     break
-        except RegError:
+        except SCons.Util.RegError:
             pass
 
     # if we got here, then we didn't find the registry entries:

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index e6ebd063064d8d53c821ae80689feef8fa3bd515..f4d5c2a9840d126b265a808838b3e5f9f92825c7 100644 (file)
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -425,3 +425,39 @@ def is_List(e):
 
 def is_String(e):
     return type(e) is types.StringType or isinstance(e, UserString)
+
+# attempt to load the windows registry module:
+can_read_reg = 0
+try:
+    import _winreg
+
+    can_read_reg = 1
+    hkey_mod = _winreg
+
+    RegOpenKeyEx = _winreg.OpenKeyEx
+    RegEnumKey = _winreg.EnumKey
+    RegEnumValue = _winreg.EnumValue
+    RegQueryValueEx = _winreg.QueryValueEx
+    RegError = _winreg.error
+
+except ImportError:
+    try:
+        import win32api
+        import win32con
+        can_read_reg = 1
+        hkey_mod = win32con
+
+        RegOpenKeyEx = win32api.RegOpenKeyEx
+        RegEnumKey = win32api.RegEnumKey
+        RegEnumValue = win32api.RegEnumValue
+        RegQueryValueEx = win32api.RegQueryValueEx
+        RegError = win32api.error
+
+    except ImportError:
+        pass
+
+if can_read_reg:
+    HKEY_CLASSES_ROOT = hkey_mod.HKEY_CLASSES_ROOT
+    HKEY_LOCAL_MACHINE = hkey_mod.HKEY_LOCAL_MACHINE
+    HKEY_CURRENT_USER = hkey_mod.HKEY_CURRENT_USER
+    HKEY_USERS = hkey_mod.HKEY_USERS