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 | |
| parent | 365891e0fa480eebdadca4172ae30761bca8a432 (diff) | |
clarify windows installer name
| -rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 4 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 25a1b95b9a..9cb830a2db 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -85,7 +85,7 @@ def get_default_platform(dummy): }[sys.platform] DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) -DEFAULT_CHANNEL = 'Second Life Test' +RELEASE_CHANNEL = 'Second Life Release' ARGUMENTS=[ dict(name='actions', @@ -269,7 +269,7 @@ class LLManifest(object): def default_grid(self): return self.args.get('grid', None) == '' def default_channel(self): - return self.args.get('channel', None) == DEFAULT_CHANNEL + return self.args.get('channel', None) == RELEASE_CHANNEL def construct(self): """ Meant to be overriden by LLManifest implementors with code that 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" |