From ae09d3e397e6cdc7cf6187a6eb2034432467fb15 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Wed, 20 Jan 2016 10:43:38 -0500
Subject: [PATCH] Start to get windows installer generation and packaging in
 line with previous scheme to prevent shortcut breakage

---
 .../installers/windows/installer_template.nsi | 34 ++++++++++++++-----
 indra/newview/viewer_manifest.py              |  6 ++--
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 446bb536f..d2b683109 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -139,6 +139,7 @@
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "SOFTWARE\${VENDORSTR}\${APPNAMEONEWORD}" 
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
   !define MUI_PAGE_CUSTOMFUNCTION_PRE check_skip
+  !define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APPNAME} (64 bit) Viewer"
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENUFOLDER
 
   ;Install Progress Page
@@ -439,8 +440,8 @@ Section "Viewer"
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     CreateDirectory "$SMPROGRAMS\$STARTMENUFOLDER"
 !ifdef WIN64_BIN_BUILD
-    CreateShortCut	"$SMPROGRAMS\$STARTMENUFOLDER\$INSTSHORTCUT x64.lnk" "$\"$INSTDIR\$INSTEXE$\"" "$SHORTCUT_LANG_PARAM"
-    CreateShortCut	"$SMPROGRAMS\$STARTMENUFOLDER\Uninstall $INSTSHORTCUT x64.lnk" "$\"$INSTDIR\uninst.exe$\"" ""
+    CreateShortCut	"$SMPROGRAMS\$STARTMENUFOLDER\$INSTSHORTCUT (64 bit) Viewer.lnk" "$\"$INSTDIR\$INSTEXE$\"" "$SHORTCUT_LANG_PARAM"
+    CreateShortCut	"$SMPROGRAMS\$STARTMENUFOLDER\Uninstall $INSTSHORTCUT (64 bit) Viewer.lnk" "$\"$INSTDIR\uninst.exe$\"" ""
 !else
     CreateShortCut	"$SMPROGRAMS\$STARTMENUFOLDER\$INSTSHORTCUT.lnk" "$\"$INSTDIR\$INSTEXE$\"" "$SHORTCUT_LANG_PARAM"
     CreateShortCut	"$SMPROGRAMS\$STARTMENUFOLDER\Uninstall $INSTSHORTCUT.lnk" "$\"$INSTDIR\uninst.exe$\"" ""
@@ -453,9 +454,17 @@ Section "Viewer"
 
   ;Other shortcuts
   SetOutPath "$INSTDIR"
+!ifdef WIN64_BIN_BUILD
   ;CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"
-  CreateShortCut "$INSTDIR\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"
-  CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" "$INSTDIR\uninst.exe" ""
+  CreateShortCut "$INSTDIR\$INSTSHORTCUT (64 bit) Viewer.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"
+  CreateShortCut "$INSTDIR\$INSTSHORTCUT (64 bit) Viewer Portable.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM --portable"
+  CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT (64 bit) Viewer.lnk" "$INSTDIR\uninst.exe" ""
+!else
+  ;CreateShortCut "$DESKTOP\$INSTSHORTCUT.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"
+  CreateShortCut "$INSTDIR\$INSTSHORTCUT Viewer.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM"
+  CreateShortCut "$INSTDIR\$INSTSHORTCUT Viewer Portable.lnk" "$INSTDIR\$INSTEXE" "$SHORTCUT_LANG_PARAM --portable"
+  CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT Viewer.lnk" "$INSTDIR\uninst.exe" ""
+!endif
     
   ;Write registry
   WriteRegStr HKLM "SOFTWARE\${VENDORSTR}\$INSTPROG" "" "$INSTDIR"
@@ -464,9 +473,9 @@ Section "Viewer"
   WriteRegStr HKLM "SOFTWARE\${VENDORSTR}\$INSTPROG" "Exe" "$INSTEXE"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "Comments" "A viewer for the meta-verse!"
 !ifdef WIN64_BIN_BUILD
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTSHORTCUT x64"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTSHORTCUT (64 bit) Viewer"
 !else
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTSHORTCUT"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTSHORTCUT Viewer"
 !endif
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayIcon" "$INSTDIR\$INSTEXE"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayVersion" "${VERSION_LONG}"
@@ -586,9 +595,16 @@ Section "Uninstall"
   Delete "$INSTDIR\VivoxVoiceService-*.log"
 
   ;Shortcuts in install directory
-  Delete "$INSTDIR\$INSTSHORTCUT.lnk"
-  Delete "$INSTDIR\Uninstall $INSTSHORTCUT.lnk"
-
+!ifdef WIN64_BIN_BUILD
+  Delete "$INSTDIR\$INSTSHORTCUT (64 bit) Viewer.lnk"
+  Delete "$INSTDIR\$INSTSHORTCUT (64 bit) Viewer Portable.lnk"
+  Delete "$INSTDIR\Uninstall $INSTSHORTCUT (64 bit) Viewer.lnk"
+!else
+  Delete "$INSTDIR\$INSTSHORTCUT Viewer.lnk"
+  Delete "$INSTDIR\$INSTSHORTCUT Viewer Portable.lnk"
+  Delete "$INSTDIR\Uninstall $INSTSHORTCUT Viewer.lnk"
+!endif
+  
   Delete "$INSTDIR\uninst.exe"
   RMDir "$INSTDIR"
   
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0c63924b2..cb5edef51 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -165,6 +165,8 @@ class ViewerManifest(LLManifest):
             channel_type='release'
         elif channel_qualifier.startswith('beta'):
             channel_type='beta'
+        elif channel_qualifier.startswith('alpha'):
+            channel_type='alpha'
         elif channel_qualifier.startswith('project'):
             channel_type='project'
         else:
@@ -200,7 +202,7 @@ class ViewerManifest(LLManifest):
         global CHANNEL_VENDOR_BASE
         channel_type=self.channel_type()
         if channel_type == 'release':
-            app_suffix='Viewer'
+            app_suffix=''
         else:
             app_suffix=self.channel_variant()
         return CHANNEL_VENDOR_BASE + ' ' + app_suffix
@@ -239,7 +241,7 @@ class WindowsManifest(ViewerManifest):
         return self.args.get('arch') == "x86_64"
 
     def final_exe(self):
-        return self.app_name_oneword()+".exe"
+        return self.app_name_oneword()+"Viewer.exe"
 
 
     def construct(self):