Add a flag to generate the Makefile in a different directory than...

pylib/gyp/__init__.py

 #!/usr/bin/python
 
 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import gyp.input
 import optparse
 import os.path
@@ skipping 247 matching lines @@
                     help='sets generator flag FLAG to VAL')
   parser.add_option('--generator-output', dest='generator_output',
                     action='store', default=None, metavar='DIR', type='path',
                     env_name='GYP_GENERATOR_OUTPUT',
                     help='puts generated build files under DIR')
   parser.add_option('--ignore-environment', dest='use_environment',
                     action='store_false', default=True, regenerate=False,
                     help='do not read options from environment variables')
   parser.add_option('--check', dest='check', action='store_true',
                     help='check format of gyp files')
+  parser.add_option('--toplevel-dir', dest='toplevel_dir', action='store',
+                    default=None, metavar='DIR', type='path',
+                    help='directory to use as the root of the source tree')
   # --no-circular-check disables the check for circular relationships between
   # .gyp files.  These relationships should not exist, but they've only been
   # observed to be harmful with the Xcode generator.  Chromium's .gyp files
   # currently have some circular relationships on non-Mac platforms, so this
   # option allows the strict behavior to be used on Macs and the lenient
   # behavior to be used elsewhere.
   # TODO(mark): Remove this option when http://crbug.com/35878 is fixed.
   parser.add_option('--no-circular-check', dest='circular_check',
                     action='store_false', default=True, regenerate=False,
                     help="don't check for circular relationships between files")
 
   # We read a few things from ~/.gyp, so set up a var for that.
   home_vars = ['HOME']
   if sys.platform in ('cygwin', 'win32'):
     home_vars.append('USERPROFILE')
   home = None
   for home_var in home_vars:
     home = os.getenv(home_var)
     if home != None:
       break
   home_dot_gyp = None
   if home != None:
     home_dot_gyp = os.path.join(home, '.gyp')
     if not os.path.exists(home_dot_gyp):
       home_dot_gyp = None
 
   # TODO(thomasvl): add support for ~/.gyp/defaults
 
-  (options, build_files_arg) = parser.parse_args(args)
+  options, build_files_arg = parser.parse_args(args)
   build_files = build_files_arg
 
   if not options.formats:
     # If no format was given on the command line, then check the env variable.
     generate_formats = []
     if options.use_environment:
       generate_formats = os.environ.get('GYP_GENERATORS', [])
     if generate_formats:
       generate_formats = re.split('[\s,]', generate_formats)
     if generate_formats:
@@ skipping 13 matching lines @@
     g_o = os.environ.get('GYP_GENERATOR_OUTPUT')
     if g_o:
       options.generator_output = g_o
 
   for mode in options.debug:
     gyp.debug[mode] = 1
 
   # Do an extra check to avoid work when we're not debugging.
   if DEBUG_GENERAL in gyp.debug.keys():
     DebugOutput(DEBUG_GENERAL, 'running with these options:')
-    for (option, value) in options.__dict__.items():
+    for option, value in sorted(options.__dict__.items()):
       if option[0] == '_':
         continue
       if isinstance(value, basestring):
         DebugOutput(DEBUG_GENERAL, "  %s: '%s'" % (option, value))
       else:
         DebugOutput(DEBUG_GENERAL, "  %s: %s" % (option, str(value)))
 
   if not build_files:
     build_files = FindBuildFiles()
   if not build_files:
@@ skipping 22 matching lines @@
       # build file.
       if options.depth:
         break
 
     if not options.depth:
       raise Exception, \
             'Could not automatically locate src directory.  This is a ' + \
             'temporary Chromium feature that will be removed.  Use ' + \
             '--depth as a workaround.'
 
+  # If toplevel-dir is not set, we assume that depth is the root of our source
+  # tree.
+  if not options.toplevel_dir:
+    options.toplevel_dir = options.depth
+
   # -D on the command line sets variable defaults - D isn't just for define,
   # it's for default.  Perhaps there should be a way to force (-F?) a
   # variable's value so that it can't be overridden by anything else.
   cmdline_default_variables = {}
   defines = []
   if options.use_environment:
     defines += ShlexEnv('GYP_DEFINES')
   if options.defines:
     defines += options.defines
   cmdline_default_variables = NameValueListToDict(defines)
@@ skipping 61 matching lines @@
     # need to have dependencies defined before dependents reference them should
     # generate targets in the order specified in flat_list.
     generator.GenerateOutput(flat_list, targets, data, params)
 
   # Done
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))