| Index: pylib/gyp/__init__.py
 | 
| ===================================================================
 | 
| --- pylib/gyp/__init__.py	(revision 1565)
 | 
| +++ pylib/gyp/__init__.py	(working copy)
 | 
| @@ -47,7 +47,7 @@
 | 
|  
 | 
|  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.
 | 
| @@ -126,7 +126,7 @@
 | 
|    # 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):
 | 
| @@ -331,6 +331,9 @@
 | 
|    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']
 | 
| @@ -493,11 +496,15 @@
 | 
|                '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
 | 
| 
 |