diff options
| author | callum_linden <none@none> | 2014-12-23 14:43:26 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-12-23 14:43:26 -0800 |
| commit | 1568aeaa504f162e2c04003f523a8332e776a81e (patch) | |
| tree | 06909ad76f1847eaf856d4fff54c5286e175afef | |
| parent | 3fde4149d821bcd84d5e8b99bcede5aeaa99c968 (diff) | |
Restore Unicode path to viewer_manifest script - apparently we use the Unicode version of NSIS, not the one from the NULLSOFT site
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index fc6f0c0021..4daa959d4a 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -595,7 +595,7 @@ class Windows_i686_Manifest(ViewerManifest): # 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 @@ class Windows_i686_Manifest(ViewerManifest): # 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 |