Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1177)

Unified Diff: pylib/gyp/generator/analyzer.py

Issue 473483002: Removes old way to specify files to look for (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | test/analyzer/gyptest-analyzer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/generator/analyzer.py
===================================================================
--- pylib/gyp/generator/analyzer.py (revision 1964)
+++ pylib/gyp/generator/analyzer.py (working copy)
@@ -167,32 +167,19 @@
class Config(object):
"""Details what we're looking for
- look_for_dependency_only: if true only search for a target listing any of
- the files in files.
files: set of files to search for
targets: see file description for details"""
def __init__(self):
- self.look_for_dependency_only = True
self.files = []
self.targets = []
def Init(self, params):
- """Initializes Config. This is a separate method as it may raise an
- exception if there is a parse error."""
+ """Initializes Config. This is a separate method as it raises an exception
+ if there is a parse error."""
generator_flags = params.get('generator_flags', {})
- # TODO(sky): nuke file_path and look_for_dependency_only once migrate
- # recipes.
- file_path = generator_flags.get('file_path', None)
- if file_path:
- self._InitFromFilePath(file_path)
- return
-
- # If |file_path| wasn't specified then we look for config_path.
- # TODO(sky): always look for config_path once migrated recipes.
config_path = generator_flags.get('config_path', None)
if not config_path:
return
- self.look_for_dependency_only = False
try:
f = open(config_path, 'r')
config = json.load(f)
@@ -207,19 +194,7 @@
# Coalesce duplicates
self.targets = list(set(config.get('targets', [])))
- def _InitFromFilePath(self, file_path):
- try:
- f = open(file_path, 'r')
- for file_name in f:
- if file_name.endswith('\n'):
- file_name = file_name[0:len(file_name) - 1]
- if len(file_name):
- self.files.append(file_name)
- f.close()
- except IOError:
- raise Exception('Unable to open file', file_path)
-
def _WasBuildFileModified(build_file, data, files):
"""Returns true if the build file |build_file| is either in |files| or
one of the files included by |build_file| is in |files|."""
@@ -389,9 +364,6 @@
try:
config.Init(params)
if not config.files:
- if config.look_for_dependency_only:
- print 'Must specify files to analyze via file_path generator flag'
- return
raise Exception('Must specify files to analyze via config_path generator '
'flag')
@@ -418,11 +390,6 @@
toplevel_dir,
frozenset(config.files))
- # Set of targets that refer to one of the files.
- if config.look_for_dependency_only:
- print found_dependency_string if matched else no_dependency_string
- return
-
warning = None
if matched_include:
output_targets = config.targets
« no previous file with comments | « no previous file | test/analyzer/gyptest-analyzer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698