get version from command line and default to "date.cvs" to avoid creation of "official" releases

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4066 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-06-17 14:02:47 +00:00
parent 9704cb3a99
commit 2a45f49a20

View file

@ -8,8 +8,6 @@
# #
## ##
VERSION = open('VERSION').read()
stubs = [ stubs = [
'bzip2', 'bzip2',
'lzma', 'lzma',
@ -55,8 +53,6 @@ defenv = Environment()
defenv.SConsignFile() defenv.SConsignFile()
Export('defenv') Export('defenv')
defenv.Append(NSIS_VERSION = VERSION)
###################################################################### ######################################################################
####### Options ### ####### Options ###
###################################################################### ######################################################################
@ -66,7 +62,11 @@ hhc = 'no'
if defenv.WhereIs('hhc', os.environ['PATH']): if defenv.WhereIs('hhc', os.environ['PATH']):
hhc = 'yes' hhc = 'yes'
from time import strftime, gmtime
cvs_version = strftime('%d-%b-%Y.cvs', gmtime())
opts = Options() opts = Options()
opts.Add(('VERSION', 'Version of NSIS', cvs_version))
opts.Add(PathOption('PREFIX', 'Installation prefix', None)) opts.Add(PathOption('PREFIX', 'Installation prefix', None))
opts.Add(BoolOption('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no')) opts.Add(BoolOption('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no'))
opts.Add(BoolOption('DEBUG', 'Build executables with debugging information', 'no')) opts.Add(BoolOption('DEBUG', 'Build executables with debugging information', 'no'))
@ -85,7 +85,7 @@ Help(opts.GenerateHelpText(defenv))
####### Functions ### ####### Functions ###
###################################################################### ######################################################################
defenv['DISTDIR'] = Dir('#nsis-%s' % VERSION) defenv['DISTDIR'] = Dir('#nsis-$VERSION')
def Distribute(dir, files): def Distribute(dir, files):
if defenv.has_key('PREFIX') and defenv['PREFIX']: if defenv.has_key('PREFIX') and defenv['PREFIX']:
@ -166,7 +166,7 @@ defenv.Alias('install-includes', '$PREFIX/Include')
####### Distribution ### ####### Distribution ###
###################################################################### ######################################################################
dist_zip = 'nsis-%s.zip' % VERSION dist_zip = 'nsis-${VERSION}.zip'
zip_target = defenv.Zip(dist_zip, '$DISTDIR') zip_target = defenv.Zip(dist_zip, '$DISTDIR')
defenv.AddPostAction(zip_target, Delete('$DISTDIR')) defenv.AddPostAction(zip_target, Delete('$DISTDIR'))
defenv.Alias('dist', dist_zip) defenv.Alias('dist', dist_zip)