diff --git a/buildbot/README.txt b/buildbot/README.txt index 6e041814..6b2bdb48 100644 --- a/buildbot/README.txt +++ b/buildbot/README.txt @@ -13,6 +13,6 @@ Buildbot. Developers with the proper SSH keys can copy the file and reconfigure the server with these commands: - scp buildbot/master.cfg wxpybb@buildbot.wxpython.org:/home/wxpybb/bb2 - ssh wxpybb@buildbot.wxpython.org "cd /home/wxpybb/bb2 && ./reconfig" +scp buildbot/master.cfg wxpybb@buildbot.wxpython.org:/home/wxpybb/bb2 +ssh wxpybb@buildbot.wxpython.org "cd /home/wxpybb/bb2 && ./reconfig" diff --git a/buildbot/master.cfg b/buildbot/master.cfg index 0fe7877e..42a8e9e9 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -1,5 +1,13 @@ # -*- python -*- # ex: set filetype=python: +#------------------------------------------------------------------------------- +# This is the buildmaster config file for the wxPython Phoenix Buildbot, +# located at http://buildbot.wxpython.org:8011/. This file is located here in +# order to allow it to be versioned and backed up. However it is NOT +# automatically copied into the buildmaster's working folder, that must be +# done by hand after reviewing changes made here. It must be installed as +# 'master.cfg' in the buildmaster's base directory. +#------------------------------------------------------------------------------- from buildbot.plugins import * @@ -26,7 +34,6 @@ GIT_BRANCH = 'master' # Passwords are stored separately and not maintained in the source repository # for security's sake import bbpasswd -#reload(bbpasswd) ##--------------------------------------------------------------------------- ####### WORKERS @@ -116,7 +123,7 @@ def makeBuildFactory(wxport, py_ver, build_type='basic'): common_opts.append('--x64') if build_type == 'dist': common_opts.append('--relwithdebug') - if build_type != 'docs': + if build_type not in ['docs', 'sdist']: common_opts.append('--nodoc') common_opts.append(util.Interpolate('%(prop:do-release-build:#?|--release|)s')) common_opts.append(util.Property('extra-build-arg', default=''))