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

Finishing touches

Browse source
This commit is contained in:
Leonardo Murillo 2015-12-16 16:11:35 -06:00
parent cbed8bf35a
commit 66770cc907
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -239,8 +239,10 @@ if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
build-package ALL build-package ALL
DEPENDS interface assignment-client domain-server stack-manager DEPENDS interface assignment-client domain-server stack-manager
COMMAND set INSTALLER_SOURCE_DIR=${CMAKE_BINARY_DIR}/full-stack-deployment COMMAND set INSTALLER_SOURCE_DIR=${CMAKE_BINARY_DIR}/full-stack-deployment
COMMAND set INSTALLER_NAME=${CMAKE_BINARY_DIR}/this-is-a-test.exe COMMAND set INSTALLER_NAME=${CMAKE_BINARY_DIR}/${INSTALLER_NAME}
COMMANE set INSTALLER_SCRIPTS_DIR=${CMAKE_SOURCE_DIR}/examples COMMAND set INSTALLER_SCRIPTS_DIR=${CMAKE_SOURCE_DIR}/examples
COMMAND set INSTALLER_COMPANY=${INSTALLER_COMPANY}
COMMAND set INSTALLER_DIRECTORY=${INSTALLER_DIRECTORY}
COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi" COMMAND CMD /C "\"${MAKENSIS_COMMAND}\" ${CMAKE_SOURCE_DIR}/tools/nsis/release.nsi"
) )
endif () endif ()

17
cmake/macros/IncludeApplicationVersion.cmake
View file

@ -14,13 +14,22 @@ macro(INCLUDE_APPLICATION_VERSION)
# We are relying on Jenkins defined environment variables to determine the origin of this build # We are relying on Jenkins defined environment variables to determine the origin of this build
# and will only package if this is a PR or Release build # and will only package if this is a PR or Release build
if (DEFINED ENV{JOB_ID}) if (DEFINED ENV{JOB_ID})
set (DEPLOY_PACKAGE 1) set(DEPLOY_PACKAGE 1)
set (BUILD_SEQ $ENV{JOB_ID}) set(BUILD_SEQ $ENV{JOB_ID})
set(INSTALLER_COMPANY "High Fidelity")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
elseif (DEFINED ENV{ghprbPullId}) elseif (DEFINED ENV{ghprbPullId})
set (DEPLOY_PACKAGE 1) set(DEPLOY_PACKAGE 1)
set (BUILD_SEQ "PR-$ENV{ghprbPullId}") set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
set(INSTALLER_COMPANY "High Fidelity - PR")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}")
set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe")
else () else ()
set(BUILD_SEQ "dev") set(BUILD_SEQ "dev")
set(INSTALLER_COMPANY "High Fidelity - Dev")
set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
set(INSTALLER_NAME "dev-interface-win64.exe")
endif () endif ()
configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${PROJECT_BINARY_DIR}/includes/ApplicationVersion.h") configure_file("${MACRO_DIR}/ApplicationVersion.h.in" "${PROJECT_BINARY_DIR}/includes/ApplicationVersion.h")
include_directories("${PROJECT_BINARY_DIR}/includes") include_directories("${PROJECT_BINARY_DIR}/includes")

13
tools/nsis/release.nsi
View file

@ -1,18 +1,19 @@
!include LogicLib.nsh !include LogicLib.nsh
!include x64.nsh !include x64.nsh
!define srcdir $%INSTALLER_SOURCE_DIR% !define srcdir "$%INSTALLER_SOURCE_DIR%"
!define setup $%INSTALLER_NAME% !define setup "$%INSTALLER_NAME%"
!define scriptsdir $%INSTALLER_SCRIPTS_DIR% !define scriptsdir "$%INSTALLER_SCRIPTS_DIR%"
!define company $%INSTALLER_COMPANY% !define company "$%INSTALLER_COMPANY%"
!define install_directory "$%INSTALLER_DIRECTORY%"
!define interface_exec "interface.exe" !define interface_exec "interface.exe"
!define stack_manager_exec "stack-manager.exe" !define stack_manager_exec "stack-manager.exe"
!define interface_icon "interface.ico" !define interface_icon "interface.ico"
!define stack_manager_icon "stack-manager.ico" !define stack_manager_icon "stack-manager.ico"
!define regkey "Software\${company}" !define regkey "Software\${company}"
!define uninstkey "Software\Microsoft\Windows\CurrentVersion\Uninstall\${company}" !define uninstkey "Software\Microsoft\Windows\CurrentVersion\Uninstall\${company}"
!define install_dir_company "$PROGRAMFILES64\${company}" !define install_dir_company "$PROGRAMFILES64\${install_directory}"
!define startmenu_company "$SMPROGRAMS\${company}" !define startmenu_company "$SMPROGRAMS\${install_directory}"
!define uninstaller "uninstall.exe" !define uninstaller "uninstall.exe"
;-------------------------------- ;--------------------------------