From b7998935b0ad8b5aa650a799a83158ad4297a84e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 18 Jan 2016 14:56:06 -0800
Subject: [PATCH] install a json file with build info beside console
---
cmake/macros/SetPackagingParameters.cmake | 8 ++++----
cmake/templates/console-build-info.json.in | 4 ++++
console/CMakeLists.txt | 9 +++++++++
3 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 cmake/templates/console-build-info.json.in
diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 5491d6f5d9..4007fb43c0 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -31,15 +31,15 @@ macro(SET_PACKAGING_PARAMETERS)
elseif (RELEASE_TYPE STREQUAL "PR")
set(DEPLOY_PACKAGE TRUE)
set(PR_BUILD 1)
- set(BUILD_VERSION "PR${RELEASE_NUMBER}")
- set(BUILD_ORGANIZATION "High Fidelity - PR#${RELEASE_NUMBER}")
- set(INTERFACE_BUNDLE_NAME "High Fidelity PR#${RELEASE_NUMBER}")
+ set(BUILD_VERSION "PR#${RELEASE_NUMBER}")
+ set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}")
+ set(INTERFACE_BUNDLE_NAME "High Fidelity ${BUILD_VERSION}")
set(INTERFACE_ICON_PREFIX "interface-beta")
set(CONSOLE_ICON "console-beta.ico")
else ()
set(DEV_BUILD 1)
set(BUILD_VERSION "dev")
- set(BUILD_ORGANIZATION "High Fidelity - Dev")
+ set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}")
set(INTERFACE_BUNDLE_NAME "Interface")
set(INTERFACE_ICON_PREFIX "interface-beta")
set(CONSOLE_ICON "console-beta.ico")
diff --git a/cmake/templates/console-build-info.json.in b/cmake/templates/console-build-info.json.in
new file mode 100644
index 0000000000..c1ef010e08
--- /dev/null
+++ b/cmake/templates/console-build-info.json.in
@@ -0,0 +1,4 @@
+{
+ "releaseType": "@RELEASE_TYPE@",
+ "buildIdentifier": "@BUILD_VERSION@"
+}
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 02ac68d74e..175a3263ab 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -53,4 +53,13 @@ endif()
if (PR_BUILD OR PRODUCTION_BUILD)
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE)
+
+ # configure our build info json file and install it beside the console
+ set(CONSOLE_BUILD_INFO_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/console-build-info.json")
+ configure_file("${HF_CMAKE_DIR}/templates/console-build-info.json.in" ${CONSOLE_BUILD_INFO_OUTPUT})
+ install(
+ FILES ${CONSOLE_BUILD_INFO_OUTPUT}
+ DESTINATION ${CONSOLE_INSTALL_DIR}
+ COMPONENT ${SERVER_COMPONENT}
+ )
endif ()