Changeset de1beea in rtems-tools


Ignore:
Timestamp:
Feb 19, 2016, 12:26:51 AM (3 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, master
Children:
7148cae
Parents:
4351ae5
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.

Fix the install paths a revert the 'from . import' changes. This
is resolved by installing into the correct paths.

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • rtemstoolkit/config.py

    r4351ae5 rde1beea  
    4141import re
    4242import sys
     43
     44import error
     45import execute
     46import log
     47import options
     48import path
    4349
    4450try:
  • rtemstoolkit/execute.py

    r4351ae5 rde1beea  
    4242import time
    4343
    44 from . import error
    45 from . import log
     44import error
     45import log
    4646
    4747# Trace exceptions
  • rtemstoolkit/git.py

    r4351ae5 rde1beea  
    3232import os
    3333
    34 from . import error
    35 from . import execute
    36 from . import log
    37 from . import options
    38 from . import path
     34import error
     35import execute
     36import log
     37import options
     38import path
    3939
    4040class repo:
  • rtemstoolkit/log.py

    r4351ae5 rde1beea  
    3737import threading
    3838
    39 from . import error
     39import error
    4040
    4141#
  • rtemstoolkit/macros.py

    r4351ae5 rde1beea  
    3939import string
    4040
    41 from . import error
    42 from . import path
     41import error
     42import path
    4343
    4444#
  • rtemstoolkit/path.py

    r4351ae5 rde1beea  
    4040import string
    4141
    42 from . import error
    43 from . import log
     42import error
     43import log
    4444
    4545windows = os.name == 'nt'
  • rtemstoolkit/version.py

    r4351ae5 rde1beea  
    3636import sys
    3737
    38 from . import error
    39 from . import path
     38import error
     39import path
    4040
    4141#
     
    6868
    6969def _load_git_version():
     70    import git
    7071    global _git
    7172    global _version_str
  • rtemstoolkit/wscript

    r4351ae5 rde1beea  
    5252    conf.find_program('m4')
    5353
    54     conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
    55     conf.check_cc(function_name='kill', header_name="signal.h",
     54    conf.check(header_name = 'sys/wait.h',  features = 'c', mandatory = False)
     55    conf.check_cc(function_name = 'kill', header_name="signal.h",
    5656                  features = 'c', mandatory = False)
    5757    conf.write_config_header('config.h')
    58 
    59     conf.load('python')
    60     conf.check_python_version((2,6,6))
    6158
    6259def build(bld):
  • tester/rtems-test

    r4351ae5 rde1beea  
    3636sys.path = [parent, rtems, os.path.join(rtems, 'tester')] + sys.path
    3737
     38import rt.test
     39rt.test.run()
     40
    3841try:
    3942    import rt.test
  • tester/wscript

    r4351ae5 rde1beea  
    11#
    22# RTEMS Tools Project (http://www.rtems.org/)
    3 # Copyright 2015 Chris Johns (chrisj@rtems.org)
     3# Copyright 2013-2016 Chris Johns (chrisj@rtems.org)
    44# All rights reserved.
    55#
     
    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

    r4351ae5 rde1beea  
    77
    88def configure(conf):
    9     conf.load('python')
    10     conf.check_python_version((2,6,6))
     9    pass
    1110
    1211def build(bld):
     
    3029    bld(features = 'py',
    3130        source = source,
     31        install_from = '.',
    3232        install_path = '${PREFIX}/share/gdb/python/rtems')
  • wscript

    r4351ae5 rde1beea  
    101101    ctx.env.C_OPTS = ctx.options.c_opts.split(',')
    102102    check_options(ctx, ctx.options.host)
     103    #
     104    # Common Python check.
     105    #
     106    ctx.load('python')
     107    ctx.check_python_version((2,6,6))
     108    #
     109    # Installing the PYO,PYC seems broken on 1.8.19. The path is wrong.
     110    #
     111    ctx.env.PYO = 0
     112    ctx.env.PYC = 0
    103113    recurse(ctx)
    104114
Note: See TracChangeset for help on using the changeset viewer.