merge
commit
87118e5cfc
|
|
@ -485,7 +485,7 @@ class WindowsManifest(ViewerManifest):
|
|||
if self.default_channel():
|
||||
if self.default_grid():
|
||||
# release viewer
|
||||
installer_file = "Second_Life_%(version_dashes)s_Setup.exe"
|
||||
installer_file = "Firestorm_%(version_dashes)s_Setup.exe"
|
||||
grid_vars_template = """
|
||||
OutFile "%(installer_file)s"
|
||||
!define INSTFLAGS "%(flags)s"
|
||||
|
|
@ -496,7 +496,7 @@ class WindowsManifest(ViewerManifest):
|
|||
"""
|
||||
else:
|
||||
# beta grid viewer
|
||||
installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
|
||||
installer_file = "Firestorm_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
|
||||
grid_vars_template = """
|
||||
OutFile "%(installer_file)s"
|
||||
!define INSTFLAGS "%(flags)s"
|
||||
|
|
@ -508,7 +508,7 @@ class WindowsManifest(ViewerManifest):
|
|||
"""
|
||||
else:
|
||||
# some other channel on some grid
|
||||
installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
|
||||
installer_file = "%(channel_oneword)s_%(version_dashes)s_Setup.exe"
|
||||
grid_vars_template = """
|
||||
OutFile "%(installer_file)s"
|
||||
!define INSTFLAGS "%(flags)s"
|
||||
|
|
|
|||
Loading…
Reference in New Issue