GN: Fix Windows Clang errors

tools/gyp_flag_compare.py

 #!/usr/bin/env python

[kjellander_webrtc, 2016/08/25 11:07:19]

Updating this script is good, but let's do that in another CL to reduce
confusion.

 
 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 """Given the output of -t commands from a ninja build for a gyp and GN generated
@@ skipping 94 matching lines @@
   for path in dict_of_list:
     dirname = os.path.dirname(path)
     r.setdefault(dirname, 0)
     r[dirname] += 1
   return r
 
 
 class Comparison(object):
   """A comparison of the currently-configured build for a target."""
 
-  def __init__(self, gyp_target, gn_target=None, gyp_dir=_DEFAULT_GYP_DIR,
+  def __init__(self, gyp_target=None, gn_target=None, gyp_dir=_DEFAULT_GYP_DIR,
                gn_dir=_DEFAULT_GN_DIR):
     """Creates a comparison of a GN and GYP target. If the target names differ
     between the two build systems, then two names may be passed.
     """
     if gn_target is None:
       gn_target = gyp_target
     self._gyp_target = gyp_target
     self._gn_target = gn_target
 
     self._gyp_dir = gyp_dir
@@ skipping 61 matching lines @@
 
   def _CompareFiles(self):
     """Performs the actual target comparison."""
     if sys.platform == 'win32':
       # On Windows flags are stored in .rsp files which are created by building.
       print >> sys.stderr, 'Building in %s...' % self._gn_dir
       Run('ninja -C %s -d keeprsp %s' % (self._gn_dir, self._gn_target))
       print >> sys.stderr, 'Building in %s...' % self._gyp_dir
       Run('ninja -C %s -d keeprsp %s' % (self._gyp_dir, self._gn_target))
 
-    gn = Run('ninja -C %s -t commands %s' % (self._gn_dir, self._gn_target))
-    gyp = Run('ninja -C %s -t commands %s' % (self._gyp_dir, self._gyp_target))
+    if self._gn_target is not None:
+      gn = Run('ninja -C %s -t commands %s' % (self._gn_dir, self._gn_target))
+      gyp = Run('ninja -C %s -t commands %s' % (self._gyp_dir,
+                                                self._gyp_target))
+    else:
+      gn = Run('ninja -C %s -t commands' % (self._gn_dir))
+      gyp = Run('ninja -C %s -t commands' % (self._gyp_dir))
 
     self._gn_flags = self._GetFlags(gn.splitlines(),
                                     os.path.join(os.getcwd(), self._gn_dir))
     self._gyp_flags = self._GetFlags(gyp.splitlines(),
                                      os.path.join(os.getcwd(), self._gyp_dir))
 
     self._gn_flags = dict((FilterChromium(filename), value)
                           for filename, value in self._gn_flags.iteritems())
     self._gyp_flags = dict((FilterChromium(filename), value)
                            for filename, value in self._gyp_flags.iteritems())
@@ skipping 172 matching lines @@
   return result
 
 
 def Run(command_line):
   """Run |command_line| as a subprocess and return stdout. Raises on error."""
   print >> sys.stderr, command_line
   return subprocess.check_output(command_line, shell=True)
 
 
 def main():
-  if len(sys.argv) < 4:
+  if len(sys.argv) < 3:
     print 'usage: %s gyp_dir gn_dir target' % __file__
     print '   or: %s gyp_dir gn_dir gyp_target gn_target' % __file__
     return 1
 
   gyp_dir = sys.argv[1]
   gn_dir = sys.argv[2]
 
-  gyp_target = sys.argv[3]
+  gyp_target = gn_target = None
+
   if len(sys.argv) == 4:
+    gyp_target = sys.argv[3]
     gn_target = gyp_target
-  else:
+  elif len(sys.argv) == 5:
+    gyp_target = sys.argv[3]
     gn_target = sys.argv[4]
 
   print 'GYP output directory is %s' % gyp_dir
   print 'GN output directory is %s' % gn_dir
 
   comparison = Comparison(gyp_target, gn_target, gyp_dir, gn_dir)
 
   gyp_files = comparison.gyp_files
   gn_files = comparison.gn_files
   different_source_list = comparison.gyp_files != comparison.gn_files
@@ skipping 28 matching lines @@
     print '\n'.join(sorted(files))
     print diff
 
   print 'Total differences:', comparison.total_differences
   # TODO(scottmg): Return failure on difference once we're closer to identical.
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())