Changeset 9b642f92 in mainline for tools/mkarray.py


Ignore:
Timestamp:
2017-10-27T18:44:07Z (6 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d088616
Parents:
0798689 (diff), f9c4bc5 (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 reproducibility improvements.

These improvements reduce the alteration to output files due to outside influences and randomness. This makes most of the output files reproducible, and by consequence more easily comparable.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tools/mkarray.py

    r0798689 r9b642f92  
    7070        section = sys.argv[4]
    7171       
     72        timestamp = (1980, 1, 1, 0, 0, 0)
     73       
    7274        header_ctx = []
    7375        desc_ctx = []
     
    7981        archive = zipfile.ZipFile("%s.zip" % dest, "w", zipfile.ZIP_STORED)
    8082       
    81         for src in sys.argv[5:]:
     83        for src in sorted(sys.argv[5:]):
    8284                basename = os.path.basename(src)
    8385                plainname = os.path.splitext(basename)[0]
     
    9597                        src_data = deflate(src_data)
    9698                        src_fname = os.path.basename("%s.deflate" % src)
    97                         archive.writestr(src_fname, src_data)
     99                        zipinfo = zipfile.ZipInfo(src_fname, timestamp)
     100                        archive.writestr(zipinfo, src_data)
    98101                else:
    99102                        src_fname = src
     
    155158        data += "\n\n"
    156159        data += "#endif\n"
    157         archive.writestr("%s.h" % dest, data)
     160        zipinfo = zipfile.ZipInfo("%s.h" % dest, timestamp)
     161        archive.writestr(zipinfo, data)
    158162       
    159163        data = ''
     
    166170        data += "\n".join(data_ctx)
    167171        data += "\n"
    168         archive.writestr("%s.s" % dest, data)
     172        zipinfo = zipfile.ZipInfo("%s.s" % dest, timestamp)
     173        archive.writestr(zipinfo, data)
    169174       
    170175        data = ''
     
    180185        data += "\n".join(size_ctx)
    181186        data += "\n"
    182         archive.writestr("%s_desc.c" % dest, data)
     187        zipinfo = zipfile.ZipInfo("%s_desc.c" % dest, timestamp)
     188        archive.writestr(zipinfo, data)
    183189       
    184190        archive.close()
Note: See TracChangeset for help on using the changeset viewer.