jhbuild r2259 - in trunk: . buildbot jhbuild

[fpeters svn gnome org]

Author: fpeters
Date: Sat Aug 16 09:52:52 2008
New Revision: 2259
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2259&view=rev

Log:
* buildbot/master.cfg, jhbuild/config.py, jhbuild/defaults.jhbuildrc:
new jhbuildbot_svn_commits_box for build master to give the path to
a Maildir box with messages from svn-commits-list; also removed
unrelated explanations from buildbot master.cfg.



Modified:
   trunk/ChangeLog
   trunk/buildbot/master.cfg
   trunk/jhbuild/config.py
   trunk/jhbuild/defaults.jhbuildrc

Modified: trunk/buildbot/master.cfg
==============================================================================
--- trunk/buildbot/master.cfg	(original)
+++ trunk/buildbot/master.cfg	Sat Aug 16 09:52:52 2008
@@ -57,36 +57,16 @@
 # put here: there are several in buildbot/changes/*.py to choose from.
 
 from jhbuild.buildbot.changes import GnomeMaildirSource
-if os.path.exists(os.path.expanduser('~/Maildir')):
+if jhbuild_config.jhbuildbot_svn_commits_box:
     # trigger builds from mails to svn-commit-list
     # (note Maildir must be correct, or everything will fail)
     c['change_source'] = GnomeMaildirSource(
-        os.path.expanduser('~/Maildir'), prefix=None)
+        jhbuild_config.jhbuildbot_svn_commits_box, prefix=None)
 else:
-    # support injection
+    # support injection (use 'buildbot sendchange')
     from buildbot.changes.pb import PBChangeSource
     c['change_source'] = PBChangeSource()
 
-# For example, if you had CVSToys installed on your repository, and your
-# CVSROOT/freshcfg file had an entry like this:
-#pb = ConfigurationSet([
-#    (None, None, None, PBService(userpass=('foo', 'bar'), port=4519)),
-#    ])
-
-# then you could use the following buildmaster Change Source to subscribe to
-# the FreshCVS daemon and be notified on every commit:
-#
-#from buildbot.changes.freshcvs import FreshCVSSource
-#fc_source = FreshCVSSource("cvs.example.com", 4519, "foo", "bar")
-#c['change_source'] = fc_source
-
-# or, use a PBChangeSource, and then have your repository's commit script run
-# 'buildbot sendchange', or use contrib/svn_buildbot.py, or
-# contrib/arch_buildbot.py :
-#
-#from buildbot.changes.pb import PBChangeSource
-#c['change_source'] = PBChangeSource()
-
 ####### SCHEDULERS
 
 ## configure the Schedulers
@@ -199,4 +179,4 @@
 # with an externally-visible host name which the buildbot cannot figure out
 # without some help.
 
-c['buildbotURL'] = "http://localhost:8010/";
+c['buildbotURL'] = "http://localhost:8080/";

Modified: trunk/jhbuild/config.py
==============================================================================
--- trunk/jhbuild/config.py	(original)
+++ trunk/jhbuild/config.py	Sat Aug 16 09:52:52 2008
@@ -43,7 +43,9 @@
                 'build_policy', 'trycheckout', 'min_time',
                 'nopoison', 'forcecheck', 'makecheck_advisory',
                 'quiet_mode', 'progress_bar', 'module_extra_env',
-                'jhbuildbot_master', 'jhbuildbot_slavename', 'jhbuildbot_password']
+                'jhbuildbot_master', 'jhbuildbot_slavename', 'jhbuildbot_password',
+                'jhbuildbot_svn_commits_box',
+                ]
 
 env_prepends = {}
 def prependpath(envvar, path):

Modified: trunk/jhbuild/defaults.jhbuildrc
==============================================================================
--- trunk/jhbuild/defaults.jhbuildrc	(original)
+++ trunk/jhbuild/defaults.jhbuildrc	Sat Aug 16 09:52:52 2008
@@ -124,3 +124,6 @@
 jhbuildbot_master = 'localhost:9070'
 jhbuildbot_slavename = None
 jhbuildbot_password = None
+
+# options for jhbuildbot master
+jhbuildbot_svn_commits_box = None