| OLD | NEW | 
|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. 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 argparse | 5 import argparse | 
| 6 import os | 6 import os | 
| 7 import subprocess | 7 import subprocess | 
| 8 import sys | 8 import sys | 
| 9 | 9 | 
| 10 | 10 | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 55   # | 55   # | 
| 56   # Ignore any lines in the output matching those (last line is an empty line) | 56   # Ignore any lines in the output matching those (last line is an empty line) | 
| 57   # and consider that the build failed if the output contains any other lines. | 57   # and consider that the build failed if the output contains any other lines. | 
| 58   for line in stdout.splitlines(): | 58   for line in stdout.splitlines(): | 
| 59     if not line: | 59     if not line: | 
| 60       continue | 60       continue | 
| 61     if line == '/* com.apple.actool.compilation-results */': | 61     if line == '/* com.apple.actool.compilation-results */': | 
| 62       continue | 62       continue | 
| 63     if line == os.path.abspath(output): | 63     if line == os.path.abspath(output): | 
| 64       continue | 64       continue | 
|  | 65     # crbug.com/730054 Xcode 9's beta introduced a CoreUI(DEBUG) message and | 
|  | 66     # IBMessageChannelErrorDomain message that can be ignored. | 
|  | 67     if line.startswith('CoreUI(DEBUG)'): | 
|  | 68       continue | 
|  | 69     if 'Error Domain=IBMessageChannelErrorDomain Code=4' in line: | 
|  | 70       continue | 
| 65     sys.stderr.write(stdout) | 71     sys.stderr.write(stdout) | 
| 66     sys.exit(1) | 72     sys.exit(1) | 
| 67 | 73 | 
| 68 | 74 | 
| 69 def Main(): | 75 def Main(): | 
| 70   parser = argparse.ArgumentParser( | 76   parser = argparse.ArgumentParser( | 
| 71       description='compile assets catalog for a bundle') | 77       description='compile assets catalog for a bundle') | 
| 72   parser.add_argument( | 78   parser.add_argument( | 
| 73       '--platform', '-p', required=True, | 79       '--platform', '-p', required=True, | 
| 74       choices=('macosx', 'iphoneos', 'iphonesimulator'), | 80       choices=('macosx', 'iphoneos', 'iphonesimulator'), | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 96   CompileXCAssets( | 102   CompileXCAssets( | 
| 97       args.output, | 103       args.output, | 
| 98       args.platform, | 104       args.platform, | 
| 99       args.product_type, | 105       args.product_type, | 
| 100       args.minimum_deployment_target, | 106       args.minimum_deployment_target, | 
| 101       args.inputs) | 107       args.inputs) | 
| 102 | 108 | 
| 103 | 109 | 
| 104 if __name__ == '__main__': | 110 if __name__ == '__main__': | 
| 105   sys.exit(Main()) | 111   sys.exit(Main()) | 
| OLD | NEW | 
|---|