diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-15 09:29:09 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-15 09:29:09 -0500 |
| commit | 237a48721d9df6a8bbf8a3255bb80f348eb2322e (patch) | |
| tree | 38e02085dfbc8cf4529e9094a6e6543021e9146a /indra/newview | |
| parent | 365891e0fa480eebdadca4172ae30761bca8a432 (diff) | |
clarify windows installer name
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index a975a2b32f..ec5aca533f 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -539,6 +539,7 @@ class WindowsManifest(ViewerManifest): !define VERSION_LONG "%(version)s" !define VERSION_DASHES "%(version_dashes)s" """ % substitution_strings + subchannel_underscores = '_'.join(self.channel_unique().split()) if self.default_channel(): if self.default_grid(): # release viewer @@ -552,7 +553,7 @@ class WindowsManifest(ViewerManifest): Caption "Second Life" """ else: - # beta grid viewer + # alternate grid viewer installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe" grid_vars_template = """ OutFile "%(installer_file)s" @@ -564,8 +565,8 @@ class WindowsManifest(ViewerManifest): Caption "Second Life %(grid)s ${VERSION}" """ else: - # some other channel on some grid - installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe" + # some other channel (grid name not used) + installer_file = "Second_Life_%(version_dashes)s_%(subchannel_underscores)s_Setup.exe" grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" |