mirror of
https://git.rtems.org/rtems-docs/
synced 2025-07-22 03:17:16 +08:00
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.
This commit is contained in:
Chris Johns
parent
ec95748f03
commit
5d8b0ddd0a
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
18
eng/wscript
18
eng/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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
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_images as build
|
||||
from waf import cmd_options as options
|
||||
from common.waf import cmd_configure as configure
|
||||
from common.waf import cmd_build_images as build
|
||||
from common.waf import cmd_options as options
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,14 +1,10 @@
|
||||
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 doc_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 doc_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
|
||||
|
||||
import posix_rst
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
18
user/wscript
18
user/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
|
||||
|
||||
14
wscript
14
wscript
@ -5,17 +5,23 @@
|
||||
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
|
||||
#
|
||||
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.
|
||||
#
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user