Changes in tools/config.py [5a8fbcb:04b29ca] in mainline

File:

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

tools/config.py

@@ -34 +34 @@
 import os
 import re
-import time
-import subprocess
+import commands
 import xtui
 
@@ -226 +225 @@
         "Create output configuration"
         
-        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
+        revision = commands.getoutput('svnversion . 2> /dev/null')
+        timestamp = commands.getoutput('date "+%Y-%m-%d %H:%M:%S"')
         
         outmk = file(mkname, 'w')
@@ -275 +266 @@
                         outdf.write(' -D%s=%s -D%s_%s' % (varname, default, varname, default))
         
-        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('REVISION = %s\n' % revision)
         outmk.write('TIMESTAMP = %s\n' % timestamp)
+        
+        outmc.write('#define REVISION %s\n' % revision)
         outmc.write('#define TIMESTAMP %s\n' % timestamp)
-        outdf.write(' "-DTIMESTAMP=%s"\n' % timestamp)
+        
+        outdf.write(' "-DREVISION=%s" "-DTIMESTAMP=%s"\n' % (revision, timestamp))
         
         outmk.close()