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

Code review fixes from birarda

Browse source
This commit is contained in:
Roxanne Skelly 2018-10-04 11:33:01 -07:00
parent 397fe2a534
commit ee3fd81070
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/SetPackagingParameters.cmake
View file

@ -18,7 +18,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(BUILD_GLOBAL_SERVICES "DEVELOPMENT") set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
set(USE_STABLE_GLOBAL_SERVICES 0) set(USE_STABLE_GLOBAL_SERVICES 0)
set(BUILD_NUMBER 0) set(BUILD_NUMBER 0)
set(APP_USER_MODEL_ID "com.highfidelity.console") set(APP_USER_MODEL_ID "com.highfidelity.console-dev")
set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV") set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
set_from_env(RELEASE_NUMBER RELEASE_NUMBER "") set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")

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

@ -412,7 +412,7 @@ Section "-Previous Install Cleanup"
Delete "$INSTDIR\@AC_EXEC_NAME@" Delete "$INSTDIR\@AC_EXEC_NAME@"
; delete interface so it's not there for server-only installs ; delete interface so it's not there for server-only installs
Delete "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" Delete "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
SectionEnd SectionEnd
@CPACK_NSIS_INSTALLATION_TYPES@ @CPACK_NSIS_INSTALLATION_TYPES@
@ -1005,6 +1005,7 @@ Function HandlePostInstallOptions
${EndIf} ${EndIf}
${If} $LaunchConsoleNowState == ${BST_CHECKED} ${If} $LaunchConsoleNowState == ${BST_CHECKED}
${AndIf} @SERVER_COMPONENT_CONDITIONAL@
!insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES !insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
; both launches use the explorer trick in case the user has elevated permissions for the installer ; both launches use the explorer trick in case the user has elevated permissions for the installer

8
server-console/CMakeLists.txt
View file

@ -28,7 +28,7 @@ if (BUILD_CLIENT)
endif() endif()
if (BUILD_SERVER) if (BUILD_SERVER)
add_dependencies(${TARGET_NAME} assignment-client domain-server interface) add_dependencies(${TARGET_NAME} assignment-client domain-server)
endif() endif()
# set the packaged console folder depending on platform, so we can copy it # set the packaged console folder depending on platform, so we can copy it
@ -64,12 +64,6 @@ elseif (WIN32)
install( install(
DIRECTORY "${CONSOLE_DESTINATION}/" DIRECTORY "${CONSOLE_DESTINATION}/"
DESTINATION ${CONSOLE_INSTALL_DIR} DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT}
)
install(
DIRECTORY "${CONSOLE_DESTINATION}/"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${CLIENT_COMPONENT}
) )
# sign the copied server console executable after install # sign the copied server console executable after install