SL-617: pass final_exe from viewer manifest to NSIS as VIEWER_EXE

2 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 4396a576cc..682c37971c 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -102,6 +102,7 @@ Page instfiles
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Var INSTPROG

 Var INSTEXE

+Var VIEWER_EXE

 Var INSTSHORTCUT

 Var COMMANDLINE         # Command line passed to this installer, set in .onInit

 Var SHORTCUT_LANG_PARAM # "--set InstallLanguage de", Passes language to viewer

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 2e3e4d6a07..b289db9b8f 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -654,7 +654,6 @@ class WindowsManifest(ViewerManifest):
             'version' : '.'.join(self.args['version']),
             'version_short' : '.'.join(self.args['version'][:-1]),
             'version_dashes' : '-'.join(self.args['version']),
-            'viewer_exe' : self.channel_with_pkg_suffix().replace(' ', '')+'.exe',
             'final_exe' : self.final_exe(),
             'flags':'',
             'app_name':self.app_name(),
@@ -669,7 +668,7 @@ class WindowsManifest(ViewerManifest):
         !define VERSION "%(version_short)s"
         !define VERSION_LONG "%(version)s"
         !define VERSION_DASHES "%(version_dashes)s"
-        !define VIEWER_EXE "%(viewer_exe)s%"
+        !define VIEWER_EXE "%(final_exe)s"
         """ % substitution_strings
         
         if self.channel_type() == 'release':