From efb63bd342e2aeda7bd01bc1f8ac4f63f10502d5 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Tue, 3 Feb 2015 00:49:10 -0800
Subject: [PATCH] wxWidgets is a submodule of Phoenix now, so we only need to
 have the one Git build step, and the branch filter is much easier (normal)
 too.

---
 buildbot/master.cfg | 40 ++++++++++++----------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 4cefe7d5..61b6baa3 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -13,12 +13,6 @@
 # a shorter alias to save typing.
 c = BuildmasterConfig = {}
 
-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'
-
 
 
 ####### BUILDSLAVES
@@ -61,6 +55,14 @@ 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,
 # where github will send us info about changes as they are pushed or merged,
 # instead of having buildbot poll the repos itself.
@@ -77,19 +79,10 @@ from buildbot.schedulers.forcesched import ForceScheduler
 from buildbot.changes.filter import ChangeFilter
 
 
-def my_filter_fn(change):
-    if change.repository == phoenixGitUrl and change.branch == phoenixGitBranch:
-        return True
-    if change.repository == wxGitUrl and change.branch == wxGitBranch:
-        return True
-    return False
-my_filter = ChangeFilter(filter_fn=my_filter_fn)
-
-
 c['schedulers'] = []
 c['schedulers'].append( SingleBranchScheduler(
                             name="sched-build",
-                            change_filter=my_filter,
+                            change_filter=ChangeFilter(branch=phoenixGitBranch),
                             treeStableTimer=30,
                             builderNames=["build-win32-py27",
                                           "build-win32-py33",
@@ -107,8 +100,7 @@ c['schedulers'].append( SingleBranchScheduler(
 
 c['schedulers'].append( Nightly(
                             name="sched-dist",
-                            change_filter=my_filter,
-                            branch=None,
+                            branch=phoenixGitBranch,
                             hour=21, minute=0,
                             onlyIfChanged=True,
                             builderNames=["dist-osx-py27-2",
@@ -124,8 +116,7 @@ c['schedulers'].append( Nightly(
 
 c['schedulers'].append( Nightly(
                             name="sched-docs",
-                            change_filter=my_filter,
-                            branch=None,
+                            branch=phoenixGitBranch,
                             hour=1, minute=10,
                             onlyIfChanged=True,
                             builderNames=["build-docs"]))
@@ -194,19 +185,12 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     gitConfig = {'core.autocrlf' : 'input'}
     
     # all of them need to fetch the source
-    factory.addStep(Git(name='wx-git', repourl=wxGitUrl, branch=wxGitBranch,
-                        workdir="wxWidgets", 
-                        config=gitConfig, 
-                        progress=True,
-                        clobberOnFailure=True,    
-                        alwaysUseLatest=True,
-                        mode=mode, method=method))
     factory.addStep(Git(name='phoenix-git', repourl=phoenixGitUrl, branch=phoenixGitBranch, 
                         workdir="Phoenix", 
                         config=gitConfig,
                         progress=True,
                         clobberOnFailure=True,
-                        alwaysUseLatest=True,
+                        submodules=True,
                         mode=mode, method=method))
 
     if buildType == 'docs':