Merge branch 'movedocs'

* movedocs:
  Finish moving docs around
  WIP - look for comment to see where I was
  break out 'Schedulers' section, add indices for each section
  move 'Change Sources' under 'Configuration'
  Support building docs in both split and full HTML
  add pointer to API docs
  split documentation into per-chapter files

.gitignore

@@ -27,6 +27,10 @@ docs/images/status.png
 .project
 .pydevproject
 .settings
+docs/buildbot
+docs/version.texinfo
+docs/docs.tgz
+docs/latest
 twisted/plugins/dropin.cache
 .coverage
 coverage-html

buildbot/process/subunitlogobserver.py

@@ -51,14 +51,6 @@ def issue(self):
         """An issue - failing, erroring etc test."""
         self.step.setProgress('tests failed', len(self.failures) + len(self.errors))
 
-
-class SubunitShellCommand(ShellCommand):
-    """A ShellCommand that sniffs subunit output.
-
-    Ideally not needed, and thus here to be trivially deleted. See issue #615
-    """
-
-    def __init__(self, *args, **kwargs):
-        ShellCommand.__init__(self, *args, **kwargs)
-        self.addLogObserver('stdio', SubunitLogObserver())
-        self.progressMetrics = self.progressMetrics + ('tests', 'tests failed')
+# this used to be referenced here, so we keep a link for old time's sake
+import buildbot.steps.subunit
+SubunitShellCommand = buildbot.steps.subunit.SubunitShellCommand

buildbot/steps/subunit.py

@@ -0,0 +1,16 @@
+from unittest import TestResult
+
+from buildbot.steps.shell import ShellCommand
+
+class SubunitShellCommand(ShellCommand):
+    """A ShellCommand that sniffs subunit output.
+
+    Ideally not needed, and thus here to be trivially deleted. See issue #615
+    """
+
+    def __init__(self, *args, **kwargs):
+        ShellCommand.__init__(self, *args, **kwargs)
+        # importing here gets around an import loop
+        from buildbot.process import subunitlogobserver
+        self.addLogObserver('stdio', subunitlogobserver.SubunitLogObserver())
+        self.progressMetrics = self.progressMetrics + ('tests', 'tests failed')

docs/Makefile

@@ -1,17 +1,30 @@
+all: docs.tgz
+
+VERSION=$(shell python -c 'g = {}; execfile("../buildbot/__init__.py",g); print g["version"]')
 
 buildbot.info: buildbot.texinfo
+	echo "@set VERSION $(VERSION)" > version.texinfo
 	makeinfo --fill-column=70 $<
 
 buildbot.html: buildbot.texinfo images-png
+	echo "@set VERSION $(VERSION)" > version.texinfo
 	makeinfo --no-split --html $<
 
+docs.tgz: buildbot.html images-png
+	echo "@set VERSION $(VERSION)" > version.texinfo
+	rm -rf $(VERSION)
+	makeinfo --html --output $(VERSION) buildbot.texinfo
+	cp buildbot.html $(VERSION)/full.html
+	tar -zcf $@ $(VERSION)
+
 buildbot.ps: buildbot.texinfo images-eps
+	echo "@set VERSION $(VERSION)" > version.texinfo
+	rm -rf buildbot
 	texi2dvi $<
 	dvips buildbot.dvi
 	rm buildbot.aux buildbot.cp buildbot.cps buildbot.fn buildbot.ky buildbot.log buildbot.pg buildbot.toc buildbot.tp buildbot.vr
 	rm buildbot.dvi
 
-
 .PHONY: images images-png images-eps
 images:
 	$(MAKE) -C images all