Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:01:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change installer naming.

Browse source 
Also change Windows installer compression to save space.
This commit is contained in:
Julian Groß 2022-03-21 19:08:25 +01:00
parent ab6bf0648c
commit 2e219b6eef
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmake/macros/GenerateInstallers.cmake
View file

@ -5,6 +5,7 @@
# Created by Leonardo Murillo on 12/16/2015. # Created by Leonardo Murillo on 12/16/2015.
# Copyright 2015 High Fidelity, Inc. # Copyright 2015 High Fidelity, Inc.
# Copyright 2021 Vircadia contributors. # Copyright 2021 Vircadia contributors.
# Copyright 2022 Overte e.V.
# #
# Distributed under the Apache License, Version 2.0. # Distributed under the Apache License, Version 2.0.
# See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -19,25 +20,24 @@ macro(GENERATE_INSTALLERS)
if (CLIENT_ONLY) if (CLIENT_ONLY)
set(_PACKAGE_NAME_EXTRA "-Interface") set(_PACKAGE_NAME_EXTRA "-Interface")
set(INSTALLER_TYPE "client_only") set(INSTALLER_TYPE "client_only")
string(REGEX REPLACE "Vircadia" "Vircadia Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION}) string(REGEX REPLACE "Overte" "Overte Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
elseif (SERVER_ONLY) elseif (SERVER_ONLY)
set(_PACKAGE_NAME_EXTRA "-Server") set(_PACKAGE_NAME_EXTRA "-Server")
set(INSTALLER_TYPE "server_only") set(INSTALLER_TYPE "server_only")
string(REGEX REPLACE "Vircadia" "Vircadia Server" _DISPLAY_NAME ${BUILD_ORGANIZATION}) string(REGEX REPLACE "Overte" "Overte 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")
endif () endif ()
set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME}) set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
set(CPACK_PACKAGE_VENDOR "Vircadia") set(CPACK_PACKAGE_VENDOR "Overte")
set(CPACK_PACKAGE_VERSION ${BUILD_VERSION}) set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
set(CPACK_PACKAGE_FILE_NAME "Vircadia${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}-${RELEASE_NAME}") # There is some sort of bug which adds a "-" between the BUILD_VERSION and the RELEASE_NAME.
set(CPACK_PACKAGE_FILE_NAME "Overte${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}${RELEASE_NAME}")
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME}) set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME}) set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
if (PR_BUILD) set(CPACK_NSIS_COMPRESSOR "LZMA")
set(CPACK_NSIS_COMPRESSOR "bzip2")
endif ()
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME}) set(CPACK_PACKAGE_INSTALL_DIRECTORY ${_DISPLAY_NAME})
@ -123,11 +123,11 @@ macro(GENERATE_INSTALLERS)
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
if (BUILD_CLIENT) if (BUILD_CLIENT)
cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "Vircadia Interface") cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "Overte Interface")
endif () endif ()
if (BUILD_SERVER) if (BUILD_SERVER)
cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Vircadia Server") cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Overte Server")
endif () endif ()
include(CPack) include(CPack)