livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clarify windows installer name

Oz Linden 2013-02-15 09:29:09 -05:00
parent 365891e0fa
commit 237a48721d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/lib/python/indra/util/llmanifest.py
View File

@ -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

7
indra/newview/viewer_manifest.py
View File

@ -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"