From 5be05a77d312a915408a054af39bd0b49fca8125 Mon Sep 17 00:00:00 2001 From: Titus Brown Date: Fri, 4 Sep 2009 01:32:09 -0400 Subject: [PATCH] fixed pbc to send results again, whoops!; changed SvnClone to SvnUpdate. --- client/build-cpython | 4 ++-- client/build-twill | 4 ++-- client/pony_build_client.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/build-cpython b/client/build-cpython index fab2250..93a4a19 100644 --- a/client/build-cpython +++ b/client/build-cpython @@ -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: @@ -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') diff --git a/client/build-twill b/client/build-twill index 476d218..4fc585c 100644 --- a/client/build-twill +++ b/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: @@ -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'), diff --git a/client/pony_build_client.py b/client/pony_build_client.py index f4ad1b6..fd01741 100644 --- a/client/pony_build_client.py +++ b/client/pony_build_client.py @@ -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 @@ -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 = []