From dbf38d9d24c5b6a8155fdc5a15b3e30f58fa5d16 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 18 Sep 2019 11:04:46 -0700
Subject: [PATCH] Add missing dist builder. Use 32-bit Python for win32 builds.
 Add additional windows and linux workers.

---
 buildbot/master.cfg | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 42a8e9e9..6398a1e6 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -44,7 +44,9 @@ import bbpasswd
 c['workers'] = [
     worker.Worker('macosx-1', bbpasswd.PASSWD1, max_builds=1),
     worker.Worker('windows-1', bbpasswd.PASSWD1, max_builds=1),
+    worker.Worker('windows-2', bbpasswd.PASSWD1, max_builds=1),
     worker.Worker('linux-1', bbpasswd.PASSWD1, max_builds=1),
+    worker.Worker('linux-2', bbpasswd.PASSWD1, max_builds=1),
     ]
 
 
@@ -89,10 +91,12 @@ def makeBuildFactory(wxport, py_ver, build_type='basic'):
     mode = 'incremental'
     method = 'clobber'
 
-    if wxport not in ['win32', 'win64']:
-        PYTHON = f'../../venv-{py_ver}/bin/python'
-    else:
+    if wxport == 'win64':
         PYTHON = f'..\\..\\venv-{py_ver}\\Scripts\\python.exe'
+    elif wxport == 'win32':
+        PYTHON = f'..\\..\\venv-{py_ver}-x32\\Scripts\\python.exe'
+    else:
+        PYTHON = f'../../venv-{py_ver}/bin/python'
     environ = dict(PYTHONPATH='.', PYTHONUNBUFFERED='1')
 
     # check out the source
@@ -208,6 +212,7 @@ distBuilders = [    'dist-osx-py27',
                     'dist-osx-py35',
                     'dist-osx-py36',
                     'dist-osx-py37',
+                    'dist-win32-py27',
                     'dist-win32-py35',
                     'dist-win32-py36',
                     'dist-win32-py37',
@@ -226,12 +231,12 @@ triggerBuilders = [ 'trigger-all-dist',]
 def makeBuilderConfigs(builder_names):
     def _portToWorker(port):
         pwmap = { 'osx':   ['macosx-1'],
-                  'gtk2':  ['linux-1'],
-                  'gtk3':  ['linux-1'],
-                  'win32': ['windows-1'],
-                  'win64': ['windows-1'],
-                  'src':   ['linux-1'],
-                  'docs':  ['windows-1'], }
+                  'gtk2':  ['linux-1',   'linux-2'],
+                  'gtk3':  ['linux-1',   'linux-2'],
+                  'win32': ['windows-1', 'windows-2'],
+                  'win64': ['windows-1', 'windows-2'],
+                  'src':   ['linux-1',   'linux-2'],
+                  'docs':  ['windows-1', 'windows-1'], }
         return pwmap[port]
     BCs = []
     for bname in builder_names: