Make -U be case insensitive on Win32 (Bug 589292) (Anthony Roach)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index d2fe1a0ef42ddfb8fcdc76e778e0e6d3fe33126d..30f8eb958c1a3a0658d8d9e85c384f35b071640d 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,20 @@
 
 
 
+RELEASE 0.09 - 
+
+ From Anthony Roach:
+
+ - Fixed use of command lines with spaces in their arguments,
+   and use of Nodes with spaces in their string representation.
+
+ - Make access and modification times of files in a BuildDir match
+   the source file, even when hard linking isn't available.
+
+ - Make -U be case insensitive on Win32 systems.
+
+
+
 RELEASE 0.08 - Mon, 15 Jul 2002 12:08:51 -0500
 
   From Charles Crain:

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 17a12562e4b9e000b46b31c50f1809bdb295c918..a00c7347d84a59c3b535f5ba7a9acac63d2ee417 100644 (file)
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -969,8 +969,10 @@ def _main():
         elif climb_up == 3 and not targets:
             # -U with default targets
             default_targets = SCons.Script.SConscript.default_targets
-            default_targets = filter(lambda x: x.cwd.srcpath == str(target_top),
-                                     default_targets)
+            def check_dir(x):
+                cwd = SCons.Node.FS.default_fs.Dir(x.cwd.srcpath)
+                return cwd == target_top
+            default_targets = filter(check_dir, default_targets)
             SCons.Script.SConscript.default_targets = default_targets
             target_top = None
 

diff --git a/test/option--U.py b/test/option--U.py
index 013b81fdebb62d6c1b094a39b4d1d6b3ece30712..003bce18ea9d3fad458442c0e79871ad871c11cd 100644 (file)
--- a/test/option--U.py
+++ b/test/option--U.py
@@ -24,6 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import os
 import os.path
 import sys
 
@@ -43,10 +44,10 @@ file.write(contents)
 file.close()
 """)
 
-test.write('SConstruct', """
+test.write('SConstruct', r"""
 import SCons.Defaults
 env = Environment()
-env['BUILDERS']['B'] = Builder(action='%s build.py $TARGET $SOURCES', multi=1)
+env['BUILDERS']['B'] = Builder(action=r'%s build.py $TARGET $SOURCES', multi=1)
 Default(env.B(target = 'sub1/foo.out', source = 'sub1/foo.in'))
 Export('env')
 SConscript('sub2/SConscript')
@@ -92,8 +93,13 @@ test.fail_test(os.path.exists(test.workpath('sub3', 'baz.out')))
 test.fail_test(os.path.exists(test.workpath('bar.out')))
 test.fail_test(os.path.exists(test.workpath('sub2/xxx.out')))
 
-test.write('SConscript', """assert GetLaunchDir() == r'%s'"""%test.workpath('sub2'))
-test.run(chdir = 'sub2', arguments = '-U')
+
+if sys.platform == 'win32':
+    test.write('SConscript', """assert GetLaunchDir() == r'%s'"""%test.workpath('SUB2'))
+    test.run(chdir = 'SUB2', arguments = '-U')
+else:
+    test.write('SConscript', """assert GetLaunchDir() == r'%s'"""%test.workpath('sub2'))
+    test.run(chdir = 'sub2', arguments = '-U')
 test.fail_test(os.path.exists(test.workpath('sub1', 'foo.out')))
 test.fail_test(not os.path.exists(test.workpath('sub2', 'bar.out')))
 test.fail_test(not os.path.exists(test.workpath('sub2b', 'bar.out')))