From 5d8b0ddd0ac055b5edb569f119e8a4c744fd1aae Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Wed, 13 Feb 2019 10:18:43 +1100 Subject: 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. --- shell/wscript | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'shell/wscript') diff --git a/shell/wscript b/shell/wscript index 1cb5736..4063cd4 100644 --- a/shell/wscript +++ b/shell/wscript @@ -1,11 +1,7 @@ -from sys import path -from os.path import abspath -path.insert(0, abspath('../common/')) - -from waf import cmd_configure as configure -from waf import cmd_build as build -from waf import cmd_options as options -from waf import spell -from waf import cmd_spell -from waf import linkcheck -from waf import cmd_linkcheck +from common.waf import cmd_configure as configure +from common.waf import cmd_build as build +from common.waf import cmd_options as options +from common.waf import spell +from common.waf import cmd_spell +from common.waf import linkcheck +from common.waf import cmd_linkcheck -- cgit v1.2.3