Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 81475250 in mainline


Ignore:
Timestamp:
2012-04-08T11:40:35Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
d9f53877
Parents:
1dbe465 (diff), 6582b36 (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:

Build scripts work with Python 3 (thx Sean Bartell)

Location:
tools
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • tools/checkers/clang.py

    r1dbe465 r81475250  
    114114        for job in jobs:
    115115                if (not clang(rootdir, job)):
    116                         print
     116                        print()
    117117                        print("Failed job: %s" % job)
    118118                        return
  • tools/checkers/stanse.py

    r1dbe465 r81475250  
    127127        for job in jobs:
    128128                if (not stanse(rootdir, job)):
    129                         print
     129                        print()
    130130                        print("Failed job: %s" % job)
    131131                        return
  • tools/checkers/vcc.py

    r1dbe465 r81475250  
    204204        for job in jobs:
    205205                if (not vcc(vcc_path, rootdir, job)):
    206                         print
     206                        print()
    207207                        print("Failed job: %s" % job)
    208208                        return
    209209       
    210         print
     210        print()
    211211        print("All jobs passed")
    212212
  • tools/filldir.py

    r1dbe465 r81475250  
    3737
    3838if len(sys.argv) < 3:
    39         print 'Usage: filldir <parent-dir> <count>'
     39        print('Usage: filldir <parent-dir> <count>')
    4040        exit(2)
    4141
  • tools/gentestfile.py

    r1dbe465 r81475250  
    3636
    3737if len(sys.argv) < 2:
    38         print "Usage: gentestfile.py <count of 64-bit numbers to output>"
     38        print("Usage: gentestfile.py <count of 64-bit numbers to output>")
    3939        exit()
    4040
    41 m = long(sys.argv[1])
     41m = int(sys.argv[1])
    4242i = 0
    4343pow_2_64 = 2 ** 64
  • tools/mkfat.py

    r1dbe465 r81475250  
    247247        return bs
    248248
    249 def create_lfn_entry((name, index)) :
     249def create_lfn_entry(name_index) :
     250        (name, index) = name_index
    250251        entry = xstruct.create(LFN_ENTRY)
    251252
     
    293294                return [dir_entry]
    294295
    295         n = len(name) / 13 + 1
     296        n = (int) (len(name) / 13 + 1)
    296297        names = [(name[i * 13: (i + 1) * 13 + 1], i + 1) for i in range(n)]
    297298
     
    299300        entries[0].pos |= 0x40
    300301
    301         fname11 = dir_entry.name + dir_entry.ext
     302        fname11 = str(dir_entry.name + dir_entry.ext)
    302303
    303304        csum = 0
  • tools/mkuimage.py

    r1dbe465 r81475250  
    124124        header.img_type = 2             # Kernel
    125125        header.compression = 0          # None
    126         header.img_name = image_name
     126        header.img_name = image_name.encode('ascii')
    127127
    128128        header_crc = calc_crc32(header.pack())
     
    140140        signed_crc = zlib.crc32(byteseq, 0)
    141141        if signed_crc < 0:
    142                 return (long(signed_crc) + (long(2) ** long(32))) # 2^32L
     142                return signed_crc + (1 << 32)
    143143        else:
    144144                return signed_crc
     
    148148def print_syntax(cmd):
    149149        print("syntax: " + cmd + " [<options>] <raw_image> <uImage>")
    150         print
     150        print()
    151151        print("\traw_image\tInput image name (raw binary data)")
    152152        print("\tuImage\t\tOutput uImage name (U-Boot image)")
    153         print
     153        print()
    154154        print("options:")
    155155        print("\t-name <name>\tImage name (default: 'Noname')")
  • tools/xstruct.py

    r1dbe465 r81475250  
    3232
    3333import struct
     34import sys
    3435import types
    3536
     37integer_types = (int, long) if sys.version < '3' else (int,)
     38
    3639ranges = {
    37         'B': ((int, long), 0x00, 0xff),
    38         'H': ((int, long), 0x0000, 0xffff),
    39         'L': ((int, long), 0x00000000, 0xffffffff),
    40         'Q': ((int, long), 0x0000000000000000, 0xffffffffffffffff),
    41         'b': ((int, long), -0x80, 0x7f),
    42         'h': ((int, long), -0x8000, 0x7fff),
    43         'l': ((int, long), -0x80000000, 0x7fffffff) ,
    44         'q': ((int, long), -0x8000000000000000, 0x7fffffffffffffff),
     40        'B': (integer_types, 0x00, 0xff),
     41        'H': (integer_types, 0x0000, 0xffff),
     42        'L': (integer_types, 0x00000000, 0xffffffff),
     43        'Q': (integer_types, 0x0000000000000000, 0xffffffffffffffff),
     44        'b': (integer_types, -0x80, 0x7f),
     45        'h': (integer_types, -0x8000, 0x7fff),
     46        'l': (integer_types, -0x80000000, 0x7fffffff) ,
     47        'q': (integer_types, -0x8000000000000000, 0x7fffffffffffffff),
    4548}
    4649
Note: See TracChangeset for help on using the changeset viewer.