From 2e2dffb80d2ca48823c3626d7bbbdd4d65f96273 Mon Sep 17 00:00:00 2001 From: anders_k Date: Mon, 20 Apr 2020 17:48:16 +0000 Subject: [PATCH] Make sure NSIS_VERSION is not just "v" git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7170 212acab6-be3b-0410-9dea-997c60f758d6 --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 01915c9d..95a0deed 100644 --- a/SConstruct +++ b/SConstruct @@ -278,12 +278,15 @@ if int(defenv['VER_PACKED'], 0) < int('0x03000000', 0) or int(defenv['VER_PACKED Exit(1) f.write('#define NSIS_PACKEDVERSION _T("%s")\n' % defenv['VER_PACKED']) -if 'VER_MAJOR' in defenv and defenv.get('VERSION','') == '': +if defenv.get('VERSION','') == '' and 'VER_MAJOR' in defenv: defenv['VERSION'] = defenv['VER_MAJOR'] if 'VER_MINOR' in defenv: defenv['VERSION'] += '.' + defenv['VER_MINOR'] if 'VER_REVISION' in defenv: defenv['VERSION'] += '.' + defenv['VER_REVISION'] +if defenv.get('VERSION','') == '' and int(defenv['VER_PACKED'], 0) > int('0x02000000', 0): + defenv['VERSION'] = '%i' % int(defenv['VER_PACKED'][2:][:2]) # Default to major version + print('WARNING: VERSION not set, defaulting to %s!' % defenv['VERSION']) f.write('#define NSIS_VERSION _T("v%s")\n' % defenv['VERSION']) f.close()