Changeset b50b5af2 in mainline for tools/config.py

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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.

File:

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

tools/config.py

@@ -34 +34 @@
 import os
 import re
-import commands
+import time
+import subprocess
 import xtui
 
@@ -225 +226 @@
         "Create output configuration"
         
-        revision = commands.getoutput('svnversion . 2> /dev/null')
-        timestamp = commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')
+        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+        version = subprocess.Popen(['bzr', 'version-info', '--custom', '--template={clean}:{revno}:{revision_id}'], stdout = subprocess.PIPE).communicate()[0].split(':')
+        
+        if (len(version) == 3):
+                revision = version[1]
+                if (version[0] != 1):
+                        revision += 'M'
+                revision += ' (%s)' % version[2]
+        else:
+                revision = None
         
         outmk = file(mkname, 'w')
@@ -266 +275 @@
                         outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
         
-        outmk.write('REVISION = %s\n' % revision)
+        if (revision is not None):
+                outmk.write('REVISION = %s\n' % revision)
+                outmc.write('#define REVISION %s\n' % revision)
+                outdf.write(' "-DREVISION=%s"' % revision)
+        
         outmk.write('TIMESTAMP = %s\n' % timestamp)
-        
-        outmc.write('#define REVISION %s\n' % revision)
         outmc.write('#define TIMESTAMP %s\n' % timestamp)
-        
-        outdf.write(' "-DREVISION=%s" "-DTIMESTAMP=%s"\n' % (revision, timestamp))
+        outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
         
         outmk.close()