diff options
author | Chris Johns <chrisj@rtems.org> | 2015-12-09 20:08:19 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2015-12-09 20:08:19 +1100 |
commit | efc4f099b459833cc424f133716824bc0efc060e (patch) | |
tree | 683f0eb50e7bcb1f67175fc96d08228740b959ba /rtemstoolkit/wscript | |
parent | c9fa1795616ed8e9e71e7922e0a3fa52aff465f0 (diff) |
Add release versioning support.
Support a top level VERSION file that defines an RTEMS release.
Fix the install of the python modules including thertems-test.
Update the git python module to the RSB version. Fix the options to
not call clean and to call dirty.
Update the version python module.
Fix the rtld C++ support to the VERSION file and the top level waf
script.
Diffstat (limited to 'rtemstoolkit/wscript')
-rw-r--r-- | rtemstoolkit/wscript | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript index 9e9f047..930f55a 100644 --- a/rtemstoolkit/wscript +++ b/rtemstoolkit/wscript @@ -33,10 +33,6 @@ # import sys -version_major = 1 -version_minor = 0 -version_revision = 0 - # # Waf system setup. Allow more than one build in the same tree. # @@ -60,6 +56,11 @@ def configure(conf): features = 'c', mandatory = False) conf.write_config_header('config.h') + conf.load('python') + conf.check_python_version((2,6,6)) + conf.env['PYO'] = 0 + conf.env['PYC'] = 0 + def build(bld): # # The local configuration. @@ -125,7 +126,8 @@ def build(bld): install_path = None, source = rld_source + rtems_utils + compression, defines = ['HAVE_CONFIG_H=1', - 'RTEMS_VERSION=' + bld.env.RTEMS_VERSION, + 'RTEMS_VERSION=\"%s\"' % (bld.env.RTEMS_VERSION), + 'RTEMS_RELEASE=\"%s\"' % (bld.env.RTEMS_RELEASE), 'FASTLZ_LEVEL=1'], includes = ['.'] + conf['includes'], cflags = conf['cflags'] + conf['warningflags'], @@ -153,7 +155,7 @@ def build(bld): 'stacktraces.py', 'version.py', 'windows.py'], - install_path = '${PREFIX}/share/rtems/rtemstoolkit') + install_path = '${PREFIX}/share/rtems') def rebuild(ctx): import waflib.Options |