Revert "Stop checking for 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 2470 matching lines @@
     raise GypError("Target %s has an invalid target type '%s'.  "
                    "Must be one of %s." %
                    (target, target_type, '/'.join(VALID_TARGET_TYPES)))
   if (target_dict.get('standalone_static_library', 0) and
       not target_type == 'static_library'):
     raise GypError('Target %s has type %s but standalone_static_library flag is'
                    ' only valid for static_library type.' % (target,
                                                              target_type))
 
 
+def ValidateSourcesInTarget(target, target_dict, build_file,
+                            duplicate_basename_check):
+  if not duplicate_basename_check:
+    return
+  # TODO: Check if MSVC allows this for loadable_module targets.
+  if target_dict.get('type', None) not in ('static_library', 'shared_library'):

[Nico, 2015/05/21 23:50:07]

Maybe shared_library can be removed here?

[scottmg, 2015/05/21 23:59:18]

That seems pretty weird now that I look at it. I don't think it would have
worked for 'executable' either. Hm.

The only thing is that it seems a bit random to only disallow for
static_librarys. But I guess if it's not necessary, there's no point in
restricting it.

+    return
+  sources = target_dict.get('sources', [])
+  basenames = {}
+  for source in sources:
+    name, ext = os.path.splitext(source)
+    is_compiled_file = ext in [
+        '.c', '.cc', '.cpp', '.cxx', '.m', '.mm', '.s', '.S']
+    if not is_compiled_file:
+      continue
+    basename = os.path.basename(name)  # Don't include extension.
+    basenames.setdefault(basename, []).append(source)
+
+  error = ''
+  for basename, files in basenames.iteritems():
+    if len(files) > 1:
+      error += '  %s: %s\n' % (basename, ' '.join(files))
+
+  if error:
+    print('static library %s has several files with the same basename:\n' %
+          target + error + 'Some build systems, e.g. MSVC08 and Make generator '

[Nico, 2015/05/21 23:50:07]

Maybe this should say "libtool on mac" now?

[scottmg, 2015/05/21 23:59:18]

Done.

+          'for Mac, cannot handle that. Use --no-duplicate-basename-check to'

[yukawa, 2015/05/21 23:58:57]

A white space between 'to' and 'disable'?

If this CL doesn't need to be a mechanical revert, it would be great if you can
put an extra space between 'to' and 'disable' in this sentence.
Sorry, it's I who wrote those lines.  Once I was glad that those lines were
removed but they have returned!

[scottmg, 2015/05/22 00:00:46]

I think I did this accidentally during reflowing.

Hopefully we can remove them again, someday!

+          'disable this validation.')
+    raise GypError('Duplicate basenames in sources section, see list above')
+
+
 def ValidateRulesInTarget(target, target_dict, extra_sources_for_rules):
   """Ensures that the rules sections in target_dict are valid and consistent,
   and determines which sources they apply to.
 
   Arguments:
     target: string, name of target.
     target_dict: dict, target spec containing "rules" and "sources" lists.
     extra_sources_for_rules: a list of keys to scan for rule matches in
         addition to 'sources'.
   """
@@ skipping 200 matching lines @@
 
   global multiple_toolsets
   multiple_toolsets = generator_input_info[
       'generator_supports_multiple_toolsets']
 
   global generator_filelist_paths
   generator_filelist_paths = generator_input_info['generator_filelist_paths']
 
 
 def Load(build_files, variables, includes, depth, generator_input_info, check,
-         circular_check, parallel, root_targets):
+         circular_check, duplicate_basename_check, parallel, root_targets):
   SetGeneratorGlobals(generator_input_info)
   # A generator can have other lists (in addition to sources) be processed
   # for rules.
   extra_sources_for_rules = generator_input_info['extra_sources_for_rules']
 
   # Load build files.  This loads every target-containing build file into
   # the |data| dictionary such that the keys to |data| are build file names,
   # and the values are the entire build file contents after "early" or "pre"
   # processing has been done and includes have been resolved.
   # NOTE: data contains both "target" files (.gyp) and "includes" (.gypi), as
@@ skipping 103 matching lines @@
     target_dict = targets[target]
     ProcessListFiltersInDict(target, target_dict)
 
   # Apply "latelate" variable expansions and condition evaluations.
   for target in flat_list:
     target_dict = targets[target]
     build_file = gyp.common.BuildFile(target)
     ProcessVariablesAndConditionsInDict(
         target_dict, PHASE_LATELATE, variables, build_file)
 
+  # TODO(thakis): Get vpx_scale/arm/scalesystemdependent.c to be renamed to
+  #               scalesystemdependent_arm_additions.c or similar.

[Nico, 2015/05/21 23:50:07]

If the shared_library above goes away, this may or may not be needed any more

[scottmg, 2015/05/21 23:59:18]

I'm feeling lucky. Done!

+  if 'arm' in variables.get('target_arch', ''):
+    duplicate_basename_check = False
+
   # 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]
     build_file = gyp.common.BuildFile(target)
     ValidateTargetType(target, target_dict)
+    ValidateSourcesInTarget(target, target_dict, build_file,
+                            duplicate_basename_check)
     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]