From b0c675498c396625e992b29043eec320cc42f3d7 Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Thu, 9 Feb 2012 19:47:10 +0100 Subject: [PATCH] Base viewer executable and installer names on the viewer channel Example config: /python develop.py -G VC100 -t ReleaseSSE2 configure -DPACKAGE:BOOL=ON -DFMODEX:BOOL=ON -DVIEWER_CHANNEL:STRING="Singularity Alpha" -DVIEWER_LOGIN_CHANNEL:STRING="Singularity Alpha" VIEWER_LOGIN_CHANNEL is the string that is used in --chanel switch to the shortcut created VIEWER_CHANNEL is the string used for executable name and installer name This example will produce: SingularityAlphaViewer.exe and installer named SingularityAlpha_x-y-z-buildnr_Setup.exe --- indra/newview/viewer_manifest.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7768f05bd..ebb477c97 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -172,7 +172,7 @@ class ViewerManifest(LLManifest): class WindowsManifest(ViewerManifest): def final_exe(self): - return 'SingularityViewer.exe' + return self.channel_oneword() + 'Viewer.exe' def construct(self): @@ -399,17 +399,17 @@ class WindowsManifest(ViewerManifest): !define VERSION_LONG "%(version)s" !define VERSION_DASHES "%(version_dashes)s" """ % substitution_strings - installer_file = "Singularity_%(version_short)s_Setup.exe" + installer_file = "%(channel_oneword)s_%(version_dashes)s_Setup.exe" grid_vars_template = """ OutFile "%(installer_file)s" - !define VIEWERNAME "Singularity Viewer" + !define VIEWERNAME "%(channel)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SingularityViewer" - !define SHORTCUT "Singularity Viewer" + !define INSTNAME "%(channel_oneword)s" + !define SHORTCUT "%(channel)s" !define URLNAME "secondlife" !define INSTALL_ICON "install_icon_singularity.ico" !define UNINSTALL_ICON "install_icon_singularity.ico" - Caption "Singularity Viewer ${VERSION}" + Caption "${VIEWERNAME} ${VERSION_LONG}" """ if 'installer_name' in self.args: installer_file = self.args['installer_name']