Changeset df3f85f in mainline for tools

Timestamp:

2012-05-23T12:03:26Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

692be1ae, 8ad5470, f7e69f5

Parents:

c196671 (diff), 67435b1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge GSOC-originated patches

Merge from lp:~vojtech-horky/helenos/misc.

The merge includes:

• Switching to previous directory with `cd -' in Bdsh
• Interactive mode for cp module in Bdsh
• Implementation of sleep command
• printf and echo for Bdsh
• Rewrite of the mkdir module
• Ctrl-arrow jumps over words in the editor
• The scripts work with Python 3

Location:

tools

Files:

• checkers/clang.py (modified) (1 diff)
• checkers/stanse.py (modified) (1 diff)
• checkers/vcc.py (modified) (1 diff)
• filldir.py (modified) (1 diff)
• gentestfile.py (modified) (1 diff)
• mkfat.py (modified) (3 diffs)
• mkuimage.py (modified) (3 diffs)
• xstruct.py (modified) (2 diffs)

tools/checkers/clang.py

@@ -114 +114 @@
         for job in jobs:
                 if (not clang(rootdir, job)):
-                        print
+                        print()
                         print("Failed job: %s" % job)
                         return

tools/checkers/stanse.py

@@ -127 +127 @@
         for job in jobs:
                 if (not stanse(rootdir, job)):
-                        print
+                        print()
                         print("Failed job: %s" % job)
                         return

tools/checkers/vcc.py

@@ -204 +204 @@
         for job in jobs:
                 if (not vcc(vcc_path, rootdir, job)):
-                        print
+                        print()
                         print("Failed job: %s" % job)
                         return
         
-        print
+        print()
         print("All jobs passed")
 

tools/filldir.py

@@ -37 +37 @@
 
 if len(sys.argv) < 3:
-        print 'Usage: filldir <parent-dir> <count>'
+        print('Usage: filldir <parent-dir> <count>')
         exit(2)
 

tools/gentestfile.py

@@ -36 +36 @@
 
 if len(sys.argv) < 2:
-        print "Usage: gentestfile.py <count of 64-bit numbers to output>"
+        print("Usage: gentestfile.py <count of 64-bit numbers to output>")
         exit()
 
-m = long(sys.argv[1])
+m = int(sys.argv[1])
 i = 0
 pow_2_64 = 2 ** 64

tools/mkfat.py

@@ -189 +189 @@
         "Filter FAT legal characters"
         
-        filtered_name = ''
+        filtered_name = b''
         filtered = False
         
@@ -205 +205 @@
         
         ascii_name, lfn = fat_lchars(name)
-        ascii_parts = ascii_name.split('.')
+        # Splitting works only on strings, not on bytes
+        ascii_parts = ascii_name.decode('utf8').split('.')
         
         short_name = ''
@@ -444 +445 @@
         extra_bytes = int(sys.argv[1])
         
-        path = os.path.abspath(sys.argv[2].decode())
+        path = os.path.abspath(sys.argv[2])
         if (not os.path.isdir(path)):
                 print("<PATH> must be a directory")

tools/mkuimage.py

@@ -124 +124 @@
         header.img_type = 2             # Kernel
         header.compression = 0          # None
-        header.img_name = image_name
+        header.img_name = image_name.encode('ascii')
 
         header_crc = calc_crc32(header.pack())
@@ -140 +140 @@
         signed_crc = zlib.crc32(byteseq, 0)
         if signed_crc < 0:
-                return (long(signed_crc) + (long(2) ** long(32))) # 2^32L
+                return signed_crc + (1 << 32)
         else:
                 return signed_crc
@@ -148 +148 @@
 def print_syntax(cmd):
         print("syntax: " + cmd + " [<options>] <raw_image> <uImage>")
-        print
+        print()
         print("\traw_image\tInput image name (raw binary data)")
         print("\tuImage\t\tOutput uImage name (U-Boot image)")
-        print
+        print()
         print("options:")
         print("\t-name <name>\tImage name (default: 'Noname')")

tools/xstruct.py

@@ -32 +32 @@
 
 import struct
+import sys
 import types
 
+# Handle long integer conversions nicely in both Python 2 and Python 3
+integer_types = (int, long) if sys.version < '3' else (int,)
+
+# Ensure that 's' format for struct receives correct data type depending
+# on Python version (needed due to different way to encode into bytes) 
+ensure_string = \
+        (lambda value: value if type(value) is str else bytes(value)) \
+                if sys.version < '3' else \
+        (lambda value: bytes(value, 'ascii') if type(value) is str else value)
+
 ranges = {
-        'B': ((int, long), 0x00, 0xff),
-        'H': ((int, long), 0x0000, 0xffff),
-        'L': ((int, long), 0x00000000, 0xffffffff),
-        'Q': ((int, long), 0x0000000000000000, 0xffffffffffffffff),
-        'b': ((int, long), -0x80, 0x7f),
-        'h': ((int, long), -0x8000, 0x7fff),
-        'l': ((int, long), -0x80000000, 0x7fffffff) ,
-        'q': ((int, long), -0x8000000000000000, 0x7fffffffffffffff),
+        'B': (integer_types, 0x00, 0xff),
+        'H': (integer_types, 0x0000, 0xffff),
+        'L': (integer_types, 0x00000000, 0xffffffff),
+        'Q': (integer_types, 0x0000000000000000, 0xffffffffffffffff),
+        'b': (integer_types, -0x80, 0x7f),
+        'h': (integer_types, -0x8000, 0x7fff),
+        'l': (integer_types, -0x80000000, 0x7fffffff) ,
+        'q': (integer_types, -0x8000000000000000, 0x7fffffffffffffff),
 }
 
@@ -74 +85 @@
                                         args.append(item)
                         else:
+                                if (fmt == "s"):
+                                        value = ensure_string(value)
                                 check_range(variable, fmt, value)
                                 args.append(value)