OLD | NEW |
---|---|
1 # Copyright (c) 2013 Google Inc. All rights reserved. | 1 # Copyright (c) 2013 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 json | 7 import json |
8 import multiprocessing | 8 import multiprocessing |
9 import os.path | 9 import os.path |
10 import re | 10 import re |
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1207 if output_binary is not None: | 1207 if output_binary is not None: |
1208 target_postbuilds = self.xcode_settings.GetTargetPostbuilds( | 1208 target_postbuilds = self.xcode_settings.GetTargetPostbuilds( |
1209 self.config_name, | 1209 self.config_name, |
1210 os.path.normpath(os.path.join(self.base_to_build, output)), | 1210 os.path.normpath(os.path.join(self.base_to_build, output)), |
1211 QuoteShellArgument( | 1211 QuoteShellArgument( |
1212 os.path.normpath(os.path.join(self.base_to_build, output_binary)), | 1212 os.path.normpath(os.path.join(self.base_to_build, output_binary)), |
1213 self.flavor), | 1213 self.flavor), |
1214 quiet=True) | 1214 quiet=True) |
1215 postbuilds = gyp.xcode_emulation.GetSpecPostbuildCommands(spec, quiet=True) | 1215 postbuilds = gyp.xcode_emulation.GetSpecPostbuildCommands(spec, quiet=True) |
1216 postbuilds = target_postbuilds + postbuilds | 1216 postbuilds = target_postbuilds + postbuilds |
1217 if self.target.type == "executable" and output_binary is not None: | |
Nico
2013/10/14 16:54:55
Does codesigning run before or after explicit "pos
justincohen
2013/10/14 16:59:12
It runs after -- very last step.
On 2013/10/14 16
Nico
2013/10/14 17:02:24
Hm, that's annoying :-/
Maybe we should change th
| |
1218 postbuilds = self.xcode_settings.GetIOSPostbuilds( | |
1219 self.config_name, | |
1220 QuoteShellArgument( | |
1221 os.path.normpath(os.path.join(self.base_to_build, output_binary)), | |
1222 self.flavor), | |
1223 postbuilds) | |
1224 | |
1217 if not postbuilds: | 1225 if not postbuilds: |
1218 return '' | 1226 return '' |
1219 # Postbuilds expect to be run in the gyp file's directory, so insert an | 1227 # Postbuilds expect to be run in the gyp file's directory, so insert an |
1220 # implicit postbuild to cd to there. | 1228 # implicit postbuild to cd to there. |
1221 postbuilds.insert(0, gyp.common.EncodePOSIXShellList( | 1229 postbuilds.insert(0, gyp.common.EncodePOSIXShellList( |
1222 ['cd', self.build_to_base])) | 1230 ['cd', self.build_to_base])) |
1223 env = self.ComputeExportEnvString(self.GetSortedXcodePostbuildEnv()) | 1231 env = self.ComputeExportEnvString(self.GetSortedXcodePostbuildEnv()) |
1224 # G will be non-null if any postbuild fails. Run all postbuilds in a | 1232 # G will be non-null if any postbuild fails. Run all postbuilds in a |
1225 # subshell. | 1233 # subshell. |
1226 commands = env + ' (' + \ | 1234 commands = env + ' (' + \ |
(...skipping 898 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2125 arglists.append( | 2133 arglists.append( |
2126 (target_list, target_dicts, data, params, config_name)) | 2134 (target_list, target_dicts, data, params, config_name)) |
2127 pool.map(CallGenerateOutputForConfig, arglists) | 2135 pool.map(CallGenerateOutputForConfig, arglists) |
2128 except KeyboardInterrupt, e: | 2136 except KeyboardInterrupt, e: |
2129 pool.terminate() | 2137 pool.terminate() |
2130 raise e | 2138 raise e |
2131 else: | 2139 else: |
2132 for config_name in config_names: | 2140 for config_name in config_names: |
2133 GenerateOutputForConfig(target_list, target_dicts, data, params, | 2141 GenerateOutputForConfig(target_list, target_dicts, data, params, |
2134 config_name) | 2142 config_name) |
OLD | NEW |