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

Side by Side Diff: pylib/gyp/generator/ninja.py

Issue 11047015: Try to fix the bots after 1510. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import hashlib 6 import hashlib
7 import os.path 7 import os.path
8 import re 8 import re
9 import subprocess 9 import subprocess
10 import sys 10 import sys
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after
947 elif spec['type'] == 'static_library': 947 elif spec['type'] == 'static_library':
948 self.target.binary = self.ComputeOutput(spec) 948 self.target.binary = self.ComputeOutput(spec)
949 variables = [] 949 variables = []
950 postbuild = self.GetPostbuildCommand( 950 postbuild = self.GetPostbuildCommand(
951 spec, self.target.binary, self.target.binary) 951 spec, self.target.binary, self.target.binary)
952 if postbuild: 952 if postbuild:
953 variables.append(('postbuilds', postbuild)) 953 variables.append(('postbuilds', postbuild))
954 if self.xcode_settings: 954 if self.xcode_settings:
955 variables.append(('libtool_flags', 955 variables.append(('libtool_flags',
956 self.xcode_settings.GetLibtoolflags(config_name))) 956 self.xcode_settings.GetLibtoolflags(config_name)))
957 if self.is_standalone_static_library: 957 if self.is_standalone_static_library or self.flavor in ['mac', 'win']:
958 self.ninja.build(self.target.binary, 'alink', link_deps, 958 self.ninja.build(self.target.binary, 'alink', link_deps,
959 order_only=compile_deps, variables=variables) 959 order_only=compile_deps, variables=variables)
960 else: 960 else:
961 self.ninja.build(self.target.binary, 'alink_thin', link_deps, 961 self.ninja.build(self.target.binary, 'alink_thin', link_deps,
962 order_only=compile_deps, variables=variables) 962 order_only=compile_deps, variables=variables)
963 else: 963 else:
964 self.WriteLink(spec, config_name, config, link_deps) 964 self.WriteLink(spec, config_name, config, link_deps)
965 return self.target.binary 965 return self.target.binary
966 966
967 def WriteMacBundle(self, spec, mac_bundle_depends): 967 def WriteMacBundle(self, spec, mac_bundle_depends):
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1749 def GenerateOutput(target_list, target_dicts, data, params): 1749 def GenerateOutput(target_list, target_dicts, data, params):
1750 user_config = params.get('generator_flags', {}).get('config', None) 1750 user_config = params.get('generator_flags', {}).get('config', None)
1751 if user_config: 1751 if user_config:
1752 GenerateOutputForConfig(target_list, target_dicts, data, params, 1752 GenerateOutputForConfig(target_list, target_dicts, data, params,
1753 user_config) 1753 user_config)
1754 else: 1754 else:
1755 config_names = target_dicts[target_list[0]]['configurations'].keys() 1755 config_names = target_dicts[target_list[0]]['configurations'].keys()
1756 for config_name in config_names: 1756 for config_name in config_names:
1757 GenerateOutputForConfig(target_list, target_dicts, data, params, 1757 GenerateOutputForConfig(target_list, target_dicts, data, params,
1758 config_name) 1758 config_name)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698