Changeset 234


Ignore:
Timestamp:
04/28/11 23:59:08 (13 years ago)
Author:
tim
Message:

improvements to version determination

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • SConstruct

    r232 r234  
    1313doc_targets=('doc-trunk',)
    1414all_targets = source_targets+win32_targets+doc_targets
    15 
    1615
    1716
     
    4140'''
    4241
     42svnversion_cmds='''
     43svn info svn+ssh://sentinelchicken.org/home/projects/subversion/reglookup\
     44  | grep "Last Changed Rev:" | cut -d' ' -f 4 \
     45  | sed 's/^/REGFI_VERSION="svn-/' | sed 's/$/"/' > .export/%s/regfi_version.py
     46'''
     47
    4348cleanup_cmds='''
    4449rm -rf .export
     
    4651
    4752source_cmds='''
    48 cd %s && scons doc
    49 mv %s %s && tar cf %s.tar %s && gzip -9 %s.tar;
     53mv %s .export/%s
     54cd .export/%s && scons doc
     55cd .export && tar cf %s.tar %s && gzip -9 %s.tar
     56mv .export/%s.tar.gz .
    5057'''+cleanup_cmds
    5158
     
    7986
    8087        if ttype == 'src':
    81             ret_val += source_cmds % (input_prefix, input_prefix, t_base, t_base, t_base, t_base)
     88            ret_val += source_cmds % (input_prefix, t_base, t_base, t_base,
     89                                      t_base, t_base, t_base)
    8290        elif ttype == 'win32':
    8391            env['platform']='cygwin'
     
    169177    i = version2input(version)
    170178    env.Execute(export_cmds % (i, i))
    171     if version != 'trunk':
     179    if version == 'trunk':
     180        env.Execute(svnversion_cmds % i)
     181    else:
    172182        env.Execute(version_cmds % (version, i))
    173183    env.Release(target, Dir('.export/'+i))
  • trunk/SConstruct

    r232 r234  
    11import sys
    22import os
     3sys.dont_write_bytecode = True
    34from regfi_version import REGFI_VERSION
    45
Note: See TracChangeset for help on using the changeset viewer.