[jhbuild] Extra jhbuildbot configuration

[John Carr <johncarr src gnome org>]

commit 7da4543da738ed65a7d8c3ab93ea304166576c96
Author: John Carr <john carr unrouted co uk>
Date:   Mon Jun 1 13:56:49 2009 +0100

    Extra jhbuildbot configuration
---
 jhbuild/commands/bot.py    |   10 +++++-----
 jhbuild/config.py          |    3 ++-
 jhbuild/defaults.jhbuildrc |    3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jhbuild/commands/bot.py b/jhbuild/commands/bot.py
index 68ddee9..dcdf99a 100644
--- a/jhbuild/commands/bot.py
+++ b/jhbuild/commands/bot.py
@@ -85,13 +85,13 @@ class cmd_bot(Command):
                         action='store', dest='logfile', default=None,
                         help=_('log file location')),
             make_option('--slaves-dir', metavar='SLAVESDIR',
-                        action='store', dest='slaves_dir', default='.',
+                        action='store', dest='slaves_dir', default=None,
                         help=_('directory with slaves files (only with --start-server)')),
             make_option('--buildbot-dir', metavar='BUILDBOTDIR',
                         action='store', dest='buildbot_dir', default=None,
                         help=_('directory with buildbot work files (only with --start-server)')),
             make_option('--mastercfg', metavar='CFGFILE',
-                        action='store', dest='mastercfgfile', default='master.cfg',
+                        action='store', dest='mastercfgfile', default=None,
                         help=_('master cfg file location (only with --start-server)')),
             make_option('--step',
                         action='store_true', dest='step', default=False,
@@ -123,9 +123,9 @@ class cmd_bot(Command):
         daemonize = False
         pidfile = None
         logfile = None
-        slaves_dir = None
-        mastercfgfile = None
-        buildbot_dir = None
+        slaves_dir = config.jhbuildbot_slaves_dir
+        mastercfgfile = config.jhbuildbot_mastercfg
+        buildbot_dir = config.jhbuildbot_dir
 
         if options.daemon:
             daemonize = True
diff --git a/jhbuild/config.py b/jhbuild/config.py
index ab2e956..5a65b18 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -46,7 +46,8 @@ _known_keys = [ 'moduleset', 'modules', 'skip', 'tags', 'prefix',
                 'nopoison', 'forcecheck', 'makecheck_advisory',
                 'quiet_mode', 'progress_bar', 'module_extra_env',
                 'jhbuildbot_master', 'jhbuildbot_slavename', 'jhbuildbot_password',
-                'jhbuildbot_svn_commits_box',
+                'jhbuildbot_svn_commits_box', 'jhbuildbot_slaves_dir',
+                'jhbuildbot_dir', 'jhbuildbot_mastercfg',
                 'use_local_modulesets', 'ignore_suggests', 'modulesets_dir',
                 'mirror_policy', 'module_mirror_policy', 'dvcs_mirror_dir',
                 'build_targets',
diff --git a/jhbuild/defaults.jhbuildrc b/jhbuild/defaults.jhbuildrc
index 46a407f..badf516 100644
--- a/jhbuild/defaults.jhbuildrc
+++ b/jhbuild/defaults.jhbuildrc
@@ -153,6 +153,9 @@ jhbuildbot_password = None
 
 # options for jhbuildbot master
 jhbuildbot_svn_commits_box = None
+jhbuildbot_slaves_dir = os.path.abspath(".")
+jhbuildbot_dir = None
+jhbuildbot_mastercfg = "master.cfg"
 
 # whether to use a local copy of modulesets (instead of fetching them from svn)
 use_local_modulesets = False