From 4b138220fa2514c22b78716b67a661cc22e8f710 Mon Sep 17 00:00:00 2001 From: Tommaso Pecorella Date: Thu, 11 Jun 2020 22:49:46 +0000 Subject: [PATCH] docs: (fixes #226) figures, introspection, and directory crawling --- doc/models/Makefile | 2 ++ doc/ns3_html_theme/get_version.sh | 2 +- wscript | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/models/Makefile b/doc/models/Makefile index e9e70a14f..b5c66324f 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -415,6 +415,8 @@ IMAGES_EPS = \ $(FIGURES)/nist-frame-success-rate-n.eps \ $(FIGURES)/nist-frame-success-rate-ac.eps \ $(FIGURES)/nist-frame-success-rate-ax.eps \ + $(FIGURES)/wifi-11a-p-1500-adhoc-r-54-min-5-max-50-step-5-throughput.eps \ + $(FIGURES)/wifi-11g-p-1500-infrastructure-r-6-min-5-max-50-step-5-throughput.eps \ $(FIGURES)/ca-rrc-reconf.eps \ $(FIGURES)/ca-lte-enb-net-device-changes.eps \ $(FIGURES)/ca-lte-ue-net-device-changes.eps \ diff --git a/doc/ns3_html_theme/get_version.sh b/doc/ns3_html_theme/get_version.sh index e42ae110a..7abd925bd 100755 --- a/doc/ns3_html_theme/get_version.sh +++ b/doc/ns3_html_theme/get_version.sh @@ -205,7 +205,7 @@ fi # This seems not always done automatically # by Sphinx when rebuilding cd doc 2>&1 >/dev/null -for d in {manual,models,tutorial/build/{single,}html/_static/ ; do +for d in {manual,models,tutorial}/build/{single,}html/_static/ ; do if [ ! -d $d ]; then mkdir -p $d fi diff --git a/wscript b/wscript index a58858c4c..e162738cf 100644 --- a/wscript +++ b/wscript @@ -1273,7 +1273,7 @@ def _print_introspected_doxygen(bld): # NS_COMMANDLINE_INTROSPECTION=".." test.py --nowaf --constrain=example Logs.info("Running CommandLine introspection") proc_env['NS_COMMANDLINE_INTROSPECTION'] = '..' - subprocess.run(["test.py", "--nowaf", "--constrain=example"], + subprocess.run(["./test.py", "--nowaf", "--constrain=example"], env=proc_env, stdout=subprocess.DEVNULL) doxygen_out = os.path.join('doc', 'introspected-command-line.h')