mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Incorrect REV_YEAR, and parsing of .ottdrev

pull/8195/head
glx 2020-06-05 21:43:22 +02:00 committed by glx22
parent 945508b854
commit 877d196ef5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/scripts/FindVersion.cmake
View File

@ -49,7 +49,7 @@ if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
) )
string(REGEX REPLACE "([0-9]+)-([0-9]+)-([0-9]+).*" "\\1\\2\\3" COMMITDATE "${COMMITDATE}") string(REGEX REPLACE "([0-9]+)-([0-9]+)-([0-9]+).*" "\\1\\2\\3" COMMITDATE "${COMMITDATE}")
set(REV_ISODATE "${COMMITDATE}") set(REV_ISODATE "${COMMITDATE}")
string(SUBSTRING REV_ISODATE 1 4 REV_YEAR) string(SUBSTRING "${REV_ISODATE}" 0 4 REV_YEAR)
# Get the branch # Get the branch
execute_process(COMMAND ${GIT_EXECUTABLE} symbolic-ref -q HEAD execute_process(COMMAND ${GIT_EXECUTABLE} symbolic-ref -q HEAD
@ -98,6 +98,7 @@ if (GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
set(ENV{LC_ALL} "${SAVED_LC_ALL}") set(ENV{LC_ALL} "${SAVED_LC_ALL}")
elseif (EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev") elseif (EXISTS "${CMAKE_SOURCE_DIR}/.ottdrev")
file(READ "${CMAKE_SOURCE_DIR}/.ottdrev" OTTDREV) file(READ "${CMAKE_SOURCE_DIR}/.ottdrev" OTTDREV)
string(REPLACE "\n" "" OTTDREV "${OTTDREV}")
string(REPLACE "\t" ";" OTTDREV "${OTTDREV}") string(REPLACE "\t" ";" OTTDREV "${OTTDREV}")
list(GET OTTDREV 0 REV_VERSION) list(GET OTTDREV 0 REV_VERSION)
list(GET OTTDREV 1 REV_ISODATE) list(GET OTTDREV 1 REV_ISODATE)