mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 07:43:01 +01:00
Code Issues Releases Wiki Activity

Use git describe to express version in terms of closest tag.

Browse Source
This commit is contained in:
Aaron van Geffen
2018-06-12 00:25:04 +02:00
parent e39f89c6ad
commit 56250b43ab
3 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -47,6 +47,16 @@ if (PORTABLE OR WIN32)
set(CMAKE_INSTALL_RPATH "$ORIGIN") set(CMAKE_INSTALL_RPATH "$ORIGIN")
endif () endif ()
# Describe current version in terms of closest tag
execute_process(
COMMAND git describe HEAD
COMMAND sed -E "s/-g.+$//"
WORKING_DIRECTORY ${ROOT_DIR}
OUTPUT_VARIABLE OPENRCT2_VERSION_TAG
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
# Define current git branch # Define current git branch
execute_process( execute_process(
COMMAND git rev-parse --abbrev-ref HEAD COMMAND git rev-parse --abbrev-ref HEAD

3
src/openrct2/CMakeLists.txt
View File

@@ -168,6 +168,9 @@ endif ()
# definitions: Version.cpp and Crash/Platform.cpp # definitions: Version.cpp and Crash/Platform.cpp
set_property(SOURCE ${CMAKE_CURRENT_LIST_DIR}/Version.cpp set_property(SOURCE ${CMAKE_CURRENT_LIST_DIR}/Version.cpp
${CMAKE_CURRENT_LIST_DIR}/Crash/Platform.cpp PROPERTY ${CMAKE_CURRENT_LIST_DIR}/Crash/Platform.cpp PROPERTY
COMPILE_DEFINITIONS OPENRCT2_VERSION_TAG="${OPENRCT2_VERSION_TAG}")
set_property(SOURCE ${CMAKE_CURRENT_LIST_DIR}/Version.cpp
${CMAKE_CURRENT_LIST_DIR}/Crash/Platform.cpp APPEND PROPERTY
COMPILE_DEFINITIONS OPENRCT2_BRANCH="${OPENRCT2_BRANCH}") COMPILE_DEFINITIONS OPENRCT2_BRANCH="${OPENRCT2_BRANCH}")
if (NOT OPENRCT2_COMMIT_SHA1_SHORT STREQUAL "HEAD") if (NOT OPENRCT2_COMMIT_SHA1_SHORT STREQUAL "HEAD")
set_property(SOURCE ${CMAKE_CURRENT_LIST_DIR}/Version.cpp set_property(SOURCE ${CMAKE_CURRENT_LIST_DIR}/Version.cpp

26
src/openrct2/Version.cpp
View File

@@ -22,17 +22,27 @@
#endif #endif
const char gVersionInfoFull[] = const char gVersionInfoFull[] =
OPENRCT2_NAME ", v" OPENRCT2_VERSION OPENRCT2_NAME ", "
#ifdef OPENRCT2_BRANCH #ifdef OPENRCT2_VERSION_TAG
"-" OPENRCT2_BRANCH OPENRCT2_VERSION_TAG
#else
"v" OPENRCT2_VERSION
#endif #endif
#ifdef OPENRCT2_COMMIT_SHA1_SHORT #if defined(OPENRCT2_BRANCH) || defined(OPENRCT2_COMMIT_SHA1_SHORT) || !defined(NDEBUG)
" build " OPENRCT2_COMMIT_SHA1_SHORT " ("
#if defined(OPENRCT2_BRANCH) && defined(OPENRCT2_COMMIT_SHA1_SHORT)
OPENRCT2_COMMIT_SHA1_SHORT " on " OPENRCT2_BRANCH
#elif defined(OPENRCT2_COMMIT_SHA1_SHORT)
OPENRCT2_COMMIT_SHA1_SHORT
#elif defined(OPENRCT2_BRANCH)
OPENRCT2_BRANCH
#endif
#ifndef NDEBUG
", DEBUG"
#endif
")"
#endif #endif
#ifdef OPENRCT2_BUILD_SERVER #ifdef OPENRCT2_BUILD_SERVER
" provided by " OPENRCT2_BUILD_SERVER " provided by " OPENRCT2_BUILD_SERVER
#endif
#ifndef NDEBUG
" (DEBUG)"
#endif #endif
; ;