Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1081 from digisomni/feature/pkg-updates

Browse source 
Rename to "Vircadia Server" and disable server shortcuts with Express install on Windows
This commit is contained in:
Kalila 2021-03-14 17:35:03 -04:00 committed by GitHub
commit 6c223be3f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/macros/GenerateInstallers.cmake
View file

@ -21,9 +21,9 @@ macro(GENERATE_INSTALLERS)
set(INSTALLER_TYPE "client_only") set(INSTALLER_TYPE "client_only")
string(REGEX REPLACE "Vircadia" "Vircadia Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION}) string(REGEX REPLACE "Vircadia" "Vircadia Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
elseif (SERVER_ONLY) elseif (SERVER_ONLY)
set(_PACKAGE_NAME_EXTRA "-Sandbox") set(_PACKAGE_NAME_EXTRA "-Server")
set(INSTALLER_TYPE "server_only") set(INSTALLER_TYPE "server_only")
string(REGEX REPLACE "Vircadia" "Vircadia Sandbox" _DISPLAY_NAME ${BUILD_ORGANIZATION}) string(REGEX REPLACE "Vircadia" "Vircadia Server" _DISPLAY_NAME ${BUILD_ORGANIZATION})
else () else ()
set(_DISPLAY_NAME ${BUILD_ORGANIZATION}) set(_DISPLAY_NAME ${BUILD_ORGANIZATION})
set(INSTALLER_TYPE "full") set(INSTALLER_TYPE "full")
@ -123,7 +123,7 @@ macro(GENERATE_INSTALLERS)
endif () endif ()
if (BUILD_SERVER) if (BUILD_SERVER)
cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Vircadia Sandbox") cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Vircadia Server")
endif () endif ()
include(CPack) include(CPack)

4
cmake/macros/SetPackagingParameters.cmake
View file

@ -180,12 +180,12 @@ macro(SET_PACKAGING_PARAMETERS)
if (PRODUCTION_BUILD) if (PRODUCTION_BUILD)
set(INTERFACE_SHORTCUT_NAME "Vircadia") set(INTERFACE_SHORTCUT_NAME "Vircadia")
set(CONSOLE_SHORTCUT_NAME "Console") set(CONSOLE_SHORTCUT_NAME "Console")
set(SANDBOX_SHORTCUT_NAME "Sandbox") set(SANDBOX_SHORTCUT_NAME "Server")
set(APP_USER_MODEL_ID "com.vircadia.console") set(APP_USER_MODEL_ID "com.vircadia.console")
else () else ()
set(INTERFACE_SHORTCUT_NAME "Vircadia - ${BUILD_VERSION_NO_SHA}") set(INTERFACE_SHORTCUT_NAME "Vircadia - ${BUILD_VERSION_NO_SHA}")
set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}") set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
set(SANDBOX_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}") set(SANDBOX_SHORTCUT_NAME "Server - ${BUILD_VERSION_NO_SHA}")
endif () endif ()
set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}") set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")

7
cmake/templates/NSIS.template.in
View file

@ -251,8 +251,8 @@ Var substringResult
!macro InitSection SecName !macro InitSection SecName
; This macro reads component installed flag from the registry and ; This macro reads component installed flag from the registry and
;changes checked state of the section on the components page. ; changes checked state of the section on the components page.
;Input: section index constant name specified in Section command. ; Input: section index constant name specified in Section command.
ClearErrors ClearErrors
;Reading component status from registry ;Reading component status from registry
@ -718,7 +718,7 @@ Function InstallTypesPage
StrCpy $OffsetUnits u StrCpy $OffsetUnits u
StrCpy $Express "0" StrCpy $Express "0"
${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Vircadia Interface and Vircadia Sandbox" ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Vircadia Interface"
pop $ExpressInstallRadioButton pop $ExpressInstallRadioButton
${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
IntOp $CurrentOffset $CurrentOffset + 15 IntOp $CurrentOffset $CurrentOffset + 15
@ -1346,6 +1346,7 @@ Section "-Core installation"
${EndIf} ${EndIf}
${If} @SERVER_COMPONENT_CONDITIONAL@ ${If} @SERVER_COMPONENT_CONDITIONAL@
${AndIf} $Express != "1"
; handling for server console shortcut ; handling for server console shortcut
Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@SANDBOX_HF_SHORTCUT_NAME@.lnk" \

2
server-console/src/main.js
View file

@ -460,7 +460,7 @@ var labels = {
} }
}, },
goHome: { goHome: {
label: 'Visit Sandbox', label: 'Visit Local Server',
click: visitSandboxClicked, click: visitSandboxClicked,
enabled: false enabled: false
}, },