Changeset 5d8b0dd in rtems-docs


Ignore:
Timestamp:
Feb 12, 2019, 11:18:43 PM (5 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
d721375
Parents:
ec95748
Message:

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.

Files:
16 edited

Legend:

Unmodified
Added
Removed
  • bsp-howto/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • c-user/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • cpu-supplement/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • develenv/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • eclipse/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • eng/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • filesystem/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • images/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build_images as build
    7 from waf import cmd_options as options
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build_images as build
     3from common.waf import cmd_options as options
  • networking/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • porting/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • posix-compliance/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as doc_build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as doc_build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
    128
    139import posix_rst
  • posix-users/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • rtemsconfig/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • shell/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • user/wscript

    rec95748 r5d8b0dd  
    1 from sys import path
    2 from os.path import abspath
    3 path.insert(0, abspath('../common/'))
    4 
    5 from waf import cmd_configure as configure
    6 from waf import cmd_build as build
    7 from waf import cmd_options as options
    8 from waf import spell
    9 from waf import cmd_spell
    10 from waf import linkcheck
    11 from waf import cmd_linkcheck
     1from common.waf import cmd_configure as configure
     2from common.waf import cmd_build as build
     3from common.waf import cmd_options as options
     4from common.waf import spell
     5from common.waf import cmd_spell
     6from common.waf import linkcheck
     7from common.waf import cmd_linkcheck
  • wscript

    rec95748 r5d8b0dd  
    66import os.path
    77
    8 sys.path.insert(0, os.path.abspath('common'))
     8import waflib
    99
    10 import waflib
    11 import waf as docs_waf
    12 import version
     10from common import waf as docs_waf
     11from common import version
    1312
    1413#
     
    1615#
    1716rtems_major_version = '5'
     17
     18#
     19# Set Python's system path to `common` from the top level so the
     20# conf.py modules in subdirectories can be found. See xml_catalogue in
     21# common/waf.py.
     22#
     23sys.path.append(os.path.abspath('common'))
    1824
    1925#
Note: See TracChangeset for help on using the changeset viewer.