Bug 925894 - Normalize cl generated dependencies before testing for spaces in them. p=glandium, r=gps
authorJohn Hopkins <jhopkins@mozilla.com>
Wed, 16 Oct 2013 14:13:14 -0400
changeset 164878 df950d461d3ee0f74c02c87e3b361e8dfaa335a4
parent 164877 27a00d5fa55dd0d9d1f77ee6161e927575ae353d
child 164879 aa29389b72f3f31e6bf5da45557e5f5b3d26a24b
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs925894
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 925894 - Normalize cl generated dependencies before testing for spaces in them. p=glandium, r=gps
build/cl.py
js/src/build/cl.py
--- a/build/cl.py
+++ b/build/cl.py
@@ -71,18 +71,19 @@ def InvokeClWithDependencyGeneration(cmd
     def on_line(line):
         # cl -showIncludes prefixes every header with "Note: including file:"
         # and an indentation corresponding to the depth (which we don't need)
         if line.startswith(CL_INCLUDES_PREFIX):
             dep = line[len(CL_INCLUDES_PREFIX):].strip()
             # We can't handle pathes with spaces properly in mddepend.pl, but
             # we can assume that anything in a path with spaces is a system
             # header and throw it away.
+            dep = normcase(dep)
             if ' ' not in dep:
-                rule.add_dependencies([normcase(dep)])
+                rule.add_dependencies([dep])
         else:
             # Make sure we preserve the relevant output from cl. mozprocess
             # swallows the newline delimiter, so we need to re-add it.
             sys.stdout.write(line)
             sys.stdout.write('\n')
 
     # We need to ignore children because MSVC can fire up a background process
     # during compilation. This process is cleaned up on its own. If we kill it,
--- a/js/src/build/cl.py
+++ b/js/src/build/cl.py
@@ -71,18 +71,19 @@ def InvokeClWithDependencyGeneration(cmd
     def on_line(line):
         # cl -showIncludes prefixes every header with "Note: including file:"
         # and an indentation corresponding to the depth (which we don't need)
         if line.startswith(CL_INCLUDES_PREFIX):
             dep = line[len(CL_INCLUDES_PREFIX):].strip()
             # We can't handle pathes with spaces properly in mddepend.pl, but
             # we can assume that anything in a path with spaces is a system
             # header and throw it away.
+            dep = normcase(dep)
             if ' ' not in dep:
-                rule.add_dependencies([normcase(dep)])
+                rule.add_dependencies([dep])
         else:
             # Make sure we preserve the relevant output from cl. mozprocess
             # swallows the newline delimiter, so we need to re-add it.
             sys.stdout.write(line)
             sys.stdout.write('\n')
 
     # We need to ignore children because MSVC can fire up a background process
     # during compilation. This process is cleaned up on its own. If we kill it,