diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-02-19 11:26:51 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-02-19 11:26:51 +1100 |
| commit | de1beea245bd18cb9eadfb7dbaea6572269a97cd (patch) | |
| tree | d1e616e2d72a17e4d4b85f14df5920788d6b74f2 /tester/wscript | |
| parent | Update the version of waf. (diff) | |
| download | rtems-tools-de1beea245bd18cb9eadfb7dbaea6572269a97cd.tar.bz2 | |
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.
Diffstat (limited to 'tester/wscript')
| -rw-r--r-- | tester/wscript | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tester/wscript b/tester/wscript index 85dbd4a..2f6857f 100644 --- a/tester/wscript +++ b/tester/wscript @@ -1,6 +1,6 @@ # # RTEMS Tools Project (http://www.rtems.org/) -# Copyright 2015 Chris Johns (chrisj@rtems.org) +# Copyright 2013-2016 Chris Johns (chrisj@rtems.org) # All rights reserved. # # This file is part of the RTEMS Tools package in 'rtems-tools'. @@ -40,8 +40,6 @@ def options(opt): def configure(conf): recurse(conf) - conf.load('python') - conf.check_python_version((2,6,6)) def build(bld): recurse(bld) @@ -61,13 +59,13 @@ def build(bld): 'rt/test.py', 'rt/version.py'], install_from = '.', - install_path = '${PREFIX}/share/rtems') + install_path = '${PREFIX}/share/rtems/tester') bld(features = 'py', source = ['rt/pygdb/__init__.py', 'rt/pygdb/mi_parser.py', 'rt/pygdb/spark.py'], install_from = '.', - install_path = '${PREFIX}/share/rtems') + install_path = '${PREFIX}/share/rtems/tester') bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755) # |