From 431641d0383182aee7cb62bf0a66d40b5c114e6a Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Thu, 4 Apr 2019 18:48:04 -0700 Subject: [PATCH 1/2] docs: Print working directory on readthedocs. Signed-off-by: Tim 'mithro' Ansell --- docs/conf.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e2aa1f71..7116ece4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -74,19 +74,12 @@ if not on_rtd: "conf_py_path": "/doc/", } else: + docs_dir = os.path.abspath(os.path.dirname(__file__)) + print("Docs dir is:", docs_dir) import subprocess - subprocess.call( - 'git fetch origin --unshallow', - cwd=os.path.abspath(os.path.dirname(__file__)), - shell=True) - subprocess.check_call( - 'git fetch origin --tags', - cwd=os.path.abspath(os.path.dirname(__file__)), - shell=True) - subprocess.check_call( - 'make links', - cwd=os.path.abspath(os.path.dirname(__file__)), - shell=True) + subprocess.call('git fetch origin --unshallow', cwd=docs_dir, shell=True) + subprocess.check_call('git fetch origin --tags', cwd=docs_dir, shell=True) + subprocess.check_call('make links', cwd=docs_dir, shell=True) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the From 9863296a53d426a0521d0e1ca68126785a229894 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Thu, 4 Apr 2019 18:56:19 -0700 Subject: [PATCH 2/2] docs: Allow make to be run in other directories. Signed-off-by: Tim 'mithro' Ansell --- docs/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 7f638e50..53ab46d0 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,6 +1,8 @@ # Minimal makefile for Sphinx documentation # +MAKEDIR := $(dir $(lastword $(MAKEFILE_LIST))) + # You can set these variables from the command line. SPHINXOPTS = SPHINXBUILD = sphinx-build @@ -20,8 +22,8 @@ livehtml: # Update fuzzer / minitest markdown links. fuzzers-links: - @cd db_dev_process/fuzzers; rm -f *.md - @cd db_dev_process/fuzzers; \ + @cd $(MAKEDIR)/db_dev_process/fuzzers && rm -f *.md + @cd $(MAKEDIR)/db_dev_process/fuzzers && \ for i in ../../../fuzzers/*; do \ n=$$(basename $$i | sed -e's/^[0-9][0-9][0-9]-//'); \ if [ ! -d $$i ]; then \ @@ -39,8 +41,8 @@ fuzzers-links: done minitests-links: - @cd db_dev_process/minitests; rm -f *.md - @cd db_dev_process/minitests; \ + @cd $(MAKEDIR)/db_dev_process/minitests && rm -f *.md + @cd $(MAKEDIR)/db_dev_process/minitests && \ for i in ../../../minitests/*; do \ n=$$(basename $$i | sed -e's/^[0-9][0-9][0-9]-//'); \ if [ ! -d $$i ]; then \