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

Unified Diff: editor/build/build.py

Issue 8896015: Fix error in buildbot dart-editor-linux (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: '' Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « client/tools/buildbot_annotated_steps.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: editor/build/build.py
===================================================================
--- editor/build/build.py (revision 2319)
+++ editor/build/build.py (working copy)
@@ -33,7 +33,8 @@
"""
self._antpath = antpath
self._bzippath = bzippath
- print 'AntWrapper.__init__({0}, {1}'.format(self._antpath, self._bzippath)
+ print 'AntWrapper.__init__({0}, {1})'.format(self._antpath,
+ self._bzippath)
def RunAnt(self, build_dir, antfile, revision, name,
buildroot, buildout, sourcepath, buildos,
@@ -75,16 +76,22 @@
os.path.join(self._antpath, ant_exec),
'-lib',
os.path.join(self._bzippath, 'bzip2.jar'),
- '-f',
- antfile,
'-noinput',
- '-Dbuild.revision=' + revision,
- '-Dbuild.builder=' + name,
- '-Dbuild.root=' + buildroot,
- '-Dbuild.out=' + buildout,
- '-Dbuild.source=' + sourcepath,
- '-nouserlib',
+ '-nouserlib'
]
+ if antfile:
+ args.append('-f')
+ args.append(antfile)
+ if revision:
+ args.append('-Dbuild.revision=' + revision)
+ if name:
+ args.append('-Dbuild.builder=' + name)
+ if buildroot:
+ args.append('-Dbuild.root=' + buildroot)
+ if buildout:
+ args.append('-Dbuild.out=' + buildout)
+ if sourcepath:
+ args.append('-Dbuild.source=' + sourcepath)
if buildos:
args.append('-Dbuild.os={0}'.format(buildos))
if extra_args:
@@ -97,9 +104,7 @@
args.append(arg)
print ' '.join(args)
-
status = subprocess.call(args)
-
os.chdir(cwd)
return status
« no previous file with comments | « client/tools/buildbot_annotated_steps.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698