Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Installer fix

Browse Source
This commit is contained in:
siana
2010-12-23 04:25:30 +01:00
parent aff58d0ab9
commit 9417eadb4c
2 changed files with 864 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1640
indra/newview/installers/windows/installer_template.nsi
View File

File diff suppressed because it is too large Load Diff

114
indra/newview/viewer_manifest.py
View File

@@ -202,12 +202,14 @@ class WindowsManifest(ViewerManifest):
self.path("dbghelp.dll") self.path("dbghelp.dll")
# For using FMOD for sound... DJS # For using FMOD for sound... DJS
self.path("fmod.dll") if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
self.path("fmod.dll")
self.end_prefix()
# For textures # For textures
if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""): #if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
self.path("openjpeg.dll") # self.path("openjpeg.dll")
self.end_prefix() # self.end_prefix()
# Media plugins - QuickTime # Media plugins - QuickTime
if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"): if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
@@ -243,21 +245,36 @@ class WindowsManifest(ViewerManifest):
# Per platform MIME config on the cheap. See SNOW-307 / DEV-41388 # Per platform MIME config on the cheap. See SNOW-307 / DEV-41388
self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml") self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
# Get llcommon and deps. If missing assume static linkage and continue.
if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
try:
self.path('llcommon.dll')
except RuntimeError, err:
print err.message
print "Skipping llcommon.dll (assuming llcommon was linked statically)"
try:
self.path('libapr-1.dll')
self.path('libaprutil-1.dll')
self.path('libapriconv-1.dll')
except RuntimeError, err:
pass
self.end_prefix()
# These need to be installed as a SxS assembly, currently a 'private' assembly. # These need to be installed as a SxS assembly, currently a 'private' assembly.
# See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
if self.prefix(src=self.args['configuration'], dst=""): #~ if self.prefix(src=self.args['configuration'], dst=""):
if self.args['configuration'] == 'Debug': #~ if self.args['configuration'] == 'Debug':
self.path("msvcr80d.dll") #~ self.path("msvcr80d.dll")
self.path("msvcp80d.dll") #~ self.path("msvcp80d.dll")
self.path("Microsoft.VC80.DebugCRT.manifest") #~ self.path("Microsoft.VC80.DebugCRT.manifest")
else: #~ else:
self.path("msvcr80.dll") #~ self.path("msvcr80.dll")
self.path("msvcp80.dll") #~ self.path("msvcp80.dll")
self.path("Microsoft.VC80.CRT.manifest") #~ self.path("Microsoft.VC80.CRT.manifest")
self.end_prefix() #~ self.end_prefix()
# The config file name needs to match the exe's name. # The config file name needs to match the exe's name.
self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") #~ self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
# Vivox runtimes # Vivox runtimes
if self.prefix(src="vivox-runtime/i686-win32", dst=""): if self.prefix(src="vivox-runtime/i686-win32", dst=""):
@@ -353,61 +370,18 @@ class WindowsManifest(ViewerManifest):
!define VERSION_LONG "%(version)s" !define VERSION_LONG "%(version)s"
!define VERSION_DASHES "%(version_dashes)s" !define VERSION_DASHES "%(version_dashes)s"
""" % substitution_strings """ % substitution_strings
if self.default_channel() and self.viewer_branding_id()=="secondlife": installer_file = "Singularity_%(version_short)s_Setup.exe"
if self.default_grid(): grid_vars_template = """
# release viewer OutFile "%(installer_file)s"
installer_file = "Second_Life_%(version_dashes)s_Setup.exe" !define VIEWERNAME "Singularity Viewer"
grid_vars_template = """ !define INSTFLAGS "%(flags)s"
OutFile "%(installer_file)s" !define INSTNAME "SingularityViewer"
!define VIEWERNAME "Second Life" !define SHORTCUT "Singularity Viewer"
!define INSTFLAGS "%(flags)s" !define URLNAME "singularity"
!define INSTNAME "SecondLife" !define INSTALL_ICON "install_icon_singularity.ico"
!define SHORTCUT "Second Life" !define UNINSTALL_ICON "install_icon_singularity.ico"
!define URLNAME "secondlife" Caption "Singularity Viewer ${VERSION}"
!define INSTALL_ICON "install_icon.ico" """
!define UNINSTALL_ICON "uninstall_icon.ico"
Caption "Second Life ${VERSION}"
"""
else:
# beta grid viewer
installer_file = "Second_Life_%(version_dashes)s_(%(grid_caps)s)_Setup.exe"
grid_vars_template = """
OutFile "%(installer_file)s"
!define VIEWERNAME "Second Life"
!define INSTFLAGS "%(flags)s"
!define INSTNAME "SecondLife%(grid_caps)s"
!define SHORTCUT "Second Life (%(grid_caps)s)"
!define URLNAME "secondlife%(grid)s"
!define INSTALL_ICON "install_icon.ico"
!define UNINSTALL_ICON "uninstall_icon.ico"
!define UNINSTALL_SETTINGS 1
Caption "Second Life %(grid)s ${VERSION}"
"""
elif self.viewer_branding_id()=="snowglobe":
installer_file = "Snowglobe_%(version_dashes)s_Setup.exe"
grid_vars_template = """
OutFile "%(installer_file)s"
!define VIEWERNAME "Snowglobe"
!define INSTFLAGS "%(flags)s"
!define INSTNAME "Snowglobe"
!define SHORTCUT "Snowglobe"
!define URLNAME "secondlife"
!define INSTALL_ICON "install_icon_snowglobe.ico"
!define UNINSTALL_ICON "uninstall_icon_snowglobe.ico"
Caption "Snowglobe ${VERSION}"
"""
else:
# some other channel on some grid
installer_file = "Second_Life_%(version_dashes)s_%(channel_oneword)s_Setup.exe"
grid_vars_template = """
OutFile "%(installer_file)s"
!define INSTFLAGS "%(flags)s"
!define INSTNAME "SecondLife%(channel_oneword)s"
!define SHORTCUT "%(channel)s"
!define URLNAME "secondlife"
!define UNINSTALL_SETTINGS 1
Caption "%(channel)s ${VERSION}"
"""
if 'installer_name' in self.args: if 'installer_name' in self.args:
installer_file = self.args['installer_name'] installer_file = self.args['installer_name']
else: else: