More typos and other cleanup

This commit is contained in:
Robin Dunn
2016-05-10 22:36:37 -07:00
parent 4e9935e1f0
commit 3e3c3a41f9
4 changed files with 37 additions and 27 deletions

View File

@@ -59,12 +59,6 @@ c['slavePortnum'] = 9989
# The 'change_source' setting tells the buildmaster how it should find out
# about source code changes.
#wxGitUrl = 'https://github.com/RobinD42/wxWidgets.git'
#wxGitBranch = 'WX_3_0_BRANCH' #'wxPy-3.0-branch'
phoenixGitUrl = 'https://github.com/RobinD42/Phoenix.git'
phoenixGitBranch = 'master'
## c['change_source'] =
# See WebStatus setup below for alternate approach using GitHub's webhooks,
@@ -72,6 +66,12 @@ phoenixGitBranch = 'master'
# instead of having buildbot poll the repos itself.
# TODO: Switch to the wxWidgets/Phoenix repo
phoenixGitUrl = 'https://github.com/RobinD42/Phoenix.git'
phoenixGitBranch = 'master'
####### SCHEDULERS
@@ -161,6 +161,20 @@ c['schedulers'].append( ForceScheduler(
# what steps, and which slaves can execute them. Note that any particular build will
# only take place on one slave.
# NOTE on build properties. The following properties are defined in the
# factories generated in this function that can be used to customize the
# builds:
#
# fullclean: Set to 'yes' to fully clean the "build-*" builders before
# checking out the code. Normally they will try to do an incremental
# build to save time, but sometimes things change enough that
# incrementals won't work.
#
# buildargs: Adds additional flags or commands to the build.py command
# line. For example, adding '--release_build' will (in theory) switch
# the "dist-*" builders from making snapshot builds to making release
# builds.
from buildbot.process.factory import BuildFactory
from buildbot.process.properties import Property, WithProperties
from buildbot.steps.source.git import Git
@@ -172,7 +186,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
factory = BuildFactory()
# Was the build started from the force build form with a "fullclean"
# property set? If so, clobber the SVN checkout folders.
# property set? If so, clobber the git workspace and start fresh.
cmd = ['bash', '-c',
WithProperties('if [ %(fullclean:-no)s == yes ]; then rm -rf ../Phoenix; echo fully cleaned; fi'),
]
@@ -184,7 +198,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
method = None
clean = ''
# Start from a clean build tree for the daily builds
# Start from a clean build tree for the daily "dist" builds
if buildType in ['dist', 'docs']:
mode = 'full'
method = 'clobber'