[Rivet-svn] rivet: Enable HTML and JSON doc builds even when the PDF manual ...

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/2f25bf3c58eb
branches:  release-2-6-x
changeset: 6213:2f25bf3c58eb
user:      Andy Buckley <andy at insectnation.org>
date:      Wed Jan 10 13:32:10 2018 +0000
description:
Enable HTML and JSON doc builds even when the PDF manual build is disabled, and handle the generated analyses directory more robustly

diffs (truncated from 92 to 50 lines):

--- a/doc/Makefile.am	Mon Jan 08 10:49:15 2018 +0000
+++ b/doc/Makefile.am	Wed Jan 10 13:32:10 2018 +0000
@@ -1,18 +1,22 @@
 dist_noinst_SCRIPTS = mk-analysis-html mk-analysis-latex mk-analysis-json
 
 LATEXSUBSOURCES = preamble.tex intro.tex gettingstarted.tex writinganalyses.tex agilerunmc.tex acknowledgements.tex
-DOCSOURCES = compare-histos.txt slip.eps thinker.eps cone.eps bend.eps \
+
+DOCSOURCES = $(LATEXSUBSOURCES) \
+  compare-histos.txt slip.eps thinker.eps cone.eps bend.eps \
   h-physrev3.bst hepnames.sty JHEP3.cls JHEP.bst make-plots.txt rivet-manual.tex \
-  $(LATEXSUBSOURCES) heppennames.sty hepnicenames.sty hepparticles.sty maybemath.sty \
+  heppennames.sty hepnicenames.sty hepparticles.sty maybemath.sty \
   hepunits.sty underscore.sty microtype.sty
 
 EXTRA_DIST = $(DOCSOURCES) refs.bib
+
 DOCS =
+DOCDIRS =
 
-if ENABLE_PDFMANUAL
 
 if ENABLE_PYEXT
 DOCS += analyses.html
+DOCDIRS += analyses
 analyses.html: $(top_srcdir)/analyses mk-analysis-html
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \
     DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \
@@ -31,7 +35,19 @@
 endif
 
 
+if WITH_ASCIIDOC
+DOCS += compare-histos.html make-plots.html
+EXTRA_DIST += compare-histos.html make-plots.html
 
+compare-histos.html: compare-histos.txt
+	asciidoc -a toc compare-histos.txt
+
+make-plots.html: make-plots.txt
+	asciidoc -a toc make-plots.txt
+endif
+
+
+if ENABLE_PDFMANUAL
 if WITH_PDFLATEX
 DOCS += rivet-manual.pdf
 
@@ -70,19 +86,6 @@
 endif