Log script errors, fix bogus copy

Peter D. Barnes, Jr. 2012-08-08 14:04:05 -07:00
parent 190f314ba5
commit fd133f7f8b
2 changed files with 6 additions and 5 deletions

View File

@ -185,11 +185,10 @@ fi
# This seems not always done automatically
# by Sphinx when rebuilding
cd doc 2>&1 >/dev/null
for d in {manual,models,tutorial{,-pt-br}}/build/{single,}html/_static html \
html ; do
for d in {manual,models,tutorial{,-pt-br}}/build/{single,}html/_static/ ; do
# expect the copy to fail if the destination dir
# hasn't been created by a prior doc build
cp ns3_html_theme/static/ns3_version.js $d 2>/dev/null
cp ns3_html_theme/static/ns3_version.js $d
done
cd - 2>&1 >/dev/null
@ -197,3 +196,4 @@ cd - 2>&1 >/dev/null
say
say "outf = $outf:"
cat -n $outf
say Done.

View File

@ -1075,6 +1075,7 @@ def _doxygen(bld):
_getVersion()
doxygen_config = os.path.join('doc', 'doxygen.conf')
if subprocess.Popen([env['DOXYGEN'], doxygen_config]).wait():
Logs.error("Doxygen build returned an error.")
raise SystemExit(1)
@ -1085,9 +1086,8 @@ def _getVersion():
prog = "doc/ns3_html_theme/get_version.sh"
if subprocess.Popen([prog]).wait() :
print "ERROR: " + prog
Logs.error(prog + " returned an error")
raise SystemExit(1)
print "SUCCESS: " + prog
class Ns3DoxygenContext(Context.Context):
"""do a full build, generate the introspected doxygen and then the doxygen"""
@ -1112,6 +1112,7 @@ class Ns3SphinxContext(Context.Context):
if subprocess.Popen(["make", "SPHINXOPTS=-N", "-k",
"html", "singlehtml", "latexpdf" ],
cwd=path).wait() :
Logs.error("Sphinx build of " + path + " returned an error.")
raise SystemExit(1)
def execute(self):