[jhbuild] fix buildbot master to work when installed system-wide
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild] fix buildbot master to work when installed system-wide
- Date: Fri, 22 May 2009 15:24:38 -0400 (EDT)
commit fee02b3ea79e12fa89a00fcd0ad0d8cade4886b2
Author: Frédéric Péters <fpeters 0d be>
Date: Fri May 22 21:23:07 2009 +0200
fix buildbot master to work when installed system-wide
---
Makefile.am | 2 +-
buildbot/Makefile | 19 -----------------
buildbot/Makefile.am | 52 +++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
jhbuild/commands/bot.py | 5 +++-
5 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 10e67b7..f938e48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po scripts jhbuild
+SUBDIRS = po scripts jhbuild buildbot
if DOC_INSTALLATION_ENABLED
SUBDIRS += doc
diff --git a/buildbot/Makefile b/buildbot/Makefile
deleted file mode 100644
index 5f79e59..0000000
--- a/buildbot/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-# This is a simple makefile which lives in a buildmaster/buildslave
-# directory (next to the buildbot.tac file). It allows you to start/stop the
-# master or slave by doing 'make start' or 'make stop'.
-
-# The 'reconfig' target will tell a buildmaster to reload its config file.
-
-start:
- twistd --no_save -y buildbot.tac --nodaemon
-
-stop:
- kill `cat twistd.pid`
-
-reconfig:
- kill -HUP `cat twistd.pid`
-
-log:
- tail -f twistd.log
diff --git a/buildbot/Makefile.am b/buildbot/Makefile.am
new file mode 100644
index 0000000..fa0859b
--- /dev/null
+++ b/buildbot/Makefile.am
@@ -0,0 +1,52 @@
+buildbotdir = $(pkgdatadir)/buildbot
+
+buildbot_DATA = \
+ master.cfg \
+ template.html
+
+buildbothtmldir = $(pkgdatadir)/buildbot/public_html
+
+buildbothtml_DATA = \
+ public_html/bar.png \
+ public_html/building.png \
+ public_html/cyan-bar.png \
+ public_html/download.png \
+ public_html/emptyimg.png \
+ public_html/error.png \
+ public_html/feed-atom.png \
+ public_html/feed.png \
+ public_html/figure.png \
+ public_html/foot-16.png \
+ public_html/foot.png \
+ public_html/general_bg.png \
+ public_html/general_separator.png \
+ public_html/gnome-16.png \
+ public_html/gnome-64.png \
+ public_html/gnome-gtp.png \
+ public_html/green-bar.png \
+ public_html/idle.png \
+ public_html/images.jpeg \
+ public_html/index.html \
+ public_html/info.png \
+ public_html/lgo.css \
+ public_html/logo.png \
+ public_html/nobody.png \
+ public_html/offline.png \
+ public_html/purple-bar.png \
+ public_html/red-bar.png \
+ public_html/robot.png \
+ public_html/robots.txt \
+ public_html/star.png \
+ public_html/t.png \
+ public_html/tab_left.png \
+ public_html/tab_right.png \
+ public_html/top-header-gradient.png \
+ public_html/warn.png \
+ public_html/webpage.png
+
+
+EXTRA_DIST = \
+ AUTHORS \
+ $(buildbot_DATA) \
+ $(buildbothtml_DATA)
+
diff --git a/configure.ac b/configure.ac
index 338d3fe..6a3a419 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,6 @@ AC_CONFIG_FILES([
jhbuild/modtypes/Makefile
jhbuild/utils/Makefile
jhbuild/versioncontrol/Makefile
-
+ buildbot/Makefile
])
AC_OUTPUT
diff --git a/jhbuild/commands/bot.py b/jhbuild/commands/bot.py
index 5deefe3..68ddee9 100644
--- a/jhbuild/commands/bot.py
+++ b/jhbuild/commands/bot.py
@@ -673,7 +673,10 @@ class cmd_bot(Command):
if buildbot_dir:
basedir = buildbot_dir
else:
- basedir = os.path.join(SRCDIR, 'buildbot')
+ if PKGDATADIR:
+ basedir = os.path.join(PKGDATADIR, 'buildbot')
+ else:
+ basedir = os.path.join(SRCDIR, 'buildbot')
os.chdir(basedir)
if not os.path.exists(os.path.join(basedir, 'builddir')):
os.makedirs(os.path.join(basedir, 'builddir'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]