Merge pull request #11004 from highfidelity/express_custom_install

Added a page in installer for express/custom installation

cmake/templates/NSIS.template.in

@@ -345,14 +345,21 @@ SectionEnd
   !insertmacro MUI_PAGE_WELCOME
   
   !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
+  
+  Page custom InstallTypesPage ReadInstallTypes
+  
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   !insertmacro MUI_PAGE_DIRECTORY
   
   ;Start Menu Folder Page Configuration
   !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+  
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
   
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE AbortFunction
   @CPACK_NSIS_PAGE_COMPONENTS@
     
   Page custom PostInstallOptionsPage ReadPostInstallOptions
@@ -442,6 +449,10 @@ Var CleanInstallCheckbox
 Var CurrentOffset
 Var OffsetUnits
 Var CopyFromProductionCheckbox
+Var ExpressInstallRadioButton
+Var CustomInstallRadioButton
+Var InstallTypeDialog
+Var Express
 
 !macro SetPostInstallOption Checkbox OptionName Default
   ; reads the value for the given post install option to the registry
@@ -459,6 +470,60 @@ Var CopyFromProductionCheckbox
   ${EndIf}
 !macroend
 
+Function InstallTypesPage
+  !insertmacro MUI_HEADER_TEXT "Choose Installation Type" "Express or Custom Install"
+  
+  nsDialogs::Create 1018
+  Pop $InstallTypeDialog
+  
+  ${If} $InstallTypeDialog == error
+    Abort
+  ${EndIf}
+  
+  StrCpy $CurrentOffset 0
+  StrCpy $OffsetUnits u
+  StrCpy $Express "0"  
+  
+  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
+    ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls High Fidelity Interface and High Fidelity Sandbox"
+    pop $ExpressInstallRadioButton
+    ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
+    IntOp $CurrentOffset $CurrentOffset + 15
+  
+    ${NSD_CreateRadiobutton} 30% $CurrentOffset$OffsetUnits 100% 10u "Custom Install (Advanced)"
+    pop $CustomInstallRadioButton
+    ${NSD_OnClick} $CustomInstallRadioButton ChangeCustomLabel 
+  ${EndIf}
+  
+  ; Express Install selected by default
+  ${NSD_Check} $ExpressInstallRadioButton
+  Call ChangeExpressLabel
+  
+  nsDialogs::Show
+FunctionEnd
+
+Function ChangeExpressLabel
+  Push $R1
+  GetDlgItem $R1 $HWNDPARENT 1
+  SendMessage $R1 ${WM_SETTEXT} 0 "STR:Install"
+  Pop $R1
+FunctionEnd
+
+Function ChangeCustomLabel
+  Push $R1
+  GetDlgItem $R1 $HWNDPARENT 1
+  SendMessage $R1 ${WM_SETTEXT} 0 "STR:Next >"
+  Pop $R1
+FunctionEnd
+
+Function AbortFunction
+  ; Check if Express is set, if so, abort the post install options page
+  Call HandleInstallTypes ; Sets Express if ExpressInstallRadioButton is checked and installs with defaults
+  StrCmp $Express "1" 0 end
+  Abort
+  end:
+FunctionEnd  
+
 Function PostInstallOptionsPage
   !insertmacro MUI_HEADER_TEXT "Setup Options" ""
 
@@ -549,9 +614,15 @@ Function PostInstallOptionsPage
     ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Copy settings and content from production install"
     Pop $CopyFromProductionCheckbox
 
-    ${NSD_SetState} $CopyFromProductionCheckbox ${BST_CHECKED}
+    ${NSD_SetState} $CopyFromProductionCheckbox ${BST_UNCHECKED}
   ${EndIf}
   
+  ; Check if Express is set, if so, abort the post install options page
+  Call HandleInstallTypes ; Sets Express if ExpressInstallRadioButton is checked and installs with defaults
+  StrCmp $Express "1" 0 end
+  Abort
+  end:
+  
   nsDialogs::Show
 FunctionEnd
 
@@ -567,6 +638,16 @@ Var LaunchServerNowState
 Var LaunchClientNowState
 Var CopyFromProductionState
 Var CleanInstallState
+Var ExpressInstallState 
+Var CustomInstallState
+
+Function ReadInstallTypes
+  ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
+    ; check if the user asked for express/custom install
+    ${NSD_GetState} $ExpressInstallRadioButton $ExpressInstallState
+    ${NSD_GetState} $CustomInstallRadioButton $CustomInstallState
+  ${EndIf}
+FunctionEnd
 
 Function ReadPostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
@@ -603,6 +684,28 @@ Function ReadPostInstallOptions
   ${EndIf}
 FunctionEnd
 
+Function HandleInstallTypes
+  ${If} $ExpressInstallState == ${BST_CHECKED}
+    
+    StrCpy $Express "1"
+    
+    ; over ride custom checkboxes and select defaults 
+    ${NSD_SetState} $DesktopClientCheckbox ${BST_CHECKED} 
+    ${NSD_SetState} $ServerStartupCheckbox ${BST_CHECKED} 
+    ${NSD_SetState} $LaunchServerNowCheckbox ${BST_CHECKED}
+    ${NSD_SetState} $LaunchClientNowCheckbox ${BST_CHECKED}
+    
+    ${If} @PR_BUILD@ == 1
+      ${NSD_SetState} $CopyFromProductionCheckbox ${BST_UNCHECKED}
+    ${EndIf}    
+    
+    ; call ReadPostInstallOptions and HandlePostInstallOptions with defaults selected
+    Call ReadPostInstallOptions 
+    Call HandlePostInstallOptions 
+      
+  ${EndIf}
+FunctionEnd
+
 Function HandlePostInstallOptions
   ${If} ${SectionIsSelected} ${@CLIENT_COMPONENT_NAME@}
     ; check if the user asked for a desktop shortcut to High Fidelity
@@ -624,6 +727,7 @@ Function HandlePostInstallOptions
       !insertmacro WritePostInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
     ${EndIf}
 
+    
     ; check if the user asked to have Sandbox launched every startup
     ${If} $ServerStartupState == ${BST_CHECKED}
       ; in case we added a shortcut in the global context, pull that now