diff --git a/doc/Makefile.am b/doc/Makefile.am
index 493bac2bf6..a112f27312 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,129 +1,133 @@
#
# doc: Pacemaker code
#
# Copyright (C) 2008 Andrew Beekhof
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
MAINTAINERCLEANFILES = Makefile.in
helpdir = $(datadir)/$(PACKAGE)
ascii = crm_cli.txt crm_fencing.txt
help_DATA = crm_cli.txt
-docbook = Pacemaker_Explained
+docbook = Pacemaker_Explained Clusters_from_Scratch
man_MANS = cibadmin.8 crm_resource.8
doc_DATA = README.hb2openais $(ascii) $(generated_docs)
publican_docs =
generated_docs =
SVG := $(wildcard */en-US/images/pcmk-*.svg)
PNGS = $(SVG:%.svg=%-small.png) $(SVG:%.svg=%.png) $(SVG:%.svg=%-large.png) \
publican-clusterlabs/en-US/images/image_left.png \
publican-clusterlabs/en-US/images/image_right.png \
publican-clusterlabs/en-US/images/h1-bg.png
graphics: $(PNGS)
%.png: %.svg
inkscape --file=$< --export-dpi=90 -C --export-png=$@
%-small.png: %.svg
inkscape --file=$< --export-dpi=45 -C --export-png=$@
%-large.png: %.svg
inkscape --file=$< --export-dpi=180 -C --export-png=$@
XML_FILES := $(wildcard *.xml)
PNG_FILES := $(wildcard images/*.png)
if BUILD_ASCIIDOC
generated_docs += $(ascii:%.txt=%.html)
endif
if BUILD_DOCBOOK
publican_docs += $(docbook)
generated_docs += index.html
endif
EXTRA_DIST = $(man_MANS) $(docbook:%=%.xml)
index.html: $(docbook_txt)
echo "Building documentation index"
echo "<html><body><p>The following <a href=\"http://www.clusterlabs.org/wiki/Pacemaker\">Pacemaker</a> documentation was generated on `date` from version: $(BUILD_VERSION)</p>" > index.html
echo "<ol>" >> index.html
for doc in $(generated_docs); do \
echo "<li><a href=\"$$doc\">$$doc</a></li>" >> index.html; \
done
if BUILD_DOCBOOK
for book in $(docbook); do \
- for lang in `ls -1 $(docbook)/publish`; do \
+ for lang in `ls -1 $$book/publish`; do \
echo "<li>$$book ($$lang)<ul>" >> index.html; \
find $$book/publish/$$lang -name "*.pdf" -exec echo -n "<li><a href=\"{}\">" \; -exec basename {} \; -exec echo "</a></li>" \; | sed s:$$book/publish/:: >> index.html ; \
find $$book/publish/$$lang -name "*.txt" -exec echo -n "<li><a href=\"{}\">" \; -exec basename {} \; -exec echo "</a></li>" \; | sed s:$$book/publish/:: >> index.html ; \
find $$book/publish/$$lang -name html -exec echo "<li><a href=\"{}/$$book/index.html\">$$book HTML</a></li>" \; | sed s:$$book/publish/:: >> index.html ; \
find $$book/publish/$$lang -name html-single -exec echo "<li><a href=\"{}/$$book/index.html\">$$book HTML (single page)</a></li>" \; | sed s:$$book/publish/:: >> index.html ; \
echo "</ul></li>" >> index.html; \
done; \
done
endif
echo "</ol>" >> index.html
echo "<p>You can find <a href=\"http://www.clusterlabs.org/wiki/Documentation\">additional documentation</a> and details about the Pacemaker project at <a href=\"http://www.clusterlabs.org\">http://www.clusterlabs.org</a></p>" >> index.html
echo "</body></html>" >> index.html
-
%.html: %.txt
$(ASCIIDOC) --unsafe --backend=xhtml11 $<
%.txt: %/en-US/*.xml
cd $* && $(PUBLICAN) build --publish --langs=all --formats=pdf,html,html-single,txt
touch $@
if BUILD_DOCBOOK
docbook_txt = $(docbook:%=%.txt)
all-local: $(docbook_txt) */publican.cfg
#install-data-local: all-local
install-data-local: all-local
for book in $(docbook); do \
filelist=`find $$book/publish/* -print`; \
for f in $$filelist; do \
p=`echo $$f | sed s:publish/:: | sed s:Pacemaker/::`; \
if [ -d $$f ]; then \
$(INSTALL) -d 775 $(DESTDIR)$(docdir)/$$p; \
else \
$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/$$p; \
fi \
done; \
done
endif
+brand:
+ find publican-clusterlabs -name "*.noarch.rpm" -exec rm -f \{\} \;
+ cd publican-clusterlabs && $(PUBLICAN) package --binary
+ find publican-clusterlabs -name "*.noarch.rpm" -exec sudo rpm -Uvh --force \{\} \;
+
push: all-local $(generated_docs)
echo Uploading current documentation set to clusterlabs.org
- rsync -rtz --progress $(generated_docs) $(ascii) root@oss.clusterlabs.org:/srv/www/extras/doc/
+ rsync -rtz --progress $(generated_docs) $(ascii) root@oss.clusterlabs.org:/var/www/html/doc/
if BUILD_DOCBOOK
for book in $(docbook); do \
echo Uploading $$book...; \
echo "Generated on `date` from version: $(BUILD_VERSION)" > $$book/publish/build-$(PACKAGE_SERIES).txt; \
- rsync -rtz --progress $$book/publish/* root@oss.clusterlabs.org:/srv/www/extras/doc/; \
+ rsync -rtz --progress $$book/publish/* root@oss.clusterlabs.org:/var/www/html/doc/; \
done
endif
clean-local:
-rm -rf $(generated_docs) $(docbook_txt)
for book in $(docbook); do rm -rf $$book/tmp $$book/publish; done
diff --git a/doc/publican-clusterlabs/README b/doc/publican-clusterlabs/README
new file mode 100644
index 0000000000..e69de29bb2