archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-26 22:04:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix version for go.d plugin ()

Browse source
This commit is contained in:
vkalintiris 2024-05-28 17:50:23 +03:00 • committed by GitHub
parent 7ed4ea779c
commit 2d59017ba5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions

1
CMakeLists.txt
View file

@ -2367,7 +2367,6 @@ set(CONFIGURE_COMMAND "dummy-configure-command")
if (NOT NETDATA_USER) if (NOT NETDATA_USER)
set(NETDATA_USER "netdata") set(NETDATA_USER "netdata")
endif() endif()
set(VERSION "${GIT_DESCRIBE_OUTPUT}")
configure_file(packaging/cmake/config.cmake.h.in config.h) configure_file(packaging/cmake/config.cmake.h.in config.h)

4
packaging/cmake/Modules/NetdataGoTools.cmake
View file

@ -5,9 +5,9 @@
# SPDX-License-Identifier: GPL # SPDX-License-Identifier: GPL
if(CMAKE_BUILD_TYPE STREQUAL Debug) if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(GO_LDFLAGS "-X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION}") set(GO_LDFLAGS "-X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION_STRING}")
else() else()
set(GO_LDFLAGS "-w -s -X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION}") set(GO_LDFLAGS "-w -s -X github.com/netdata/netdata/go/go.d.plugin/pkg/buildinfo.Version=${NETDATA_VERSION_STRING}")
endif() endif()
# add_go_target: Add a new target that needs to be built using the Go toolchain. # add_go_target: Add a new target that needs to be built using the Go toolchain.

2
packaging/cmake/Modules/NetdataVersion.cmake
View file

@ -24,7 +24,7 @@ function(netdata_version)
endif() endif()
string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT) string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
set(GIT_DESCRIBE_OUTPUT "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE) set(NETDATA_VERSION_STRING "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE)
string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}") string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}")
if(CMAKE_MATCH_COUNT EQUAL 3) if(CMAKE_MATCH_COUNT EQUAL 3)

2
packaging/cmake/config.cmake.h.in
View file

@ -166,7 +166,7 @@
#define NETDATA_VERSION_TWEAK "@NETDATA_VERSION_TWEAK@" #define NETDATA_VERSION_TWEAK "@NETDATA_VERSION_TWEAK@"
#define NETDATA_VERSION_DESCR "@NETDATA_VERSION_DESCR@" #define NETDATA_VERSION_DESCR "@NETDATA_VERSION_DESCR@"
#define NETDATA_VERSION "@GIT_DESCRIBE_OUTPUT@" #define NETDATA_VERSION "@NETDATA_VERSION_STRING@"
#define ENABLE_JSONC 1 #define ENABLE_JSONC 1