Commit fee02b3e authored by Frederic Peters's avatar Frederic Peters

fix buildbot master to work when installed system-wide

parent 92237153
SUBDIRS = po scripts jhbuild
SUBDIRS = po scripts jhbuild buildbot
if DOC_INSTALLATION_ENABLED
SUBDIRS += doc
......
# -*- 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
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)
......@@ -44,6 +44,6 @@ AC_CONFIG_FILES([
jhbuild/modtypes/Makefile
jhbuild/utils/Makefile
jhbuild/versioncontrol/Makefile
buildbot/Makefile
])
AC_OUTPUT
......@@ -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'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment