From 1612b65263db14bf48e550eb3746cd4cc303041a Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Thu, 25 Oct 2012 13:40:15 +0100 Subject: [PATCH] PDF build and doc reshuffle Add PDF builder Reshuffle the client doc building --- doc/{client.rst => client/command.rst} | 0 doc/client/index.rst | 7 +++++++ doc/conf.py | 13 +++++++++---- doc/index.rst | 2 +- setup.py | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) rename doc/{client.rst => client/command.rst} (100%) create mode 100644 doc/client/index.rst diff --git a/doc/client.rst b/doc/client/command.rst similarity index 100% rename from doc/client.rst rename to doc/client/command.rst diff --git a/doc/client/index.rst b/doc/client/index.rst new file mode 100644 index 00000000..8a3c2224 --- /dev/null +++ b/doc/client/index.rst @@ -0,0 +1,7 @@ +Libra Command Line Client +========================= + +.. toctree:: + :maxdepth: 2 + + command diff --git a/doc/conf.py b/doc/conf.py index eb8bd94c..b7514dd4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -26,7 +26,7 @@ import datetime # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = [] +extensions = ['rst2pdf.pdfbuilder'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -49,12 +49,13 @@ copyright = u'2012, Andrew Hutchings, David Shrewsbury' # built documents. # # The short X.Y version. -version = "%d.%02d" % ( +version = "%d-%02d-%02d-alpha1" % ( datetime.datetime.now().year, - datetime.datetime.now().month + datetime.datetime.now().month, + datetime.datetime.now().day ) # The full version, including alpha/beta/rc tags. -release = "%d.%02d.%02d" % ( +release = "%d-%02d-%02d-alpha1" % ( datetime.datetime.now().year, datetime.datetime.now().month, datetime.datetime.now().day @@ -192,6 +193,10 @@ latex_documents = [ u'Andrew Hutchings and David Shrewsbury', 'manual'), ] +pdf_documents = [('index', u'Libra', u'Libra Client, Worker and Pool Manager Documentation', u'Andrew Hutchings and David Shrewsbury')] + +#pdf_break_level = 1 + # The name of an image file (relative to this directory) to place at the top of # the title page. #latex_logo = None diff --git a/doc/index.rst b/doc/index.rst index 85038cc6..b9d72f01 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -4,5 +4,5 @@ Load Balancer as a Service Device Tools .. toctree:: :maxdepth: 3 - client + client/index worker/index diff --git a/setup.py b/setup.py index 66fa7474..44a9faf5 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ try: class local_BuildDoc(BuildDoc): def run(self): - for builder in ['html', 'man']: + for builder in ['html', 'man', 'pdf']: self.builder = builder self.finalize_options() BuildDoc.run(self)