diff options
author | Chris Johns <chrisj@rtems.org> | 2016-06-16 14:53:33 +1000 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2016-06-16 14:53:33 +1000 |
commit | eb6ff970b34e2ca8266fdea6327cc6a5cf435179 (patch) | |
tree | 4bc8b4e5b2b2c8a3c11bb40b5eb74deeaa63cd60 | |
parent | Add long command line support for gcc. (diff) | |
download | rtems_waf-eb6ff970b34e2ca8266fdea6327cc6a5cf435179.tar.bz2 |
Fix the root_filesystem tar command on Windows.
-rw-r--r-- | rtems.py | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -37,6 +37,8 @@ rtems_default_version = None rtems_filters = None rtems_long_commands = False +windows = os.name == 'nt' + def options(opt): opt.add_option('--rtems', default = None, @@ -149,7 +151,7 @@ def configure(conf, bsp_configure = None): show_commands = 'yes' else: show_commands = 'no' - if rtems_long_commands and os.name == 'nt': + if rtems_long_commands and windows: long_commands = 'yes' else: long_commands = 'no' @@ -533,10 +535,13 @@ def library_path(library, cc, cflags): return None def root_filesystem(bld, name, files, tar, obj): + tar_rule = 'tar -cf ${TGT} --format=ustar -C ../.. $(echo "${SRC}" | sed -e \'s/\.\.\/\.\.\///\')' + if windows: + tar_rule = 'sh -c "%s"' % (tar_rule) bld(name = name + '_tar', target = tar, source = files, - rule = 'SDIR=$PWD && cd ../.. && tar --format=ustar -cf $SDIR/${TGT} $(echo "${SRC}" | sed -e "s/\.\.\/\.\.\///\")') + rule = tar_rule) bld.objects(name = name, target = obj, source = tar, |