From d5bb7258c8167ea2c9606a7ab61ea9db9cde57d2 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Wed, 10 Oct 2012 08:03:52 -0400 Subject: [PATCH] Working on makefile --- Makefile | 4 +- docsite/Makefile | 6 +- docsite/YAMLSyntax.html | 19 +- docsite/_themes/bootstrap/layout.html | 18 +- docsite/api.html | 31 +- docsite/bestpractices.html | 19 +- docsite/examples.html | 19 +- docsite/genindex.html | 19 +- docsite/gettingstarted.html | 19 +- docsite/index.html | 19 +- docsite/moduledev.html | 23 +- docsite/modules.html | 567 ++++++++++++++++++++------ docsite/patterns.html | 19 +- docsite/playbooks.html | 19 +- docsite/playbooks2.html | 19 +- docsite/rst/modules/_list.rst | 5 + docsite/rst/modules/fail.rst | 8 +- docsite/rst/modules/lineinfile.rst | 20 +- docsite/rst/modules/service.rst | 2 +- docsite/rst/modules/shell.rst | 2 +- docsite/search.html | 19 +- docsite/searchindex.js | 2 +- 22 files changed, 500 insertions(+), 378 deletions(-) diff --git a/Makefile b/Makefile index 132152bc35b..9e26de57e09 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ tests: PYTHONPATH=./lib nosetests -d -v # To force a rebuild of the docs run 'touch VERSION && make docs' -docs: $(MANPAGES) modulepages docsite +docs: $(MANPAGES) modulepages webdocs # Regenerate %.1.asciidoc if %.1.asciidoc.in has been modified more # recently than %.1.asciidoc. @@ -164,5 +164,5 @@ deb: debian modulepages: hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man3/ --module-dir=library --template-dir=hacking/templates -docsite: +webdocs: (cd docsite; make docs) diff --git a/docsite/Makefile b/docsite/Makefile index 55096cb5247..cb9b839050a 100644 --- a/docsite/Makefile +++ b/docsite/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/make SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -FORMATTER=../ansible/hacking/module_formatter.py +FORMATTER=../hacking/module_formatter.py all: clean docs @@ -25,7 +25,7 @@ clean: .PHONEY: docs clean -modules: $(FORMATTER) ../ansible/hacking/templates/rst.j2 - $(FORMATTER) -t rst --template-dir=../ansible/hacking/templates --module-dir=../ansible/library -o rst/modules/ --includes-file=rst/modules/_list.rst +modules: $(FORMATTER) ../hacking/templates/rst.j2 + $(FORMATTER) -t rst --template-dir=../hacking/templates --module-dir=../library -o rst/modules/ --includes-file=rst/modules/_list.rst diff --git a/docsite/YAMLSyntax.html b/docsite/YAMLSyntax.html index 7de54da9c4b..76c5df2c62c 100644 --- a/docsite/YAMLSyntax.html +++ b/docsite/YAMLSyntax.html @@ -104,21 +104,6 @@ s.parentNode.insertBefore(ga, s); - - - @@ -264,11 +249,9 @@ languages:
diff --git a/docsite/_themes/bootstrap/layout.html b/docsite/_themes/bootstrap/layout.html index 796cc66b7bd..3318691512f 100644 --- a/docsite/_themes/bootstrap/layout.html +++ b/docsite/_themes/bootstrap/layout.html @@ -99,21 +99,6 @@ s.parentNode.insertBefore(ga, s); - - - {% endblock %} {% block header %}{{ navBar() }}{% endblock %} @@ -130,12 +115,11 @@ s.parentNode.insertBefore(ga, s); {% block body %} {% endblock %}
+ {%- endblock %} {%- block footer %}