upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-02-03 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 2b1e5a429f into 274a0e39d5

Browse source
This commit is contained in:
Alexander Aleksandrovič Klimov 2026-02-03 15:23:52 +01:00 committed by GitHub
commit 49d3bccaed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.git-archive-version Normal file
View file

@ -0,0 +1,2 @@
# Becomes like v2.13.0-555-g11e37a0bd if git-archived, is kept as-is otherwise
$Format:%(describe)$

3
.gitattributes vendored
View file

@ -1,2 +1,5 @@
debian/ export-ignore
.gitattributes export-ignore
# Include version information on `git archive'
/.git-archive-version export-subst

14
CMakeLists.txt
View file

@ -104,8 +104,14 @@ string(SUBSTRING ${SPEC_VERSION} 9 ${SPEC_VERSION_LENGTH} SPEC_VERSION)
configure_file(icinga-spec-version.h.cmake icinga-spec-version.h)
include(GetGitRevisionDescription)
git_describe(GIT_VERSION --tags)
file(STRINGS .git-archive-version GIT_ARCHIVE_VERSION REGEX "^[^#]")
if(GIT_ARCHIVE_VERSION MATCHES "Format")
include(GetGitRevisionDescription)
git_describe(GIT_VERSION --tags)
else()
set(GIT_VERSION "${GIT_ARCHIVE_VERSION}")
endif()
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/icinga-version.h.force)
configure_file(icinga-version.h.force ${CMAKE_CURRENT_BINARY_DIR}/icinga-version.h COPYONLY)
else()
@ -118,6 +124,10 @@ else()
set(GIT_VERSION "r${SPEC_VERSION}-${SPEC_REVISION}")
set(ICINGA2_VERSION "${SPEC_VERSION}")
else()
if(GIT_VERSION MATCHES "-g")
# Override v2.13.0-555-g11e37a0bd from git describe with 2.13.7 from ./ICINGA2_VERSION -> v2.13.7-555-g11e37a0bd
string(REGEX REPLACE ^[v0-9.]+ "v${SPEC_VERSION}" GIT_VERSION "${GIT_VERSION}")
endif()
# use GIT version as ICINGA2_VERSION
string(REGEX REPLACE "^[rv]" "" ICINGA2_VERSION "${GIT_VERSION}")
endif()