fixed version numbering - always use what command line tells you to use (not 3.0.0)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6360 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2013-05-19 23:30:43 +00:00
parent 1554dac424
commit 3f0107c995

View file

@ -255,7 +255,7 @@ if (not defenv.has_key('VER_PACKED')) and defenv.has_key('VER_MAJOR') and defenv
if defenv.has_key('VER_PACKED'):
f.write('#define NSIS_PACKEDVERSION _T("%s")\n' % defenv['VER_PACKED'])
if defenv.has_key('VER_MAJOR'):
if defenv.has_key('VER_MAJOR') and not defenv.has_key('VERSION'):
defenv['VERSION'] = defenv['VER_MAJOR']
if defenv.has_key('VER_MINOR'):
defenv['VERSION'] += '.' + defenv['VER_MINOR']