Author: Philip Jenvey <[email protected]>
Branch:
Changeset: r921:a768fa781d1b
Date: 2014-10-15 11:34 -0700
http://bitbucket.org/pypy/buildbot/changeset/a768fa781d1b/
Log: handle the new pypy3 binary name
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -556,9 +556,12 @@
haltOnFailure=True,
workdir='.'))
# copy pypy-c to the expected location within the pypy source checkout
+ command = ('PYPY_C="pypy-c/bin/pypy";'
+ 'if [ -e pypy-c/bin/pypy3 ]; then
PYPY_C="pypy-c/bin/pypy3"; fi;'
+ 'cp -v $PYPY_C build/pypy/goal/pypy-c;')
self.addStep(ShellCmd(
description="move pypy-c",
- command=['cp', '-v', 'pypy-c/bin/pypy', 'build/pypy/goal/pypy-c'],
+ command=command,
haltOnFailure=True,
workdir='.'))
# copy generated and copied header files to build/include
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
