|
@@ -6763,10 +6763,13 @@ def MakeInstallerNSIS(file, title, installdir):
|
|
|
elif (os.path.isdir(file)):
|
|
elif (os.path.isdir(file)):
|
|
|
shutil.rmtree(file)
|
|
shutil.rmtree(file)
|
|
|
|
|
|
|
|
|
|
+ pyver = SDK["PYTHONVERSION"][6:9]
|
|
|
if GetTargetArch() == 'x64':
|
|
if GetTargetArch() == 'x64':
|
|
|
regview = '64'
|
|
regview = '64'
|
|
|
else:
|
|
else:
|
|
|
regview = '32'
|
|
regview = '32'
|
|
|
|
|
+ if int(pyver[0]) == 3 and int(pyver[2]) >= 5:
|
|
|
|
|
+ pyver += '-32'
|
|
|
|
|
|
|
|
if (RUNTIME):
|
|
if (RUNTIME):
|
|
|
# Invoke the make_installer script.
|
|
# Invoke the make_installer script.
|
|
@@ -6799,7 +6802,7 @@ def MakeInstallerNSIS(file, title, installdir):
|
|
|
'OUTFILE' : '..\\' + file,
|
|
'OUTFILE' : '..\\' + file,
|
|
|
'BUILT' : '..\\' + GetOutputDir(),
|
|
'BUILT' : '..\\' + GetOutputDir(),
|
|
|
'SOURCE' : '..',
|
|
'SOURCE' : '..',
|
|
|
- 'PYVER' : SDK["PYTHONVERSION"][6:9],
|
|
|
|
|
|
|
+ 'PYVER' : pyver,
|
|
|
'REGVIEW' : regview,
|
|
'REGVIEW' : regview,
|
|
|
'EXT_SUFFIX' : GetExtensionSuffix(),
|
|
'EXT_SUFFIX' : GetExtensionSuffix(),
|
|
|
}
|
|
}
|