Make the drive letters on Windows always be the same case, so that changes in the...

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ad07cf7d73f353406d88b021e4a29633e095970b..a5551aa256559724a65346cb9a603161d233b5d7 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -40,6 +40,9 @@ RELEASE 0.08 -
   - Fix --implicit-cache when a file has no implicit dependencies and
     its source is generated.
 
+  - Make the drive letters on Windows always be the same case, so that
+    changes in the case of drive letters don't cause a rebuild.
+
   From Zed Shaw:
 
   - Add an Append() method to Environments, to append values to

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 61cd80c6f3bab2494361c5bea138ebf40321580b..d18300697c1a18aa5c70b8046fc124a3ca142a09 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -152,9 +152,9 @@ class FS:
         drive, path_first = os.path.splitdrive(path_comp[0])
         if not path_first:
             # Absolute path
-            drive_path = _my_normcase(drive)
+            drive = _my_normcase(drive)
             try:
-                directory = self.Root[drive_path]
+                directory = self.Root[drive]
             except KeyError:
                 if not create:
                     raise UserError
@@ -162,7 +162,7 @@ class FS:
                 dir.path = dir.path + os.sep
                 dir.abspath = dir.abspath + os.sep
                 dir.srcpath = dir.srcpath + os.sep
-                self.Root[drive_path] = dir
+                self.Root[drive] = dir
                 directory = dir
             path_comp = path_comp[1:]
         else:

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 7912abb3400ec37bf9eb635dcfa8d0d54b6bed64..c66b99c872b1be878c93f8100a9986bff2802be1 100644 (file)
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -47,8 +47,19 @@ except ImportError:
     class UserString:
         pass
 
-
-
+def updrive(path):
+    """
+    Make the drive letter (if any) upper case.
+    This is useful because Windows is inconsitent on the case
+    of the drive letter, which can cause inconsistencies when
+    calculating command signatures.
+    """
+    drive, rest = os.path.splitdrive(path)
+    if drive:
+       return os.path.join(string.upper(drive),rest)
+    else:
+       return path
+       
 class PathList(UserList.UserList):
     """This class emulates the behavior of a list, but also implements
     the special "path dissection" attributes we can use to find
@@ -118,7 +129,7 @@ class PathList(UserList.UserList):
 
     def __getAbsPath(self):
         """Return the absolute path"""
-        return map(os.path.abspath, self.data)
+       return map(lambda x: updrive(os.path.abspath(x)), self.data)
 
     dictSpecialAttrs = { "file" : __getFileName,
                          "base" : __getBasePath,

diff --git a/test/win32pathmadness.py b/test/win32pathmadness.py
new file mode 100644 (file)
index 0000000..7c0088c
--- /dev/null
+++ b/test/win32pathmadness.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# 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.
+#
+
+"""
+This test verifies that the build command signatures do not depend on
+the case of the drive letter on Windows. This is important because Windows is 
+inconsistent about which case is used for the drive letter.
+"""
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import TestSCons
+import sys
+import TestCmd
+import string
+import os.path
+
+test = TestSCons.TestSCons(match=TestCmd.match_re)
+
+if sys.platform != 'win32':
+    test.pass_test()
+
+test.subdir('src', 'build', 'include', 'src2')
+
+test.write('src/SConstruct', """
+env=Environment(LIBS=['../build/foo'], CPPPATH=['../include'], CCCOM='$CC $CCFLAGS $CPPFLAGS $_INCFLAGS /c ${SOURCES.abspath} /Fo$TARGET')
+foo=env.Object('../build/foo', 'foo.c')
+Default(env.Library('../build/foo', foo))
+Default(env.Library('../build/bar', 'bar.c', shared=1))
+Default(env.Program('../build/bar', ['main.c', '../src2/blat.c', '../build/bar.lib']))
+""")
+
+test.write('src/foo.c', """
+int foo(void) 
+{ 
+    return 1;
+}
+""")
+
+test.write('src/bar.c', """
+__declspec(dllexport) int bar(void) 
+{ 
+    return 1;
+}
+""")
+
+test.write('src/main.c', """
+#include <bar.h>
+int main(void) 
+{ 
+    return 1;
+}
+""")
+
+test.write('src2/blat.c', """
+int blat(void) 
+{ 
+    return 1;
+}
+""")
+
+test.write('include/bar.h', """
+int foo(void);
+int blat(void);
+int bar(void);
+""")
+
+drive,rest = os.path.splitdrive(test.workpath('src'))
+upper = os.path.join(string.upper(drive),rest)
+lower = os.path.join(string.lower(drive),rest)
+
+test.run(chdir=upper)
+test.run(chdir=lower, stdout="""\
+scons: .* is up to date.
+scons: .* is up to date.
+scons: .* is up to date.
+""")
+
+test.pass_test()
+