Added new command line option: --allow-duplicate-basenames

pylib/gyp/__init__.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 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 29 matching lines @@
   files = os.listdir(os.getcwd())
   build_files = []
   for file in files:
     if file.endswith(extension):
       build_files.append(file)
   return build_files
 
 
 def Load(build_files, format, default_variables={},
          includes=[], depth='.', params=None, check=False,
-         circular_check=True):
+         circular_check=True, allow_duplicates=False):
   """
   Loads one or more specified build files.
   default_variables and includes will be copied before use.
   Returns the generator for the specified format and the
   data returned by loading the specified build files.
   """
   if params is None:
     params = {}
 
   flavor = None
@@ skipping 58 matching lines @@
     'generator_wants_static_library_dependencies_adjusted':
         getattr(generator,
                 'generator_wants_static_library_dependencies_adjusted', True),
     'generator_wants_sorted_dependencies':
         getattr(generator, 'generator_wants_sorted_dependencies', False),
   }
 
   # Process the input specific to this generator.
   result = gyp.input.Load(build_files, default_variables, includes[:],
                           depth, generator_input_info, check, circular_check,
-                          params['parallel'])
+                          allow_duplicates, params['parallel'])
   return [generator] + result
 
 def NameValueListToDict(name_value_list):
   """
   Takes an array of strings of the form 'NAME=VALUE' and creates a dictionary
   of the pairs.  If a string is simply NAME, then the value in the dictionary
   is set to True.  If VALUE can be converted to an integer, it is.
   """
   result = { }
   for item in name_value_list:
@@ skipping 184 matching lines @@
   # --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")
+  parser.add_option('--allow-duplicate-basenames', dest='allow_duplicates',
+                    default=False, help='Allow duplicate file basenames ' +
+                                        '(may not work for MSVC08)')
 
   # 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
   home_dot_gyp = None
   for home_var in home_vars:
     home = os.getenv(home_var)
     if home != None:
@@ skipping 142 matching lines @@
     params = {'options': options,
               'build_files': build_files,
               'generator_flags': generator_flags,
               'cwd': os.getcwd(),
               'build_files_arg': build_files_arg,
               'gyp_binary': sys.argv[0],
               'home_dot_gyp': home_dot_gyp,
               'parallel': options.parallel}
 
     # Start with the default variables from the command line.
-    [generator, flat_list, targets, data] = Load(build_files, format,
+    [generator, flat_list, targets, data] = Load(build_files,
+                                                 format,
                                                  cmdline_default_variables,
-                                                 includes, options.depth,
-                                                 params, options.check,
-                                                 options.circular_check)
+                                                 includes,
+                                                 options.depth,
+                                                 params,
+                                                 options.check,
+                                                 options.circular_check,
+                                                 options.allow_duplicates)
 
     # TODO(mark): Pass |data| for now because the generator needs a list of
     # build files that came in.  In the future, maybe it should just accept
     # a list, and not the whole data dict.
     # NOTE: flat_list is the flattened dependency graph specifying the order
     # that targets may be built.  Build systems that operate serially or that
     # 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)
 
@@ skipping 10 matching lines @@
 
 def main(args):
   try:
     return gyp_main(args)
   except GypError, e:
     sys.stderr.write("gyp: %s\n" % e)
     return 1
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))