From b9fb27c39af60d35bbc3ab45aceff13783e072e6 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 26 Jun 2012 18:25:37 +0000 Subject: [PATCH] fix typo and refactor the code a bit git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- buildbot/master.cfg | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/buildbot/master.cfg b/buildbot/master.cfg index aa88a677..82e87ca4 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -54,17 +54,19 @@ c['slavePortnum'] = 9989 from buildbot.changes.svnpoller import SVNPoller -wxsvn = SVNPoller('http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk', - pollinterval=300, - histmax=20, - cachepath='/home/wxpybb/buildbot/last_change.wx.cache') - -phoenixsvn = SVNPoller('http://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk', - pollinterval=300, - histmax=20, - cachepath='/home/wxpybb/buildbot/last_change.Phoenix.cache') +wxSvnUrl = 'http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk' +phoenixSvnUrl = 'http://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk' -c['change_source'] = [wxsvn, phoenixsvn] +c['change_source'] = [ SVNPoller(wxSvnUrl, + pollinterval=300, + histmax=20, + cachepath='/home/wxpybb/buildbot/last_change.wx.cache'), + + SVNPoller(phoenixSvnUrl, + pollinterval=300, + histmax=20, + cachepath='/home/wxpybb/buildbot/last_change.Phoenix.cache'), + ] @@ -133,7 +135,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): method = None clean = '' - # since wx build doesn't have good dependency checking on MSW, clean first + # Since the wx build doesn't have good dependency checking on MSW, clean first if port in ['win32', 'win64']: clean = 'clean' @@ -142,14 +144,14 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): mode = 'full' method = 'clobber' - factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk', - name='wx-svn', workdir="wxWidgets", mode=mode, method=method)) - factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk', - name='phoenix-svn', workdir="Phoenix", mode=mode, method=method)) + factory.addStep(SVN(svnurl=wxSvnUrl, name='wx-svn', workdir="wxWidgets", + mode=mode, method=method)) + factory.addStep(SVN(svnurl=phoenixSvnUrl, name='phoenix-svn', workdir="Phoenix", + mode=mode, method=method)) if buildType == 'docs': - cmd = 'python -u build.py %s clean_shpinx dox touch etg sphinx docs_bdist --upload_package' % pyVer + cmd = 'python -u build.py %s dox touch etg sphinx docs_bdist --upload_package' % pyVer else: cmd = 'python -u build.py %s %s dox touch etg --nodoc sip build' % (pyVer, clean) if port == 'osx':