Skip to content

Commit

Permalink
Merge branch 'sphinxdocs-benallard'
Browse files Browse the repository at this point in the history
Refs #189

* sphinxdocs-benallard: (30 commits)
  include an all-on-one-page docs page
  flag 'latest' docs with a warning
  fix reference warnings, and instruct sphinx to fail on them
  make sure _static directory exists
  build docs quietly
  fix rules to make docs.tgz
  fix typo
  minor docs reorg
  refactor docs from including .rsi files to using .rst files with toctree
  clean up documentation copyright
  fix unknown keyword errors
  move images into sphinx's required location; docs build now
  fix duplicate target name (Subversion)
  Finish the configuration section. Manual is now complete
  Upgrade cfg-buildslaves.rsi
  Update the Customization chapter
  Update cfg-schedulers.rsi
  Update cmdline.rst
  Update developper.rst
  Upgrade cfg-changesources.rsi
  ...
  • Loading branch information
djmitche committed Aug 9, 2011
2 parents 2ccd573 + 3e1854e commit e39e7c1
Show file tree
Hide file tree
Showing 65 changed files with 13,235 additions and 13,186 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -38,3 +38,4 @@ apidocs/reference
apidocs/reference.tgz
common/googlecode_upload.py
master/docs/tutorial/_build
_build
34 changes: 9 additions & 25 deletions master/docs/Makefile
@@ -1,33 +1,14 @@
all: docs.tgz

VERSION=$(shell if [ -n "$$VERSION" ]; then echo $$VERSION; else PYTHONPATH=..:$${PYTHONPATH} python -c 'from buildbot import version; print version'; fi)

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 $<
.PHONY: images images-png images-eps tutorial manual

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
mkdir $(VERSION)/images
cp images/*.png $(VERSION)/images
tar -zcf $@ $(VERSION)
VERSION=$(shell if [ -n "$$VERSION" ]; then echo $$VERSION; else PYTHONPATH=..:$${PYTHONPATH} python -c 'from buildbot import version; print version'; fi)

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
docs.tgz: manual images-png
cd manual; $(MAKE) singlehtml
cp manual/_build/singlehtml/index.html manual/_build/html/full.html
tar -C manual/_build --transform 's/^html/$(VERSION)/' -zcf $@ html

.PHONY: images images-png images-eps tutorial
images:
$(MAKE) -C images all
images-png:
Expand All @@ -36,5 +17,8 @@ images-png:
images-eps:
$(MAKE) -C images images-eps

manual:
cd manual; $(MAKE) clean; $(MAKE) html

tutorial:
cd tutorial; $(MAKE) clean; $(MAKE) html
109 changes: 0 additions & 109 deletions master/docs/buildbot.texinfo

This file was deleted.

217 changes: 0 additions & 217 deletions master/docs/cfg-builders.texinfo

This file was deleted.

0 comments on commit e39e7c1

Please sign in to comment.