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

Side by Side Diff: build/android/gyp/ant.py

Issue 106923002: Don't use sys.exit() in build_utils.CheckCallDie(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | build/android/gyp/create_standalone_apk.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # 2 #
3 # Copyright 2013 The Chromium Authors. All rights reserved. 3 # Copyright 2013 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 """An Ant wrapper that suppresses useless Ant output. 7 """An Ant wrapper that suppresses useless Ant output.
8 8
9 Ant build scripts output "BUILD SUCCESSFUL" and build timing at the end of 9 Ant build scripts output "BUILD SUCCESSFUL" and build timing at the end of
10 every build. In the Android build, this just adds a lot of useless noise to the 10 every build. In the Android build, this just adds a lot of useless noise to the
11 build output. This script forwards its arguments to ant, and prints Ant's 11 build output. This script forwards its arguments to ant, and prints Ant's
12 output up until the BUILD SUCCESSFUL line. 12 output up until the BUILD SUCCESSFUL line.
13 """ 13 """
14 14
15 import sys 15 import sys
16 import traceback
16 17
17 from util import build_utils 18 from util import build_utils
18 19
19 20
20 def main(argv): 21 def main(argv):
21 stdout = build_utils.CheckCallDie(['ant'] + argv[1:], suppress_output=True) 22 try:
23 stdout = build_utils.CheckOutput(['ant'] + argv[1:])
24 except build_utils.CalledProcessError as e:
25 traceback.print_exc()
26 if '-quiet' in e.args:
27 sys.stderr.write('Tip: run the ant command above without the -quiet flag '
cjhopman 2013/12/06 17:32:00 +1
28 'to see more details on the error\n')
29 sys.exit(1)
22 stdout = stdout.strip().split('\n') 30 stdout = stdout.strip().split('\n')
23 for line in stdout: 31 for line in stdout:
24 if line.strip() == 'BUILD SUCCESSFUL': 32 if line.strip() == 'BUILD SUCCESSFUL':
25 break 33 break
26 print line 34 print line
27 35
28 36
29 if __name__ == '__main__': 37 if __name__ == '__main__':
30 sys.exit(main(sys.argv)) 38 sys.exit(main(sys.argv))
OLDNEW
« no previous file with comments | « no previous file | build/android/gyp/create_standalone_apk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698