From 5ebf44e9b7803f04b30b277c9d9bf598d5a939fe Mon Sep 17 00:00:00 2001 From: Jean Baptiste Favre Date: Thu, 15 Jul 2021 20:48:17 +0100 Subject: [PATCH] Make documentation build works outside of git repository Origin: other Last-Update: 2019-01-03 Current documentation build requires git and curl to get some stuff from the internet This patch aims to delete those dependencies, forcing git branch to master, and using Debian provided plantuml instead of downloading it from apache mirror Last-Update: 2019-01-03 Gbp-Pq: Name 0006-fix-doc-build.patch --- doc/Makefile.am | 2 +- doc/ext/traffic-server.py | 2 +- doc/uml/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index f03bb87b..f8bba788 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -61,7 +61,7 @@ I18NSPHINXOPTS = $(SPHINXOPTS) # The PAPER setting variables requires recursive make variable expansion, which automake # detects as non-portable. We bounce this through a shell script and do the expansion there. SBUILD = PAPEROPT_a4="$(PAPEROPT_a4)" PAPEROPT_letter="$(PAPEROPT_letter)" PAPER="$(PAPER)" \ - PLANTUML_JAR="$(shell ext/plantuml_fetch.sh | tail -1)" \ + PLANTUML_JAR="/usr/share/plantuml/plantuml.jar" \ $(srcdir)/sbuild $(SPHINXBUILD) \ -c $(srcdir) \ $(ALLSPHINXOPTS) diff --git a/doc/ext/traffic-server.py b/doc/ext/traffic-server.py index 24d9ef67..59ead26e 100644 --- a/doc/ext/traffic-server.py +++ b/doc/ext/traffic-server.py @@ -380,7 +380,7 @@ with open('../configure.ac', 'r') as f: autoconf_version = '.'.join(match.group(1).split('.', 2)[:2] + ['x']) # get the current branch the local repository is on -git_branch = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) +git_branch = "master" def make_github_link(name, rawtext, text, lineno, inliner, options={}, content=[]): diff --git a/doc/uml/Makefile.am b/doc/uml/Makefile.am index 956068f3..f3d08cf0 100644 --- a/doc/uml/Makefile.am +++ b/doc/uml/Makefile.am @@ -18,7 +18,7 @@ if BUILD_DOCS images := $(patsubst %.uml,images/%.svg,$(wildcard *.uml)) -PLANTUML_JAR := $(shell ../ext/plantuml_fetch.sh | tail -1) +PLANTUML_JAR := /usr/share/plantuml/plantuml.jar all-am: jar-check $(images) endif @@ -39,7 +39,7 @@ latex: all-am man: all-am images/%.svg : %.uml - $(JAVA) -jar $(PLANTUML_JAR) -o images -tsvg $< + $(JAVA) -jar $(PLANTUML_JAR) -graphvizdot /usr/bin/dot -o images -tsvg $< clean-local: rm -f images/*.svg -- 2.30.2