Skip to content
Snippets Groups Projects
Commit 1568aeaa authored by callum_linden's avatar callum_linden
Browse files

Restore Unicode path to viewer_manifest script - apparently we use the Unicode...

Restore Unicode path to viewer_manifest script - apparently we use the Unicode version of NSIS, not the one from the NULLSOFT site
parent 3fde4149
No related branches found
No related tags found
No related merge requests found
...@@ -595,7 +595,7 @@ def package_finish(self): ...@@ -595,7 +595,7 @@ def package_finish(self):
# it also does python-style % substitution # it also does python-style % substitution
self.replace_in("installers/windows/installer_template.nsi", tempfile, { self.replace_in("installers/windows/installer_template.nsi", tempfile, {
"%%VERSION%%":version_vars, "%%VERSION%%":version_vars,
"%%SOURCE%%":self.get_src_prefix(), "%%SOURCE%%":self.get_src_sprefix(),
"%%INST_VARS%%":inst_vars_template % substitution_strings, "%%INST_VARS%%":inst_vars_template % substitution_strings,
"%%INSTALL_FILES%%":self.nsi_file_commands(True), "%%INSTALL_FILES%%":self.nsi_file_commands(True),
"%%DELETE_FILES%%":self.nsi_file_commands(False)}) "%%DELETE_FILES%%":self.nsi_file_commands(False)})
...@@ -604,9 +604,9 @@ def package_finish(self): ...@@ -604,9 +604,9 @@ def package_finish(self):
# http://www.scratchpaper.com/ # http://www.scratchpaper.com/
# Check two paths, one for Program Files, and one for Program Files (x86). # Check two paths, one for Program Files, and one for Program Files (x86).
# Yay 64bit windows. # Yay 64bit windows.
NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\makensis.exe') NSIS_path = os.path.expandvars('${ProgramFiles}\\NSIS\\Unicode\\makensis.exe')
if not os.path.exists(NSIS_path): if not os.path.exists(NSIS_path):
NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\makensis.exe') NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')
installer_created=False installer_created=False
nsis_attempts=3 nsis_attempts=3
nsis_retry_wait=15 nsis_retry_wait=15
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment