Changeset e4c886f in rtems-tools


Ignore:
Timestamp:
Feb 19, 2016, 12:39:42 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.11
Children:
d17dd54
Parents:
c71c91b
Message:

Disable installing PYO and PYC. Fix install paths.

Installing PYO and PYC does not work so disable this. Move the
Python check to the top level and have a single place.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • rtemstoolkit/wscript

    rc71c91b re4c886f  
    2020    conf_libelf(conf)
    2121
    22     conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
    23     conf.check_cc(function_name='kill', header_name="signal.h",
     22    conf.check(header_name = 'sys/wait.h',  features = 'c', mandatory = False)
     23    conf.check_cc(function_name = 'kill', header_name = "signal.h",
    2424                  features = 'c', mandatory = False)
    2525    conf.write_config_header('config.h')
    26 
    27     conf.load('python')
    28     conf.check_python_version((2,6,6))
    2926
    3027def build(bld):
  • tester/wscript

    rc71c91b re4c886f  
    4141def configure(conf):
    4242    recurse(conf)
    43     conf.load('python')
    44     conf.check_python_version((2,6,6))
    4543
    4644def build(bld):
     
    6260                  'rt/version.py'],
    6361        install_from = '.',
    64         install_path = '${PREFIX}/share/rtems')
     62        install_path = '${PREFIX}/share/rtems/tester')
    6563    bld(features = 'py',
    6664        source = ['rt/pygdb/__init__.py',
     
    6866                  'rt/pygdb/spark.py'],
    6967        install_from = '.',
    70         install_path = '${PREFIX}/share/rtems')
     68        install_path = '${PREFIX}/share/rtems/tester')
    7169    bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755)
    7270
  • tools/gdb/python/wscript

    rc71c91b re4c886f  
    77
    88def configure(conf):
    9     conf.load('python')
    10     conf.check_python_version((2,6,6))
     9    pass
    1110
    1211def build(bld):
  • wscript

    rc71c91b re4c886f  
    9999    ctx.env.C_OPTS = ctx.options.c_opts.split(',')
    100100    check_options(ctx, ctx.options.host)
     101    #
     102    # Common Python check.
     103    #
     104    ctx.load('python')
     105    ctx.check_python_version((2,6,6))
     106    #
     107    # Installing the PYO,PYC seems broken on 1.8.19. The path is wrong.
     108    #
     109    ctx.env.PYO = 0
     110    ctx.env.PYC = 0
    101111    recurse(ctx)
    102112
Note: See TracChangeset for help on using the changeset viewer.