grit complete CL

build/gyp_chromium

 #!/usr/bin/env python
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script is wrapper for Chromium that adds some support for how GYP
 # is invoked by Chromium beyond what can be done in the gclient hooks.
 
+import cProfile

[Mark Mentovai, 2011/05/16 16:42:54]

Unneeded?

 import glob
 import os
 import shlex
 import subprocess
 import sys
 
 script_dir = os.path.dirname(__file__)
 chrome_src = os.path.abspath(os.path.join(script_dir, os.pardir))
 
+# Insert grit into path so that gyp can find it. This speeds gyp up
+# considerably.
+sys.path.insert(0, os.path.join(chrome_src, 'tools', 'grit'))

[Mark Mentovai, 2011/05/16 16:42:54]

I find this hard to follow on a quick glance. You’re putting tools/grit into
sys.path after tools/gyp/pylib, but you’re doing the insertions backwards. I
think you should put this sys.path.insert after the existing one for
tools/gyp/pylib, and insert it at position 1. Nobody says you need to use 0 for
each sys.path.insert.

+
 sys.path.insert(0, os.path.join(chrome_src, 'tools', 'gyp', 'pylib'))
 import gyp
 
 # On Windows, Psyco shortens warm runs of build/gyp_chromium by about
 # 20 seconds on a z600 machine with 12 GB of RAM, from 90 down to 70
 # seconds.  Conversely, memory usage of build/gyp_chromium with Psyco
 # maxes out at about 158 MB vs. 132 MB without it.
 #
 # Psyco uses native libraries, so we need to load a different
 # installation depending on which OS we are running under. It has not
@@ skipping 59 matching lines @@
   AddInclude(os.path.join(script_dir, 'common.gypi'))
   AddInclude(os.path.join(script_dir, 'features_override.gypi'))
 
   # Optionally add supplemental .gypi files if present.
   supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))
   for supplement in supplements:
     AddInclude(supplement)
 
   return result
 
-if __name__ == '__main__':
+def main():
   args = sys.argv[1:]
 
   # Use the Psyco JIT if available.
   if psyco:
     psyco.profile()
     print "Enabled Psyco JIT."
 
   # Fall back on hermetic python if we happen to get run under cygwin.
   # TODO(bradnelson): take this out once this issue is fixed:
   #    http://code.google.com/p/gyp/issues/detail?id=177
@@ skipping 49 matching lines @@
   # to enfore syntax checking.
   syntax_check = os.environ.get('CHROMIUM_GYP_SYNTAX_CHECK')
   if syntax_check and int(syntax_check):
     args.append('--check')
 
   print 'Updating projects from gyp files...'
   sys.stdout.flush()
 
   # Off we go...
   sys.exit(gyp.main(args))
+
+

[Mark Mentovai, 2011/05/16 16:42:54]

This file seems to use only one blank line between things.

+if __name__ == '__main__':
+  #cProfile.run('main()', 'profile')

[Mark Mentovai, 2011/05/16 16:42:54]

Unneeded?

+  main()

[Mark Mentovai, 2011/05/16 16:42:54]

sys.exit(main(sys.argv[1:])) instead, and adjust main accordingly?

Might make it easier in the future if someone wants to wrap gyp_chromium in the
same way you’re now trying to wrap grit_info.