Forward the Scanner.Classic name to the underlying base class.

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 20c3b356b533deefbf94653b47094671795ad219..a95aab0f9d60e3275359efe854415a3f7ab35ad7 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,6 +10,14 @@ r __COPYRIGHT__
 
 RELEASE 0.96 - XXX
 
+  From Chad Austin:
+
+  - Make the CacheDir() directory if it doesn't already exist.
+
+  From Chris Hoeppler:
+
+  - Initialize the name of a Scanner.Classic scanner correctly.
+
   From Steven Knight:
 
   - Add an Execute() method for executing actions directly.

diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py
index 169c74c89ca3109e0a2cf8e31efcfe35ede78ce2..10515803ab6df4f8b163bb85a6a5d034f1c6d4e7 100644 (file)
--- a/src/engine/SCons/Scanner/ScannerTests.py
+++ b/src/engine/SCons/Scanner/ScannerTests.py
@@ -233,6 +233,11 @@ class ClassicTestCase(unittest.TestCase):
         finally:
             SCons.Node.FS.find_file = save
 
+    def test_name(self):
+        """Test setting the Scanner.Classic name"""
+        s = SCons.Scanner.Classic("my_name", ['.s'], 'MYPATH', '^my_inc (\S+)')
+        assert s.name == "my_name", s.name
+
     def test_scan(self):
         """Test the Scanner.Classic scan() method"""
         class MyNode:

diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index dc9abc381027d48e43d7a791693dc0128a555cbe..c59480e9ed1be6359dfb08d4faae278fe49d73a9 100644 (file)
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -224,6 +224,7 @@ class Classic(Current):
         kw['path_function'] = FindPathDirs(path_variable, fs)
         kw['recursive'] = 1
         kw['skeys'] = suffixes
+        kw['name'] = name
 
         apply(Current.__init__, (self,) + args, kw)