Skip to content

Commit

Permalink
fixed pbc to send results again, whoops!; changed SvnClone to SvnUpdate.
Browse files Browse the repository at this point in the history
  • Loading branch information
Titus Brown committed Sep 4, 2009
1 parent 39f0559 commit 5be05a7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions client/build-cpython
Expand Up @@ -2,7 +2,7 @@
import sys
import distutils
from pony_build_client import BuildCommand, TestCommand, do, send, \
TempDirectoryContext, SetupCommand, SvnClone, check, parse_cmdline
TempDirectoryContext, SetupCommand, SvnUpdate, check, parse_cmdline

options, args = parse_cmdline()
if args:
Expand All @@ -29,7 +29,7 @@ if distutils.util.get_platform().startswith('macosx'):
built_exe = './python.exe'

context = TempDirectoryContext(False)
commands = [ SvnClone('python27', repo_url, name='checkout', cache_dir='~/.pony-build/python27'),
commands = [ SvnUpdate('python27', repo_url, name='checkout', cache_dir='~/.pony-build/python27'),
BuildCommand(['./configure'], name='configure'),
BuildCommand(['make'], name='make'),
TestCommand([built_exe, 'Lib/test/regrtest.py'], name='regrtest')
Expand Down
4 changes: 2 additions & 2 deletions client/build-twill
@@ -1,7 +1,7 @@
#! /usr/bin/env python
import sys
from pony_build_client import BuildCommand, TestCommand, do, send, \
TempDirectoryContext, SetupCommand, SvnClone, check, parse_cmdline
TempDirectoryContext, SetupCommand, SvnUpdate, check, parse_cmdline

options, args = parse_cmdline()
if args:
Expand All @@ -23,7 +23,7 @@ if not options.force_build:
print 'check build says no need to build; bye'
sys.exit(0)

commands = [ SvnClone('twill', repo_url, name='checkout', cache_dir='~/.pony-build/twill'),
commands = [ SvnUpdate('twill', repo_url, name='checkout', cache_dir='~/.pony-build/twill'),
BuildCommand([python_exe, 'setup.py', 'build'],
name='compile'),
TestCommand([python_exe, 'setup.py', 'test'], name='run tests'),
Expand Down
3 changes: 2 additions & 1 deletion client/pony_build_client.py
Expand Up @@ -249,7 +249,7 @@ def run(self, context):
self.output = ''
self.errout = ''

class SvnClone(SetupCommand):
class SvnUpdate(SetupCommand):
def __init__(self, dirname, repository, cache_dir=None, **kwargs):
SetupCommand.__init__(self, [], **kwargs)
self.repository = repository
Expand Down Expand Up @@ -328,6 +328,7 @@ def get_arch():
def _send(server, info, results):
print 'connecting to', server
s = xmlrpclib.ServerProxy(server)
s.add_results(info, results)

def do(name, commands, context=None, arch=None, stop_if_failure=True):
reslist = []
Expand Down

0 comments on commit 5be05a7

Please sign in to comment.