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

pylib/gyp/input.py

 # 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.
 
 from compiler.ast import Const
 from compiler.ast import Dict
 from compiler.ast import Discard
 from compiler.ast import List
 from compiler.ast import Module
 from compiler.ast import Node
@@ skipping 2499 matching lines @@
     # Prepare a key like 'path/to:target_name'.
     key = subdir + ':' + name
     if key in used:
       # Complain if this target is already used.
       raise GypError('Duplicate target name "%s" in directory "%s" used both '
                      'in "%s" and "%s".' % (name, subdir, gyp, used[key]))
     used[key] = gyp
 
 
 def Load(build_files, variables, includes, depth, generator_input_info, check,
-         circular_check, parallel):
+         circular_check, allow_duplicates, parallel):
   # Set up path_sections and non_configuration_keys with the default data plus
   # the generator-specifc data.
   global path_sections
   path_sections = base_path_sections[:]
   path_sections.extend(generator_input_info['path_sections'])
 
   global non_configuration_keys
   non_configuration_keys = base_non_configuration_keys[:]
   non_configuration_keys.extend(generator_input_info['non_configuration_keys'])
 
@@ skipping 117 matching lines @@
     build_file = gyp.common.BuildFile(target)
     ProcessVariablesAndConditionsInDict(
         target_dict, PHASE_LATELATE, variables, build_file)
 
   # Make sure that the rules make sense, and build up rule_sources lists as
   # needed.  Not all generators will need to use the rule_sources lists, but
   # some may, and it seems best to build the list in a common spot.
   # Also validate actions and run_as elements in targets.
   for target in flat_list:
     target_dict = targets[target]
+    target_variables = {}
+    if 'variables' in target_dict:
+      target_variables = target_dict['variables']

[Sam Clegg, 2013/02/09 17:52:47]

You can just do:

target_variables = target_dict.get('variables', {})

     build_file = gyp.common.BuildFile(target)
     ValidateTargetType(target, target_dict)
-    # TODO(thakis): Get vpx_scale/arm/scalesystemdependent.c to be renamed to
-    #               scalesystemdependent_arm_additions.c or similar.
-    if 'arm' not in variables.get('target_arch', ''):
-      ValidateSourcesInTarget(target, target_dict, build_file)
+    allow_duplicates_variable = False
+    if target_variables and 'allow_duplicate_basenames' in target_variables:
+      allow_duplicates_variable = target_variables['allow_duplicate_basenames']

[Sam Clegg, 2013/02/09 17:52:47]

You can just do:

allow_duplicates_variable = target_variables.get('allow_duplicate_basenames')

+    if not (allow_duplicates or allow_duplicates_variable):
+      # TODO(thakis): Get vpx_scale/arm/scalesystemdependent.c to be renamed to
+      #               scalesystemdependent_arm_additions.c or similar.
+      if 'arm' not in variables.get('target_arch', ''):
+        ValidateSourcesInTarget(target, target_dict, build_file)

[Sam Clegg, 2013/02/09 17:52:47]

Seems like it would be nice to remove this TODO, and the
one one on line 2329.

ValidateSourcesInTarget only really needs to generate this
error for msvs_version == 2008 right?  If we make the
errors conditional on this wouldn't that aleviate the need
for this new option/variable altogether.  The result would
be that your project (as well as arm/chrome) would generate
errors if somebody tried to use VS2008, which it seems to
me if the desired behaviour.

with the change as it stands somebody using VS2008 would
have this error silently suppressed, no?

     ValidateRulesInTarget(target, target_dict, extra_sources_for_rules)
     ValidateRunAsInTarget(target, target_dict, build_file)
     ValidateActionsInTarget(target, target_dict, build_file)
 
   # Generators might not expect ints.  Turn them into strs.
   TurnIntIntoStrInDict(data)
 
   # TODO(mark): Return |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.
   return [flat_list, targets, data]