Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 11:30:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix typo and refactor the code a bit

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-06-26 18:25:37 +00:00
parent 208b93a899
commit b9fb27c39a
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
buildbot/master.cfg
View File

@@ -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':