[sldev-commits] r2406 - in projects/2009/http-texture/indra/newview: . installers/windows

rob.linden at svn.secondlife.com rob.linden at svn.secondlife.com
Mon Jun 15 02:14:11 PDT 2009


Author: rob.linden
Date: 2009-06-15 04:14:10 -0500 (Mon, 15 Jun 2009)
New Revision: 2406

Modified:
   projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi
   projects/2009/http-texture/indra/newview/viewer_manifest.py
Trac: http://svn.secondlife.com/trac/linden/changeset/2406
Log:
Branding tweaks for Win32


Modified: projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi
===================================================================
--- projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi	2009-06-15 08:43:49 UTC (rev 2405)
+++ projects/2009/http-texture/indra/newview/installers/windows/installer_template.nsi	2009-06-15 09:14:10 UTC (rev 2406)
@@ -68,8 +68,8 @@
 SubCaption 0 $(LicenseSubTitleSetup)	; override "license agreement" text
 
 BrandingText " "						; bottom of window text
-Icon          %%SOURCE%%\installers\windows\install_icon.ico
-UninstallIcon %%SOURCE%%\installers\windows\uninstall_icon.ico
+Icon          %%SOURCE%%\installers\windows\${INSTALL_ICON}
+UninstallIcon %%SOURCE%%\installers\windows\${UNINSTALL_ICON}
 WindowIcon on							; show our icon in left corner
 BGGradient off							; no big background window
 CRCCheck on								; make sure CRC is OK

Modified: projects/2009/http-texture/indra/newview/viewer_manifest.py
===================================================================
--- projects/2009/http-texture/indra/newview/viewer_manifest.py	2009-06-15 08:43:49 UTC (rev 2405)
+++ projects/2009/http-texture/indra/newview/viewer_manifest.py	2009-06-15 09:14:10 UTC (rev 2406)
@@ -153,14 +153,15 @@
                                                 
         return " ".join((channel_flags, grid_flags, setting_flags)).strip()
 
-
 class WindowsManifest(ViewerManifest):
     def final_exe(self):
-        if self.default_channel():
+        if self.default_channel() and self.viewer_branding_id()=="secondlife":
             if self.default_grid():
                 return "SecondLife.exe"
             else:
                 return "SecondLifePreview.exe"
+        elif(self.viewer_branding_id=="snowglobe"):
+            return "Snowglobe.exe"
         else:
             return ''.join(self.channel().split()) + '.exe'
 
@@ -331,7 +332,7 @@
         !define VERSION_LONG "%(version)s"
         !define VERSION_DASHES "%(version_dashes)s"
         """ % substitution_strings
-        if self.default_channel():
+        if self.default_channel() and self.viewer_branding_id()=="secondlife":
             if self.default_grid():
                 # release viewer
                 installer_file = "Second_Life_%(version_dashes)s_Setup.exe"
@@ -341,6 +342,8 @@
                 !define INSTNAME   "SecondLife"
                 !define SHORTCUT   "Second Life"
                 !define URLNAME   "secondlife"
+                !define INSTALL_ICON "install_icon.ico"
+                !define UNINSTALL_ICON "uninstall_icon.ico"
                 Caption "Second Life ${VERSION}"
                 """
             else:
@@ -352,9 +355,23 @@
                 !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 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"



More information about the sldev-commits mailing list