[Buildbot-commits] buildbot/buildbot/process process_twisted.py,1.39,1.40

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31540/buildbot/process

Modified Files:
	process_twisted.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-350
Creator:  Brian Warner <warner at lothar.com>

enable build-on-branch for the Twisted buildbot

	* buildbot/process/process_twisted.py: rework all BuildFactory
	classes to take a 'source' step as an argument, instead of
	building up the SVN instance in the factory.
	* docs/examples/twisted_master.cfg: enable build-on-branch by
	providing a base_url and default_branch


Index: process_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/process_twisted.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- process_twisted.py	18 Oct 2005 06:29:56 -0000	1.39
+++ process_twisted.py	21 Oct 2005 08:14:52 -0000	1.40
@@ -28,7 +28,6 @@
 
 class TwistedBaseFactory(BuildFactory):
     buildClass = TwistedBuild
-    mode = "update"
     # bin/trial expects its parent directory to be named "Twisted": it uses
     # this to add the local tree to PYTHONPATH during tests
     workdir = "Twisted"
@@ -42,11 +41,11 @@
     treeStableTimer = 30
     useProgress = 0
 
-    def __init__(self, svnurl, python="python"):
+    def __init__(self, source, python="python"):
         if type(python) is str:
             python = [python]
         self.steps = []
-        self.steps.append(s(step.SVN, svnurl=svnurl, mode=self.mode))
+        self.steps.append(source)
         self.steps.append(s(HLint, python=python[0]))
         self.steps.append(s(RemovePYCs))
         for p in python:
@@ -59,13 +58,12 @@
 
 class FullTwistedBuildFactory(TwistedBaseFactory):
     treeStableTimer = 5*60
-    mode = "copy"
 
-    def __init__(self, svnurl, python="python",
+    def __init__(self, source, python="python",
                  processDocs=False, runTestsRandomly=False,
                  compileOpts=[], compileOpts2=[]):
         self.steps = []
-        self.steps.append(s(step.SVN, svnurl=svnurl, mode=self.mode))
+        self.steps.append(source)
         if processDocs:
             self.steps.append(s(ProcessDocs))
 
@@ -84,20 +82,20 @@
 class TwistedDebsBuildFactory(TwistedBaseFactory):
     treeStableTimer = 10*60
 
-    def __init__(self, svnurl, python="python"):
+    def __init__(self, source, python="python"):
         self.steps = []
-        self.steps.append(s(step.SVN, svnurl=svnurl, mode="export"))
+        self.steps.append(source)
         self.steps.append(s(ProcessDocs, haltOnFailure=True))
         self.steps.append(s(BuildDebs, warnOnWarnings=True))
 
 class TwistedReactorsBuildFactory(TwistedBaseFactory):
     treeStableTimer = 5*60
 
-    def __init__(self, svnurl,
+    def __init__(self, source,
                  python="python", compileOpts=[], compileOpts2=[],
                  reactors=None):
         self.steps = []
-        self.steps.append(s(step.SVN, svnurl=svnurl, mode="copy"))
+        self.steps.append(source)
 
         if type(python) == str:
             python = [python]