From 1568aeaa504f162e2c04003f523a8332e776a81e Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Tue, 23 Dec 2014 14:43:26 -0800
Subject: [PATCH] Restore Unicode path to viewer_manifest script - apparently
we use the Unicode version of NSIS, not the one from the NULLSOFT site
---
indra/newview/viewer_manifest.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index fc6f0c00213..4daa959d4a1 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -595,7 +595,7 @@ def package_finish(self):
# it also does python-style % substitution
self.replace_in("installers/windows/installer_template.nsi", tempfile, {
"%%VERSION%%":version_vars,
- "%%SOURCE%%":self.get_src_prefix(),
+ "%%SOURCE%%":self.get_src_sprefix(),
"%%INST_VARS%%":inst_vars_template % substitution_strings,
"%%INSTALL_FILES%%":self.nsi_file_commands(True),
"%%DELETE_FILES%%":self.nsi_file_commands(False)})
@@ -604,9 +604,9 @@ def package_finish(self):
# http://www.scratchpaper.com/
# Check two paths, one for Program Files, and one for Program Files (x86).
# 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):
- NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\makensis.exe')
+ NSIS_path = os.path.expandvars('${ProgramFiles(x86)}\\NSIS\\Unicode\\makensis.exe')
installer_created=False
nsis_attempts=3
nsis_retry_wait=15
--
GitLab