[rtems-tools commit] Fix how to use the waf py feature to get py source and pyo file installed.

Chris Johns chrisj at rtems.org
Fri Dec 11 06:19:22 UTC 2015


Module:    rtems-tools
Branch:    master
Commit:    a6f5f188ce61d586136c643125dfb857da64169f
Changeset: http://git.rtems.org/rtems-tools/commit/?id=a6f5f188ce61d586136c643125dfb857da64169f

Author:    Chris Johns <chrisj at rtems.org>
Date:      Fri Dec 11 17:15:34 2015 +1100

Fix how to use the waf py feature to get py source and pyo file installed.

Thanks to ita for the example.

---

 rtemstoolkit/wscript | 5 ++---
 tester/wscript       | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript
index 930f55a..4b31471 100644
--- a/rtemstoolkit/wscript
+++ b/rtemstoolkit/wscript
@@ -58,8 +58,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):
     #
@@ -155,7 +153,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)
 



More information about the vc mailing list