Support importing Platform and Tool specifications directly.

5 files changed, 98 insertions, 3 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 6ae86ec..e519fd2 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -74,6 +74,9 @@ RELEASE 0.11 - XXX
     --standalone-lib, and --version-lib options for easier user
     control of where the libraries get installed.
 
+  - Fix the ability to directly import and use Platform and Tool modules
+    that have been implicitly imported into an Environment().
+
   From Steve Leblanc:
 
   - Fix the output of -c -n when directories are involved, so it
diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py
index 90bb27c..565c2a0 100644
--- a/src/engine/SCons/Platform/__init__.py
+++ b/src/engine/SCons/Platform/__init__.py
@@ -88,7 +88,8 @@ def platform_module(name = platform_default()):
             try:
                 file, path, desc = imp.find_module(name,
                                         sys.modules['SCons.Platform'].__path__)
-                imp.load_module(full_name, file, path, desc)
+                mod = imp.load_module(full_name, file, path, desc)
+                setattr(SCons.Platform, name, mod)
             except ImportError:
                 raise SCons.Errors.UserError, "No platform named '%s'" % name
             if file:
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 19a3cff..7002606 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -59,7 +59,8 @@ def Tool(name, platform = None):
         try:
             file, path, desc = imp.find_module(name,
                                         sys.modules['SCons.Tool'].__path__)
-            imp.load_module(full_name, file, path, desc)
+            mod = imp.load_module(full_name, file, path, desc)
+            setattr(SCons.Tool, name, mod)
         except ImportError:
             raise SCons.Errors.UserError, "No tool named '%s'" % name
         if file:
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 4c80d19..0d64e03 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -621,7 +621,9 @@ except ImportError:
         RegError = win32api.error
 
     except ImportError:
-        pass
+        class _NoError(Exception):
+            pass
+        RegError = _NoError
 
 if can_read_reg:
     HKEY_CLASSES_ROOT = hkey_mod.HKEY_CLASSES_ROOT
diff --git a/test/import.py b/test/import.py
new file mode 100644
index 0000000..76c003b
--- /dev/null
+++ b/test/import.py
@@ -0,0 +1,88 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify that we can import and use the contents of Platform and Tool
+modules directly.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+platforms = ['cygwin', 'irix', 'os2', 'posix', 'win32']
+
+for platform in platforms:
+    test.write('SConstruct', """
+env = Environment(platform = '%s')
+import SCons.Platform.%s
+x = SCons.Platform.%s.generate
+""" % (platform, platform, platform))
+    test.run()
+
+tools = [
+    # Can't import '386asm' directly due to initial '3' syntax error...
+    'ar',
+    'default',
+    'dvipdf',
+    'dvips',
+    'g77',
+    'gas',
+    'gcc',
+    'gnulink',
+    # Can't import 'g++' directly due to '+' syntax error...
+    'icc',
+    'ifl',
+    'ilink',
+    'latex',
+    'lex',
+    # Can't import 'linkloc' everywhere due to Windows registry dependency...
+    'masm',
+    'mingw',
+    'mslib',
+    'mslink',
+    'msvc',
+    'nasm',
+    'pdflatex',
+    'pdftex',
+    'sgias',
+    'sgicc',
+    'sgif77',
+    'sgilink',
+    'tar',
+    'tex',
+    'yacc',
+]
+
+for tool in tools:
+    test.write('SConstruct', """
+env = Environment(tools = ['%s'])
+import SCons.Tool.%s
+x = SCons.Tool.%s.generate
+""" % (tool, tool, tool))
+    test.run()
+
+test.pass_test()