diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 7397d6f0..c8c65460 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -138,7 +138,6 @@ from buildbot.config import BuilderConfig def makeFactory(port, buildType='buildOnly', pyVer='2.7'): - # all of them need to fetch the source factory = BuildFactory() # Was the build started from the force build form with a "fullclean" @@ -149,7 +148,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): factory.addStep(ShellCommand(command=cmd, description='fullclean?', workdir="")) - # Do an incremental update, keeping prior build tree + # By default do an incremental update, keeping prior build tree mode = 'incremental' method = None clean = '' @@ -163,6 +162,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): mode = 'full' method = 'clobber' + # all of them need to fetch the source factory.addStep(SVN(svnurl=wxSvnUrl, name='wx-svn', workdir="wxWidgets", mode=mode, method=method)) factory.addStep(SVN(svnurl=phoenixSvnUrl, name='phoenix-svn', workdir="Phoenix", @@ -188,7 +188,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): if port == 'win64': cmd += ' --x64' if buildType == 'dist': - cmd += ' bdist_egg --upload' + cmd += ' bdist_wheel --upload' cmd = cmd.split() + [Property('buildargs', default='')] factory.addStep(ShellCommand(command=cmd, workdir="Phoenix", @@ -210,6 +210,11 @@ c['builders'] = [ slavenames=["osx_10.6-py27"], factory=makeFactory('osx', pyVer='3.3')), + BuilderConfig(name="build-osx-py34", + slavenames=["osx_10.6-py27"], + factory=makeFactory('osx', pyVer='3.4')), + + BuilderConfig(name="build-win32-py27", slavenames=["win7-py27"], @@ -219,6 +224,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win32', pyVer='3.3')), + BuilderConfig(name="build-win32-py34", + slavenames=["win7-py27"], + factory=makeFactory('win32', pyVer='3.4')), + BuilderConfig(name="build-win64-py27", slavenames=["win7-py27"], factory=makeFactory('win64', pyVer='2.7')), @@ -227,6 +236,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win64', pyVer='3.3')), + BuilderConfig(name="build-win64-py34", + slavenames=["win7-py27"], + factory=makeFactory('win64', pyVer='3.4')), + BuilderConfig(name="build-gtk-py27", @@ -257,6 +270,10 @@ c['builders'] = [ slavenames=["osx_10.6-py27"], factory=makeFactory('osx', 'dist', pyVer='3.3')), + BuilderConfig(name="dist-osx-py34", + slavenames=["osx_10.6-py27"], + factory=makeFactory('osx', 'dist', pyVer='3.4')), + BuilderConfig(name="dist-win32-py27", slavenames=["win7-py27"], @@ -266,6 +283,10 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win32', 'dist', pyVer='3.3')), + BuilderConfig(name="dist-win32-py34", + slavenames=["win7-py27"], + factory=makeFactory('win32', 'dist', pyVer='3.4')), + BuilderConfig(name="dist-win64-py27", slavenames=["win7-py27"], factory=makeFactory('win64', 'dist', pyVer='2.7')), @@ -274,6 +295,9 @@ c['builders'] = [ slavenames=["win7-py27"], factory=makeFactory('win64', 'dist', pyVer='3.3')), + BuilderConfig(name="dist-win64-py34", + slavenames=["win7-py27"], + factory=makeFactory('win64', 'dist', pyVer='3.4')), ]