luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #759 from mithro/master 

docs: Trying to fix readthedocs
This commit is contained in:
Tim Ansell 2019-04-04 19:45:23 -07:00 committed by GitHub
parent c7c8f00748 9863296a53
commit b06c97db48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/Makefile
View File

@ -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 \

17
docs/conf.py
View File

@ -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