git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ring: check internal arguments
[dpdk.git]
/
buildtools
/
call-sphinx-build.py
diff --git
a/buildtools/call-sphinx-build.py
b/buildtools/call-sphinx-build.py
index
b9a3994
..
26b1992
100755
(executable)
--- a/
buildtools/call-sphinx-build.py
+++ b/
buildtools/call-sphinx-build.py
@@
-6,14
+6,19
@@
import sys
import os
from os.path import join
import sys
import os
from os.path import join
-from subprocess import run, PIPE
+from subprocess import run, PIPE
, STDOUT
from distutils.version import StrictVersion
from distutils.version import StrictVersion
-(sphinx, src, dst) = sys.argv[1:] # assign parameters to variables
+# assign parameters to variables
+(sphinx, version, src, dst, *extra_args) = sys.argv[1:]
+
+# set the version in environment for sphinx to pick up
+os.environ['DPDK_VERSION'] = version
# for sphinx version >= 1.7 add parallelism using "-j auto"
# for sphinx version >= 1.7 add parallelism using "-j auto"
-ver = run([sphinx, '--version'], stdout=PIPE).stdout.decode().split()[-1]
-sphinx_cmd = [sphinx]
+ver = run([sphinx, '--version'], stdout=PIPE,
+ stderr=STDOUT).stdout.decode().split()[-1]
+sphinx_cmd = [sphinx] + extra_args
if StrictVersion(ver) >= StrictVersion('1.7'):
sphinx_cmd += ['-j', 'auto']
if StrictVersion(ver) >= StrictVersion('1.7'):
sphinx_cmd += ['-j', 'auto']
@@
-23,9
+28,12
@@
for root, dirs, files in os.walk(src):
srcfiles.extend([join(root, f) for f in files])
# run sphinx, putting the html output in a "html" directory
srcfiles.extend([join(root, f) for f in files])
# run sphinx, putting the html output in a "html" directory
-process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')], check=True)
-print(str(process.args) + ' Done OK')
+with open(join(dst, 'sphinx_html.out'), 'w') as out:
+ process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')],
+ stdout=out)
# create a gcc format .d file giving all the dependencies of this doc build
with open(join(dst, '.html.d'), 'w') as d:
d.write('html: ' + ' '.join(srcfiles) + '\n')
# create a gcc format .d file giving all the dependencies of this doc build
with open(join(dst, '.html.d'), 'w') as d:
d.write('html: ' + ' '.join(srcfiles) + '\n')
+
+sys.exit(process.returncode)