Index: pylib/gyp/input.py |
=================================================================== |
--- pylib/gyp/input.py (revision 915) |
+++ pylib/gyp/input.py (working copy) |
@@ -1042,10 +1042,14 @@ |
similar dict. |
""" |
+ all_dependency_sections = [dep + op |
+ for dep in dependency_sections |
+ for op in ('', '!', '/')] |
+ |
for target, target_dict in targets.iteritems(): |
target_build_file = gyp.common.BuildFile(target) |
toolset = target_dict['toolset'] |
- for dependency_key in dependency_sections: |
+ for dependency_key in all_dependency_sections: |
dependencies = target_dict.get(dependency_key, []) |
for index in xrange(0, len(dependencies)): |
dep_file, dep_target, dep_toolset = gyp.common.ResolveTarget( |
@@ -1353,7 +1357,14 @@ |
target_node.dependencies = [root_node] |
root_node.dependents.append(target_node) |
else: |
- dependencies = spec['dependencies'] |
+ deps_dict = {} |
+ for op in ('', '!', '/'): |
+ key = 'dependencies' + op |
+ if key in spec and len(spec[key]) > 0: |
+ deps_dict[key] = spec[key] |
+ ProcessListFiltersInDict(target, deps_dict) |
+ |
+ dependencies = deps_dict['dependencies'] |
for index in xrange(0, len(dependencies)): |
try: |
dependency = dependencies[index] |
@@ -1818,7 +1829,7 @@ |
Regular expression (regex) filters are contained in dict keys named with a |
trailing "/", such as "sources/" to operate on the "sources" list. Regex |
filters in a dict take the form: |
- 'sources/': [ ['exclude', '_(linux|mac|win)\\.cc$'] ], |
+ 'sources/': [ ['exclude', '_(linux|mac|win)\\.cc$'], |
['include', '_mac\\.cc$'] ], |
The first filter says to exclude all files ending in _linux.cc, _mac.cc, and |
_win.cc. The second filter then includes all files ending in _mac.cc that |