X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=buildtools%2Fcall-sphinx-build.py;h=26b199220a15780ff50480fe95befd35ceaba8d6;hb=618f0f4ac689f9255eecbef9202e77e35a9a7ceb;hp=fa6f26b3763d50bcca65a942866cf386105e7864;hpb=a4362f150204daa65715a876bd196f1cb955c501;p=dpdk.git diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index fa6f26b376..26b199220a 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -9,7 +9,8 @@ from os.path import join from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion -(sphinx, version, 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 @@ -17,7 +18,7 @@ os.environ['DPDK_VERSION'] = version # for sphinx version >= 1.7 add parallelism using "-j auto" ver = run([sphinx, '--version'], stdout=PIPE, stderr=STDOUT).stdout.decode().split()[-1] -sphinx_cmd = [sphinx] +sphinx_cmd = [sphinx] + extra_args if StrictVersion(ver) >= StrictVersion('1.7'): sphinx_cmd += ['-j', 'auto'] @@ -27,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 -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') + +sys.exit(process.returncode)