Changeset 3f03199 in mainline for tools/config.py

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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 mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• tools/config.py (modified) (2 diffs)

tools/config.py

@@ -363 +363 @@
 def create_output(mkname, mcname, config, rules):
         "Create output configuration"
-        
-        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+        timestamp_unix = int(time.time())
+        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp_unix))
         
         sys.stderr.write("Fetching current revision identifier ... ")
@@ -423 +424 @@
                 outmc.write('#define REVISION %s\n' % revision)
                 defs += ' "-DREVISION=%s"' % revision
+        
+        outmk.write('TIMESTAMP_UNIX = %d\n' % timestamp_unix)
+        outmc.write('#define TIMESTAMP_UNIX %d\n' % timestamp_unix)
+        defs += ' "-DTIMESTAMP_UNIX=%d"\n' % timestamp_unix
         
         outmk.write('TIMESTAMP = %s\n' % timestamp)