dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix version and update README

Browse Source
This commit is contained in:
Jonas Kvinge
2018-05-08 19:55:53 +02:00
parent f329b7239a
commit 7b2d1d95d3
5 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Summary.cmake
View File

@@ -1,5 +1,3 @@
cmake_policy(SET CMP0012 NEW)
set(summary_willbuild "")
set(summary_willnotbuild "")

36
cmake/Version.cmake
View File

@@ -3,7 +3,7 @@ set(STRAWBERRY_VERSION_MINOR 1)
set(STRAWBERRY_VERSION_PATCH 2)
#set(STRAWBERRY_VERSION_PRERELEASE rc1)
set(INCLUDE_GIT_REVISION OFF)
set(INCLUDE_GIT_REVISION ON)
set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
@@ -36,26 +36,38 @@ if(NOT GIT_EXECUTABLE-NOTFOUND)
)
# Get the latest abbreviated commit hash of the working branch
execute_process(
COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
RESULT_VARIABLE GIT_INFO_RESULT
COMMAND ${GIT_EXECUTABLE} describe --tags --always
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE GIT_COMMIT_HASH
RESULT_VARIABLE GIT_INFO_RESULT
OUTPUT_VARIABLE GIT_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
endif()
if(${GIT_INFO_RESULT} EQUAL 0)
set(HAS_GET_REVISION ON)
set(GIT_REV "${GIT_COMMIT_HASH}")
set(HAS_GIT_REVISION ON)
string(REGEX REPLACE "^(.+)-([0-9]+)-(g[a-f0-9]+)$" "\\1;\\2;\\3" GIT_PARTS ${GIT_REVISION})
if(NOT GIT_PARTS)
message(FATAL_ERROR "Failed to parse git revision string '${GIT_REVISION}'")
endif(NOT GIT_PARTS)
list(LENGTH GIT_PARTS GIT_PARTS_LENGTH)
if(GIT_PARTS_LENGTH EQUAL 3)
list(GET GIT_PARTS 0 GIT_TAGNAME)
list(GET GIT_PARTS 1 GIT_COMMITCOUNT)
list(GET GIT_PARTS 2 GIT_SHA1)
set(HAS_GIT_REVISION ON)
endif(GIT_PARTS_LENGTH EQUAL 3)
endif(${GIT_INFO_RESULT} EQUAL 0)
if(INCLUDE_GIT_REVISION AND HAS_GET_REVISION)
set(STRAWBERRY_VERSION_DISPLAY "${STRAWBERRY_VERSION_DISPLAY} ${GIT_BRANCH} ${GIT_REV}")
set(STRAWBERRY_VERSION_PACKAGE "${STRAWBERRY_VERSION_PACKAGE}-${GIT_BRANCH}-${GIT_REV}")
set(STRAWBERRY_VERSION_RPM_V "${STRAWBERRY_VERSION_RPM_V}.${GIT_BRANCH}.${GIT_REV}")
set(STRAWBERRY_VERSION_RPM_R "1")
endif(INCLUDE_GIT_REVISION AND HAS_GET_REVISION)
if(INCLUDE_GIT_REVISION AND HAS_GIT_REVISION)
set(STRAWBERRY_VERSION_DISPLAY "${GIT_REVISION}")
set(STRAWBERRY_VERSION_PACKAGE "${GIT_REVISION}")
set(STRAWBERRY_VERSION_RPM_V "${GIT_TAGNAME}")
set(STRAWBERRY_VERSION_RPM_R "2.${GIT_COMMITCOUNT}.${GIT_SHA1}")
endif(INCLUDE_GIT_REVISION AND HAS_GIT_REVISION)
message(STATUS "Strawberry Version:")
message(STATUS "Display: ${STRAWBERRY_VERSION_DISPLAY}")