OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 | 2 |
3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
6 | 6 |
7 from compiler.ast import Const | 7 from compiler.ast import Const |
8 from compiler.ast import Dict | 8 from compiler.ast import Dict |
9 from compiler.ast import Discard | 9 from compiler.ast import Discard |
10 from compiler.ast import List | 10 from compiler.ast import List |
(...skipping 2218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2229 | 2229 |
2230 # Take out the dependent settings now that they've been published to all | 2230 # Take out the dependent settings now that they've been published to all |
2231 # of the targets that require them. | 2231 # of the targets that require them. |
2232 for target in flat_list: | 2232 for target in flat_list: |
2233 if settings_type in targets[target]: | 2233 if settings_type in targets[target]: |
2234 del targets[target][settings_type] | 2234 del targets[target][settings_type] |
2235 | 2235 |
2236 # Make sure static libraries don't declare dependencies on other static | 2236 # Make sure static libraries don't declare dependencies on other static |
2237 # libraries, but that linkables depend on all unlinked static libraries | 2237 # libraries, but that linkables depend on all unlinked static libraries |
2238 # that they need so that their link steps will be correct. | 2238 # that they need so that their link steps will be correct. |
2239 AdjustStaticLibraryDependencies(flat_list, targets, dependency_nodes) | 2239 if generator_input_info['generator_wants_flattened_static_libraries']: |
| 2240 AdjustStaticLibraryDependencies(flat_list, targets, dependency_nodes) |
2240 | 2241 |
2241 # Apply "post"/"late"/"target" variable expansions and condition evaluations. | 2242 # Apply "post"/"late"/"target" variable expansions and condition evaluations. |
2242 for target in flat_list: | 2243 for target in flat_list: |
2243 target_dict = targets[target] | 2244 target_dict = targets[target] |
2244 build_file = gyp.common.BuildFile(target) | 2245 build_file = gyp.common.BuildFile(target) |
2245 ProcessVariablesAndConditionsInDict(target_dict, True, variables, | 2246 ProcessVariablesAndConditionsInDict(target_dict, True, variables, |
2246 build_file) | 2247 build_file) |
2247 | 2248 |
2248 # Move everything that can go into a "configurations" section into one. | 2249 # Move everything that can go into a "configurations" section into one. |
2249 for target in flat_list: | 2250 for target in flat_list: |
(...skipping 16 matching lines...) Expand all Loading... |
2266 ValidateRunAsInTarget(target, target_dict, build_file) | 2267 ValidateRunAsInTarget(target, target_dict, build_file) |
2267 ValidateActionsInTarget(target, target_dict, build_file) | 2268 ValidateActionsInTarget(target, target_dict, build_file) |
2268 | 2269 |
2269 # Generators might not expect ints. Turn them into strs. | 2270 # Generators might not expect ints. Turn them into strs. |
2270 TurnIntIntoStrInDict(data) | 2271 TurnIntIntoStrInDict(data) |
2271 | 2272 |
2272 # TODO(mark): Return |data| for now because the generator needs a list of | 2273 # TODO(mark): Return |data| for now because the generator needs a list of |
2273 # build files that came in. In the future, maybe it should just accept | 2274 # build files that came in. In the future, maybe it should just accept |
2274 # a list, and not the whole data dict. | 2275 # a list, and not the whole data dict. |
2275 return [flat_list, targets, data] | 2276 return [flat_list, targets, data] |
OLD | NEW |