summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2015-12-11 17:15:34 +1100
committerChris Johns <chrisj@rtems.org>2015-12-11 17:15:34 +1100
commit3b9bfa4dfe6fe10fbaf1ebbf1ddca660c2f33167 (patch)
tree8e4f77ee798dfc218a408a1666176ad00ab01278
parentAdd a VERSION message to configure. (diff)
downloadrtems-tools-3b9bfa4dfe6fe10fbaf1ebbf1ddca660c2f33167.tar.bz2
Fix how to use the waf py feature to get py source and pyo file installed.
Thanks to ita for the example.
-rw-r--r--rtemstoolkit/wscript5
-rw-r--r--tester/wscript4
2 files changed, 4 insertions, 5 deletions
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript
index cf61f76..ae22a58 100644
--- a/rtemstoolkit/wscript
+++ b/rtemstoolkit/wscript
@@ -26,8 +26,6 @@ def configure(conf):
conf.load('python')
conf.check_python_version((2,6,6))
- conf.env['PYO'] = 0
- conf.env['PYC'] = 0
def build(bld):
#
@@ -123,7 +121,8 @@ def build(bld):
'stacktraces.py',
'version.py',
'windows.py'],
- install_path = '${PREFIX}/share/rtems')
+ install_from = '.',
+ install_path = '${PREFIX}/share/rtems/rtemstoolkit')
def rebuild(ctx):
import waflib.Options
diff --git a/tester/wscript b/tester/wscript
index 56d0337..85dbd4a 100644
--- a/tester/wscript
+++ b/tester/wscript
@@ -42,8 +42,6 @@ def configure(conf):
recurse(conf)
conf.load('python')
conf.check_python_version((2,6,6))
- conf.env['PYO'] = 0
- conf.env['PYC'] = 0
def build(bld):
recurse(bld)
@@ -62,11 +60,13 @@ def build(bld):
'rt/stty.py',
'rt/test.py',
'rt/version.py'],
+ install_from = '.',
install_path = '${PREFIX}/share/rtems')
bld(features = 'py',
source = ['rt/pygdb/__init__.py',
'rt/pygdb/mi_parser.py',
'rt/pygdb/spark.py'],
+ install_from = '.',
install_path = '${PREFIX}/share/rtems')
bld.install_files('${PREFIX}/bin', ['rtems-test'], chmod = 0o755)