Changeset eb6ff97 in rtems_waf

Timestamp:

06/16/16 04:53:33 (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

f921380bbd36458894f9114c1826fb1e4aee1ea7

Children:

c161c8d

Parents:

1aef190

Message:

Fix the root_filesystem tar command on Windows.

File:

• rtems.py (modified) (3 diffs)

rtems.py

@@ -37 +37 @@
 rtems_filters = None
 rtems_long_commands = False
+
+windows = os.name == 'nt'
 
 def options(opt):
@@ -150 +152 @@
     else:
         show_commands = 'no'
-    if rtems_long_commands and os.name == 'nt':
+    if rtems_long_commands and windows:
         long_commands = 'yes'
     else:
@@ -534 +536 @@
 
 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,