thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 13:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove build date from system.build_options

Browse Source
This commit is contained in:
Alexey Milovidov 2021-04-24 02:00:31 +03:00
parent ea97a5a93a
commit 4648782a05
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Common/config_version.h.in
View File

@ -15,6 +15,7 @@
#cmakedefine VERSION_DESCRIBE "@VERSION_DESCRIBE@" #cmakedefine VERSION_DESCRIBE "@VERSION_DESCRIBE@"
#cmakedefine VERSION_GITHASH "@VERSION_GITHASH@" #cmakedefine VERSION_GITHASH "@VERSION_GITHASH@"
#cmakedefine VERSION_INTEGER @VERSION_INTEGER@ #cmakedefine VERSION_INTEGER @VERSION_INTEGER@
#cmakedefine VERSION_DATE @VERSION_DATE@
#if defined(VERSION_MAJOR) #if defined(VERSION_MAJOR)
#define DBMS_VERSION_MAJOR VERSION_MAJOR #define DBMS_VERSION_MAJOR VERSION_MAJOR

1
src/Storages/System/CMakeLists.txt
View File

@ -8,7 +8,6 @@ get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPE
get_property(TZDATA_VERSION GLOBAL PROPERTY TZDATA_VERSION_PROP) get_property(TZDATA_VERSION GLOBAL PROPERTY TZDATA_VERSION_PROP)
string (TIMESTAMP BUILD_DATE "%Y-%m-%d" UTC)
configure_file (StorageSystemBuildOptions.generated.cpp.in ${CONFIG_BUILD}) configure_file (StorageSystemBuildOptions.generated.cpp.in ${CONFIG_BUILD})
include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake) include(${ClickHouse_SOURCE_DIR}/cmake/dbms_glob_sources.cmake)

9
src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
View File

@ -1,22 +1,15 @@
// .cpp autogenerated by cmake // .cpp autogenerated by cmake
#cmakedefine01 BUILD_DETERMINISTIC
const char * auto_config_build[] const char * auto_config_build[]
{ {
"VERSION_FULL", "@VERSION_FULL@", "VERSION_FULL", "@VERSION_FULL@",
"VERSION_DESCRIBE", "@VERSION_DESCRIBE@", "VERSION_DESCRIBE", "@VERSION_DESCRIBE@",
"VERSION_INTEGER", "@VERSION_INTEGER@", "VERSION_INTEGER", "@VERSION_INTEGER@",
#if BUILD_DETERMINISTIC
"SYSTEM", "@CMAKE_SYSTEM_NAME@", "SYSTEM", "@CMAKE_SYSTEM_NAME@",
#else
"VERSION_GITHASH", "@VERSION_GITHASH@", "VERSION_GITHASH", "@VERSION_GITHASH@",
"VERSION_REVISION", "@VERSION_REVISION@", "VERSION_REVISION", "@VERSION_REVISION@",
"BUILD_DATE", "@BUILD_DATE@", "VERSION_DATE", "@VERSION_DATE@",
"SYSTEM", "@CMAKE_SYSTEM@", "SYSTEM", "@CMAKE_SYSTEM@",
#endif
"BUILD_TYPE", "@CMAKE_BUILD_TYPE@", "BUILD_TYPE", "@CMAKE_BUILD_TYPE@",
"SYSTEM_PROCESSOR", "@CMAKE_SYSTEM_PROCESSOR@", "SYSTEM_PROCESSOR", "@CMAKE_SYSTEM_PROCESSOR@",
"LIBRARY_ARCHITECTURE", "@CMAKE_LIBRARY_ARCHITECTURE@", "LIBRARY_ARCHITECTURE", "@CMAKE_LIBRARY_ARCHITECTURE@",

1
tests/queries/0_stateless/00417_system_build_options.reference
View File

@ -1,4 +1,3 @@
BUILD_DATE
BUILD_TYPE BUILD_TYPE
CXX_COMPILER CXX_COMPILER
CXX_FLAGS CXX_FLAGS

2
tests/queries/0_stateless/00417_system_build_options.sh
View File

@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh # shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh . "$CURDIR"/../shell_config.sh
$CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_DATE|BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS|TZDATA_VERSION)/'; $CLICKHOUSE_CLIENT --query="SELECT * FROM system.build_options" | perl -lnE 'print $1 if /(BUILD_TYPE|CXX_COMPILER)\s+\S+/ || /(CXX_FLAGS|LINK_FLAGS|TZDATA_VERSION)/';

3
utils/release/release_lib.sh
View File

@ -91,9 +91,12 @@ function gen_revision_author {
git_describe=`git describe` git_describe=`git describe`
git_hash=`git rev-parse HEAD` git_hash=`git rev-parse HEAD`
VERSION_DATE=`git show -s --format=%cs $git_hash`
sed -i -e "s/SET(VERSION_REVISION [^) ]*/SET(VERSION_REVISION $VERSION_REVISION/g;" \ sed -i -e "s/SET(VERSION_REVISION [^) ]*/SET(VERSION_REVISION $VERSION_REVISION/g;" \
-e "s/SET(VERSION_DESCRIBE [^) ]*/SET(VERSION_DESCRIBE $git_describe/g;" \ -e "s/SET(VERSION_DESCRIBE [^) ]*/SET(VERSION_DESCRIBE $git_describe/g;" \
-e "s/SET(VERSION_GITHASH [^) ]*/SET(VERSION_GITHASH $git_hash/g;" \ -e "s/SET(VERSION_GITHASH [^) ]*/SET(VERSION_GITHASH $git_hash/g;" \
-e "s/SET(VERSION_DATE [^) ]*/SET(VERSION_DATE $VERSION_DATE/g;" \
-e "s/SET(VERSION_MAJOR [^) ]*/SET(VERSION_MAJOR $VERSION_MAJOR/g;" \ -e "s/SET(VERSION_MAJOR [^) ]*/SET(VERSION_MAJOR $VERSION_MAJOR/g;" \
-e "s/SET(VERSION_MINOR [^) ]*/SET(VERSION_MINOR $VERSION_MINOR/g;" \ -e "s/SET(VERSION_MINOR [^) ]*/SET(VERSION_MINOR $VERSION_MINOR/g;" \
-e "s/SET(VERSION_PATCH [^) ]*/SET(VERSION_PATCH $VERSION_PATCH/g;" \ -e "s/SET(VERSION_PATCH [^) ]*/SET(VERSION_PATCH $VERSION_PATCH/g;" \