summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2019-02-13 10:18:43 +1100
committerChris Johns <chrisj@rtems.org>2019-02-13 10:18:43 +1100
commit5d8b0ddd0ac055b5edb569f119e8a4c744fd1aae (patch)
tree58735c15172a49cbc567d6132771ebe91fd7b5ec /wscript
parentec95748f03ca6f45e60e32e3dc5b221cc168d803 (diff)
downloadrtems-docs-5d8b0ddd0ac055b5edb569f119e8a4c744fd1aae.tar.bz2
waf: Remove as many sys path hacks as we can.
There are still sys.path hacks in the conf.py files. They cannot be removed because the instance of python running the sphinx-build command does not see our top level path hacks. I looked at using PYTHONPATH but I could not figure out how to set a process environ var for a waf build instance.
Diffstat (limited to 'wscript')
-rw-r--r--wscript14
1 files changed, 10 insertions, 4 deletions
diff --git a/wscript b/wscript
index f10fcb4..7cdda9a 100644
--- a/wscript
+++ b/wscript
@@ -5,11 +5,10 @@
import sys
import os.path
-sys.path.insert(0, os.path.abspath('common'))
-
import waflib
-import waf as docs_waf
-import version
+
+from common import waf as docs_waf
+from common import version
#
# Branch version
@@ -17,6 +16,13 @@ import version
rtems_major_version = '5'
#
+# Set Python's system path to `common` from the top level so the
+# conf.py modules in subdirectories can be found. See xml_catalogue in
+# common/waf.py.
+#
+sys.path.append(os.path.abspath('common'))
+
+#
# The documents to build.
#
build_all = ['user',