Changeset 9b642f92 in mainline for tools

Timestamp:

2017-10-27T18:44:07Z (8 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), f9c4bc5a (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.

Location:

tools

Files:

• config.py (modified) (2 diffs)
• mkarray.py (modified) (6 diffs)

tools/config.py

@@ -445 +445 @@
 def create_output(mkname, mcname, config, rules):
         "Create output configuration"
-
-        timestamp_unix = int(time.time())
+        
+        varname_strip = 'CONFIG_STRIP_REVISION_INFO'
+        strip_rev_info = (varname_strip in config) and (config[varname_strip] == 'y')
+        
+        if strip_rev_info:
+                timestamp_unix = int(0)
+        else:
+                # TODO: Use commit timestamp instead of build time.
+                timestamp_unix = int(time.time())
+        
         timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp_unix))
         
@@ -458 +466 @@
                 sys.stderr.write("failed\n")
         
-        if len(version) == 3:
+        if (not strip_rev_info) and (len(version) == 3):
                 revision = version[1]
                 if version[0] != 1:

tools/mkarray.py

@@ -70 +70 @@
         section = sys.argv[4]
         
+        timestamp = (1980, 1, 1, 0, 0, 0)
+        
         header_ctx = []
         desc_ctx = []
@@ -79 +81 @@
         archive = zipfile.ZipFile("%s.zip" % dest, "w", zipfile.ZIP_STORED)
         
-        for src in sys.argv[5:]:
+        for src in sorted(sys.argv[5:]):
                 basename = os.path.basename(src)
                 plainname = os.path.splitext(basename)[0]
@@ -95 +97 @@
                         src_data = deflate(src_data)
                         src_fname = os.path.basename("%s.deflate" % src)
-                        archive.writestr(src_fname, src_data)
+                        zipinfo = zipfile.ZipInfo(src_fname, timestamp)
+                        archive.writestr(zipinfo, src_data)
                 else:
                         src_fname = src
@@ -155 +158 @@
         data += "\n\n"
         data += "#endif\n"
-        archive.writestr("%s.h" % dest, data)
+        zipinfo = zipfile.ZipInfo("%s.h" % dest, timestamp)
+        archive.writestr(zipinfo, data)
         
         data = ''
@@ -166 +170 @@
         data += "\n".join(data_ctx)
         data += "\n"
-        archive.writestr("%s.s" % dest, data)
+        zipinfo = zipfile.ZipInfo("%s.s" % dest, timestamp)
+        archive.writestr(zipinfo, data)
         
         data = ''
@@ -180 +185 @@
         data += "\n".join(size_ctx)
         data += "\n"
-        archive.writestr("%s_desc.c" % dest, data)
+        zipinfo = zipfile.ZipInfo("%s_desc.c" % dest, timestamp)
+        archive.writestr(zipinfo, data)
         
         archive.close()