Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 06:20:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove short SHA where it should not appear

Browse source
This commit is contained in:
Stephen Birarda 2018-05-30 12:05:07 -07:00
parent 2c9648daaf
commit 33a122c08e
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/macros/SetPackagingParameters.cmake
View file

@ -113,6 +113,7 @@ macro(SET_PACKAGING_PARAMETERS)
message(FATAL_ERROR "Could not retreive abbreviated SHA for PR or production master build") message(FATAL_ERROR "Could not retreive abbreviated SHA for PR or production master build")
endif () endif ()
set(BUILD_VERSION_NO_SHA ${BUILD_VERSION})
set(BUILD_VERSION "${BUILD_VERSION}-${GIT_COMMIT_HASH}") set(BUILD_VERSION "${BUILD_VERSION}-${GIT_COMMIT_HASH}")
# pass along a release number without the SHA in case somebody # pass along a release number without the SHA in case somebody
@ -172,8 +173,8 @@ macro(SET_PACKAGING_PARAMETERS)
set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface") set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
set(CONSOLE_SHORTCUT_NAME "Sandbox") set(CONSOLE_SHORTCUT_NAME "Sandbox")
else () else ()
set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION}") set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION_NO_SHA}")
set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}") set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
endif () endif ()
set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}") set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")

3
cmake/templates/console-build-info.json.in
View file

@ -1,4 +1,5 @@
{ {
"releaseType": "@RELEASE_TYPE@", "releaseType": "@RELEASE_TYPE@",
"buildIdentifier": "@BUILD_VERSION@" "buildIdentifier": "@BUILD_VERSION@",
"organization": "@BUILD_ORGANIZATION@"
} }

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

@ -76,10 +76,7 @@ function getBuildInfo() {
const buildInfo = getBuildInfo(); const buildInfo = getBuildInfo();
function getRootHifiDataDirectory() { function getRootHifiDataDirectory() {
var organization = "High Fidelity"; var organization = buildInfo.organization;
if (buildInfo.releaseType != "PRODUCTION") {
organization += ' - ' + buildInfo.buildIdentifier;
}
if (osType == 'Windows_NT') { if (osType == 'Windows_NT') {
return path.resolve(osHomeDir(), 'AppData/Roaming', organization); return path.resolve(osHomeDir(), 'AppData/Roaming', organization);
} else if (osType == 'Darwin') { } else if (osType == 'Darwin') {