Makes matching of build files work when absolute

pylib/gyp/generator/analyzer.py

 # Copyright (c) 2014 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.
 
 """
 This script is intended for use as a GYP_GENERATOR. It takes as input (by way of
 the generator flag config_path) the path of a json file that dictates the files
 and targets to search for. The following keys are supported:
 files: list of paths (relative) of the files to search for.
 targets: list of targets to search for. The target names are unqualified.
@@ skipping 110 matching lines @@
     if debug:
       print 'AddSource', org_source, result[len(result) - 1]
 
 
 def _ExtractSourcesFromAction(action, base_path, base_path_components,
                               results):
   if 'inputs' in action:
     _AddSources(action['inputs'], base_path, base_path_components, results)
 
 
+def _ToLocalPath(toplevel_dir, path):
+  """Converts |path| to a path relative to |toplevel_dir|."""
+  if path == toplevel_dir:
+    return ''
+  if path.startswith(toplevel_dir + '/'):

[scottmg, 2014/09/02 22:06:45]

will there be any problems with \ here?

[sky, 2014/09/02 22:11:29]

Paths should have been mapped to / by the time we get here.

+    return path[len(toplevel_dir) + len('/'):]
+  return path
+
+
 def _ExtractSources(target, target_dict, toplevel_dir):
   # |target| is either absolute or relative and in the format of the OS. Gyp
   # source paths are always posix. Convert |target| to a posix path relative to
   # |toplevel_dir_|. This is done to make it easy to build source paths.
-  base_path = _ToGypPath(target)
-  if base_path == toplevel_dir:
-    base_path = ''
-  elif base_path.startswith(toplevel_dir + '/'):
-    base_path = base_path[len(toplevel_dir) + len('/'):]
-  base_path = posixpath.dirname(base_path)
+  base_path = posixpath.dirname(_ToLocalPath(toplevel_dir, _ToGypPath(target)))
   base_path_components = base_path.split('/')
 
   # Add a trailing '/' so that _AddSources() can easily build paths.
   if len(base_path):
     base_path += '/'
 
   if debug:
     print 'ExtractSources', target, base_path
 
   results = []
@@ skipping 65 matching lines @@
     except IOError:
       raise Exception('Unable to open file ' + config_path)
     except ValueError as e:
       raise Exception('Unable to parse config file ' + config_path + str(e))
     if not isinstance(config, dict):
       raise Exception('config_path must be a JSON file containing a dictionary')
     self.files = config.get('files', [])
     self.targets = set(config.get('targets', []))
 
 
-def _WasBuildFileModified(build_file, data, files):
+def _WasBuildFileModified(build_file, data, files, toplevel_dir):
   """Returns true if the build file |build_file| is either in |files| or
-  one of the files included by |build_file| is in |files|."""
-  if _ToGypPath(build_file) in files:
+  one of the files included by |build_file| is in |files|. |toplevel_dir| is
+  the root of the source tree."""
+  if _ToLocalPath(toplevel_dir, _ToGypPath(build_file)) in files:
     if debug:
       print 'gyp file modified', build_file
     return True
 
   # First element of included_files is the file itself.
   if len(data[build_file]['included_files']) <= 1:
     return False
 
   for include_file in data[build_file]['included_files'][1:]:
     # |included_files| are relative to the directory of the |build_file|.
     rel_include_file = \
         _ToGypPath(gyp.common.UnrelativePath(include_file, build_file))
-    if rel_include_file in files:
+    if _ToLocalPath(toplevel_dir, rel_include_file) in files:
       if debug:
         print 'included gyp file modified, gyp_file=', build_file, \
             'included file=', rel_include_file
       return True
   return False
 
 
 def _GetOrCreateTargetByName(targets, target_name):
   """Creates or returns the Target at targets[target_name]. If there is no
   Target for |target_name| one is created. Returns a tuple of whether a new
@@ skipping 49 matching lines @@
       continue
 
     target.visited = True
     target.requires_build = _DoesTargetTypeRequireBuild(
         target_dicts[target_name])
     target.is_executable = target_dicts[target_name]['type'] == 'executable'
 
     build_file = gyp.common.ParseQualifiedTarget(target_name)[0]
     if not build_file in build_file_in_files:
       build_file_in_files[build_file] = \
-          _WasBuildFileModified(build_file, data, files)
+          _WasBuildFileModified(build_file, data, files, toplevel_dir)
 
     if build_file in build_files:
       build_file_targets.add(target)
 
     # If a build file (or any of its included files) is modified we assume all
     # targets in the file are modified.
     if build_file_in_files[build_file]:
       print 'matching target from modified build file', target_name
       target.match_status = MATCH_STATUS_MATCHES
       matching_targets.append(target)
@@ skipping 228 matching lines @@
     result_dict = { 'targets': matched_search_targets,
                     'status': found_dependency_string if matching_targets else
                               no_dependency_string,
                     'build_targets': build_targets}
     if warning:
       result_dict['warning'] = warning
     _WriteOutput(params, **result_dict)
 
   except Exception as e:
     _WriteOutput(params, error=str(e))