Updated fix for bug 2082 adding support for D3DFX keyword and fixing python 1.5.2...

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

diff --git a/src/engine/SCons/Scanner/RC.py b/src/engine/SCons/Scanner/RC.py
index d7c68702dd60334901f71d68d4cf320ce37e7a50..529cb5d3a46c9d741cf884ec30e9df62f15c03c5 100644 (file)
--- a/src/engine/SCons/Scanner/RC.py
+++ b/src/engine/SCons/Scanner/RC.py
@@ -38,9 +38,9 @@ def RCScan():
     """Return a prototype Scanner instance for scanning RC source files"""
  
     res_re= r'^(?:\s*#\s*(?:include)|' \
-            '.*?\s+(?:ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY)' \
+            '.*?\s+(?:ICON|BITMAP|CURSOR|HTML|FONT|MESSAGETABLE|TYPELIB|REGISTRY|D3DFX)' \
             '\s*.*?)' \
-            '\s*(<|"| )([^>" \Z\t]+)(?:[>" ])*$'
+            '\s*(<|"| )([^>"\s]+)(?:[>" ])*$'
     resScanner = SCons.Scanner.ClassicCPP( "ResourceScanner",
                                            "$RCSUFFIXES",
                                            "CPPPATH",

diff --git a/src/engine/SCons/Scanner/RCTests.py b/src/engine/SCons/Scanner/RCTests.py
index 61dbfb15b3c769f88bf6be6608b68cbf047d9645..c7ac3e478cb64abfcab5b5f768c8375a7402ff15 100644 (file)
--- a/src/engine/SCons/Scanner/RCTests.py
+++ b/src/engine/SCons/Scanner/RCTests.py
@@ -54,12 +54,15 @@ ID_RESPONSE_ERROR_PAGE  HTML  "responseerrorpage.htm"
 1  MESSAGETABLE MSG00410.bin
 1 TYPELIB "testtypelib.tlb"
 TEST_REGIS   REGISTRY MOVEABLE PURE  "testregis.rgs"
+TEST_D3DFX   D3DFX DISCARDABLE "testEffect.fx"
+
 """)
 
 
 # Create dummy include files
 headers = ['t1.h',
            'abc.ico','def.bmp','bullseye.cur','responseerrorpage.htm','cmroman.fnt',
+           'testEffect.fx',
            'MSG00409.bin','MSG00410.bin','testtypelib.tlb','testregis.rgs']
 
 for h in headers:
@@ -140,6 +143,7 @@ class RCScannerTestCase2(unittest.TestCase):
                    'MSG00409.bin',
                    'responseerrorpage.htm',
                    't1.h',
+                   'testEffect.fx',
                    'testregis.rgs','testtypelib.tlb']
         deps_match(self, deps, headers)