[Buildbot-commits] buildbot/docs/examples twisted_master.cfg, 1.41, 1.42

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/docs/examples
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8286/docs/examples

Modified Files:
	twisted_master.cfg 
Log Message:
[project @ docs/examples/twisted_master.cfg: update from actual installation]

Original author: warner at lothar.com
Date: 2006-08-21 03:32:57

Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- twisted_master.cfg	7 Apr 2006 04:31:37 -0000	1.41
+++ twisted_master.cfg	21 Aug 2006 03:37:50 -0000	1.42
@@ -77,6 +77,16 @@
 builders = []
 
 
+
+b24compile_opts = [
+    "-Wignore::PendingDeprecationWarning:distutils.command.build_py",
+    "-Wignore::PendingDeprecationWarning:distutils.command.build_ext",
+    ]
+
+
+b25compile_opts = b24compile_opts # FIXME
+
+
 b1 = {'name': "quick",
       'slavename': "bot1",
       'builddir': "quick",
@@ -101,10 +111,6 @@
        }
 builders.append(b23)
 
-b24compile_opts = [
-    "-Wignore::PendingDeprecationWarning:distutils.command.build_py",
-    "-Wignore::PendingDeprecationWarning:distutils.command.build_ext",
-    ]
 b24 = {'name': "full-2.4",
        'slavenames': ["bot-exarkun"],
        'builddir': "full2.4",
@@ -116,6 +122,28 @@
        }
 builders.append(b24)
 
+b25debian = {
+    'name': 'full-2.5-debian',
+    'slavenames': ['bot-idnar-debian'],
+    'builddir': 'full2.5-debian',
+    'factory': FullTwistedBuildFactory(source_copy,
+                                       python=["python2.5", "-Wall"],
+                                       compileOpts=b24compile_opts),
+    }
+builders.append(b25debian)
+
+
+b24debian64 = {
+    'name': 'full-2.4-debian64',
+    'slavenames': ['bot-idnar-debian64'],
+    'builddir': 'full2.4-debian64',
+    'factory': FullTwistedBuildFactory(source_copy,
+                                       python=["python2.4", "-Wall"],
+                                       compileOpts=b24compile_opts),
+    }
+builders.append(b24debian64)
+
+
 # debuild is offline while we figure out how to build 2.0 .debs from SVN
 # b3 = {'name': "debuild",
 #       'slavename': "bot2",
@@ -143,7 +171,7 @@
                                               python="python2.4",
                                               reactors=['qt']),
        }
-builders.append(bqt)
+#builders.append(bqt)
 
 jf = TwistedReactorsBuildFactory(source_copy,
                                  python="python2.4", reactors=["default"])
@@ -169,8 +197,28 @@
                                                  compileOpts2=["-c","mingw32"],
                                                  reactors=["default"]),
           }
-builders.append(b24w32_select)
+#builders.append(b24w32_select)
+
+b25suse = {
+    'name': 'full-2.5-suse',
+    'slavenames': ['bot-scmikes-2.5'],
+    'builddir': 'bot-scmikes-2.5',
+    'factory': FullTwistedBuildFactory(source_copy,
+                                       python=["python2.5", "-Wall"],
+                                       compileOpts=b24compile_opts),
+    }
+builders.append(b25suse)
 
+b24w32_scmikes_select = {
+          'name': "win32-scmikes-select",
+          'slavename': "bot-scmikes-win32",
+          'builddir': "W32-full2.4-scmikes-select",
+          'factory': TwistedReactorsBuildFactory(source_copy,
+                                                 python="python",
+                                                 compileOpts2=["-c","mingw32"],
+                                                 reactors=["default"]),
+          }
+builders.append(b24w32_scmikes_select)
 
 b24w32_win32er = {
           'name': "win32-win32er",
@@ -190,7 +238,7 @@
           'builddir': "W32-full2.4-iocp",
           'factory': TwistedReactorsBuildFactory(source_copy,
                                                  python="python",
-                                                 compileOpts2=["-c","mingw32"],
+                                                 compileOpts2=[],
                                                  reactors=["iocp"]),
           }
 builders.append(b24w32_iocp)
@@ -253,7 +301,8 @@
 c['debugPassword'] = private.debugPassword
 #c['interlocks'] = [("do-deb", ["full-2.2"], ["debuild"])]
 if hasattr(private, "manhole"):
-    c['manhole'] = master.Manhole(*private.manhole)
+    from buildbot import manhole
+    c['manhole'] = manhole.PasswordManhole(*private.manhole)
 c['status'].append(client.PBListener(9936))
 m = mail.MailNotifier(fromaddr="buildbot at twistedmatrix.com",
                       builders=["quick", "full-2.3"],