diff options
| author | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-04-28 20:04:32 +0100 |
|---|---|---|
| committer | coyot@coyot-sager-PC <coyot@coyot-sager-PC> | 2017-04-28 20:04:32 +0100 |
| commit | a67d449813a9b6c6198ed15ad15d30535344051e (patch) | |
| tree | 3a61877747c9e7c5c94a56d2705a1c9fa5f9b950 /indra/newview/viewer_manifest.py | |
| parent | b6e1419007e0bc768302d594649a262952e5fce6 (diff) | |
SL-617: pass final_exe from viewer manifest to NSIS as VIEWER_EXE
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 3 |
1 files changed, 1 insertions, 2 deletions
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': |