[Buildbot-commits] buildbot setup.py,1.34,1.35 MANIFEST.in,1.19,1.20 ChangeLog,1.442,1.443

[Brian Warner]

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

Modified Files:
	setup.py MANIFEST.in ChangeLog 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-191
Creator:  Brian Warner <warner at monolith.lothar.com>

clean up 'buildbot start', change to Makefile.buildbot

	* buildbot/scripts/runner.py (start): change 'buildbot start' to
	look for Makefile.buildbot instead of a bare Makefile . The
	'buildbot start' does not install this file, so you have to
	manually copy it if you want to customize startup behavior.
	(createMaster): change 'buildbot master' command to create
	Makefile.sample instead of Makefile, to create master.cfg.sample
	instead of master.cfg (requiring you to copy it before the
	buildmaster can be started). Both sample files are kept up to
	date, i.e. they are overwritten if they have been changed. The
	'buildbot.tac' file is *not* overwritten, but if the new contents
	don't match the old, a 'buildbot.tac.new' file is created and the
	user is warned. This seems to be a much more sane way to handle
	startup files. Also, don't sys.exit(0) when done, so we can run
	unit tests against it.
	(createSlave): same. Don't overwrite the sample info/ files.
	* buildbot/scripts/sample.mk: remove. the contents were pulled
	into runner.py, since they need to match the behavior of start()
	* setup.py: same
	* MANIFEST.in: same


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -d -r1.442 -r1.443
--- ChangeLog	17 May 2005 10:38:08 -0000	1.442
+++ ChangeLog	17 May 2005 20:04:21 -0000	1.443
@@ -1,5 +1,28 @@
 2005-05-17  Brian Warner  <warner at lothar.com>
 
+	* buildbot/scripts/runner.py (start): change 'buildbot start' to
+	look for Makefile.buildbot instead of a bare Makefile . The
+	'buildbot start' does not install this file, so you have to
+	manually copy it if you want to customize startup behavior.
+	(createMaster): change 'buildbot master' command to create
+	Makefile.sample instead of Makefile, to create master.cfg.sample
+	instead of master.cfg (requiring you to copy it before the
+	buildmaster can be started). Both sample files are kept up to
+	date, i.e. they are overwritten if they have been changed. The
+	'buildbot.tac' file is *not* overwritten, but if the new contents
+	don't match the old, a 'buildbot.tac.new' file is created and the
+	user is warned. This seems to be a much more sane way to handle
+	startup files. Also, don't sys.exit(0) when done, so we can run
+	unit tests against it.
+	(createSlave): same. Don't overwrite the sample info/ files.
+	* buildbot/scripts/sample.mk: remove. the contents were pulled
+	into runner.py, since they need to match the behavior of start()
+	* setup.py: same
+	* MANIFEST.in: same
+
+	* docs/buildbot.texinfo (Launching the daemons): document it
+	* buildbot/test/test_runner.py (Create): test it
+
 	* buildbot/test/test_vc.py (SetupMixin.failUnlessIn): Add a
 	version that can handle string-in-string tests, because otherwise
 	python-2.2 fails the tests. It'd be tremendous if Trial's test

Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/buildbot/buildbot/MANIFEST.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MANIFEST.in	11 May 2005 23:25:25 -0000	1.19
+++ MANIFEST.in	17 May 2005 20:04:21 -0000	1.20
@@ -7,7 +7,7 @@
 include docs/buildbot.texinfo docs/buildbot.info
 include docs/epyrun docs/gen-reference
 include buildbot/test/mail/* buildbot/test/subdir/*
-include buildbot/scripts/sample.cfg buildbot/scripts/sample.mk
+include buildbot/scripts/sample.cfg
 include buildbot/status/classic.css
 include buildbot/clients/debug.glade
 include buildbot/buildbot.png

Index: setup.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/setup.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- setup.py	11 May 2005 23:30:15 -0000	1.34
+++ setup.py	17 May 2005 20:04:21 -0000	1.35
@@ -55,8 +55,7 @@
       data_files=[("buildbot", ["buildbot/buildbot.png"]),
                   ("buildbot/clients", ["buildbot/clients/debug.glade"]),
                   ("buildbot/status", ["buildbot/status/classic.css"]),
-                  ("buildbot/scripts", ["buildbot/scripts/sample.cfg",
-                                        "buildbot/scripts/sample.mk"]),],
+                  ("buildbot/scripts", ["buildbot/scripts/sample.cfg"]),],
       scripts = scripts,
       cmdclass={'install_data': install_data_twisted},
       )