merging changes

.gitignore

@@ -14,23 +14,25 @@ dist
 build
 .build
 *.egg-info
-docs/buildbot.html
-docs/buildbot.info
-docs/buildbot.info-1
-docs/buildbot.info-2
-docs/images/master.png
-docs/images/overview.png
-docs/images/slavebuilder.png
-docs/images/slaves.png
-docs/images/status.png
+master/docs/buildbot.html
+master/docs/buildbot.info
+master/docs/buildbot.info-1
+master/docs/buildbot.info-2
+master/docs/images/master.png
+master/docs/images/overview.png
+master/docs/images/slavebuilder.png
+master/docs/images/slaves.png
+master/docs/images/status.png
 .stgit-edit.txt
 .project
 .pydevproject
 .settings
-docs/buildbot
-docs/version.texinfo
-docs/docs.tgz
-docs/latest
+master/docs/buildbot
+master/docs/version.texinfo
+master/docs/docs.tgz
+master/docs/latest
 twisted/plugins/dropin.cache
 .coverage
 coverage-html
+apidocs/reference
+apidocs/reference.tgz

Makefile

@@ -2,10 +2,10 @@
 
 .PHONY: docs apidocs some-apidocs paper
 docs:
-	$(MAKE) -C docs
+	$(MAKE) -C master/docs
 
-reference:
-	cd docs; ./gen-reference
+apidocs:
+	$(MAKE) -C apidocs
 
 pylint:
 	cd master; $(MAKE) pylint

apidocs/Makefile

@@ -0,0 +1,15 @@
+.PHONY: all reference cleanpyc
+
+all: reference.tgz
+
+cleanpyc:
+	cd .. && find master slave -name '*.pyc' -exec rm \{} \; || exit 1
+
+reference: cleanpyc
+	rm -rf reference
+	cd .. && python apidocs/epyrun -o apidocs/reference \
+			--exclude="buildbot\\.test" --exclude="buildslave\\.test" \
+			buildbot buildslave
+
+reference.tgz: reference
+	tar -zcf reference.tgz reference

apidocs/gen-reference

@@ -0,0 +1,7 @@
+#!/bin/bash
+echo $(dirname $0)
+cd $(dirname $0)
+cd ..
+find master slave -name '*.pyc' -exec rm \{} \; || exit 1
+# excludes both test suites
+python docs/epyrun -o docs/reference --exclude="buildbot\\.test" --exclude="buildslave\\.test" buildbot buildslave

master/MANIFEST.in

@@ -1,7 +1,7 @@
 include MANIFEST.in README NEWS CREDITS COPYING UPGRADING
 
 include docs/examples/*.cfg
-include docs/*.texinfo docs/buildbot.info* docs/buildbot.html
+include docs/*.texinfo
 include docs/*.png docs/images/*.png docs/images/*.svg docs/images/*.txt docs/images/*.ai
 include docs/images/icon.blend docs/images/Makefile
 include docs/epyrun docs/gen-reference docs/Makefile
@@ -13,8 +13,6 @@ include buildbot/status/web/files/*
 include buildbot/status/web/templates/*.html buildbot/status/web/templates/*.xml
 include buildbot/clients/debug.glade
 include buildbot/buildbot.png
-include ChangeLog*
-include test-dist.sh
 
 include contrib/* contrib/windows/* contrib/os-x/* contrib/css/*
 include contrib/trac/* contrib/trac/bbwatcher/* contrib/trac/bbwatcher/templates/*

master/NEWS

@@ -4,6 +4,23 @@ Major User visible changes in Buildbot.             -*- outline -*-
 
 * NEXT RELEASE
 
+** Required Jinja Version
+
+The Buildmaster now requires Jinja-2.1 or higher.
+
+** New libvirt-based Latent Buildslave Support
+
+This extends the support already included for EC2 buildslaves to include any
+virtualization platform supported by libvirt.
+
+** New Steps
+
+*** VC++ 9, VS2008, VCExpress9 - part of the vstudio suite of steps
+
+** Deprecations / Removals
+
+*** Removed sendchange's --revision_number argument (use --revision)
+
 * Release 0.8.1 (June 16, 2010)
 
 ** Slave Split into separate component

master/README

@@ -2,7 +2,7 @@
 BuildBot: build/test automation
   http://buildbot.net
   Brian Warner <warner-buildbot @ lothar . com>
-  Dustin J. Mitchell <dustin@v.igoro.us >
+  Dustin J. Mitchell <dustin@v.igoro.us>
 
 
 Abstract: