Changeset 234

Timestamp:

04/28/11 23:59:08 (14 years ago)

Author:

tim

Message:

improvements to version determination

Files:

• SConstruct (modified) (5 diffs)
• trunk/SConstruct (modified) (1 diff)

SConstruct

@@ -13 +13 @@
 doc_targets=('doc-trunk',)
 all_targets = source_targets+win32_targets+doc_targets
-
 
 
@@ -41 +40 @@
 '''
 
+svnversion_cmds='''
+svn info svn+ssh://sentinelchicken.org/home/projects/subversion/reglookup\
+  | grep "Last Changed Rev:" | cut -d' ' -f 4 \
+  | sed 's/^/REGFI_VERSION="svn-/' | sed 's/$/"/' > .export/%s/regfi_version.py
+'''
+
 cleanup_cmds='''
 rm -rf .export
@@ -46 +51 @@
 
 source_cmds='''
-cd %s && scons doc
-mv %s %s && tar cf %s.tar %s && gzip -9 %s.tar;
+mv %s .export/%s
+cd .export/%s && scons doc
+cd .export && tar cf %s.tar %s && gzip -9 %s.tar
+mv .export/%s.tar.gz .
 '''+cleanup_cmds
 
@@ -79 +86 @@
 
         if ttype == 'src':
-            ret_val += source_cmds % (input_prefix, input_prefix, t_base, t_base, t_base, t_base)
+            ret_val += source_cmds % (input_prefix, t_base, t_base, t_base,
+                                      t_base, t_base, t_base)
         elif ttype == 'win32':
             env['platform']='cygwin'
@@ -169 +177 @@
     i = version2input(version)
     env.Execute(export_cmds % (i, i))
-    if version != 'trunk':
+    if version == 'trunk':
+        env.Execute(svnversion_cmds % i)
+    else:
         env.Execute(version_cmds % (version, i))
     env.Release(target, Dir('.export/'+i))

trunk/SConstruct

@@ -1 +1 @@
 import sys
 import os
+sys.dont_write_bytecode = True
 from regfi_version import REGFI_VERSION