Skip to content

Commit 04bdffd

Browse files
alexey-milovidovalexey-milovidov
authored
Merge pull request #11255 from zlobober/proper_versions_in_arcadia
Use proper versions in Arcadia build.
2 parents 13b0acd + ce52a2c commit 04bdffd

File tree

5 files changed

+50
-37
lines changed

5 files changed

+50
-37
lines changed

‎cmake/autogenerated_versions.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# This strings autochanged from release_lib.sh:
2+
SET(VERSION_REVISION 54435)
3+
SET(VERSION_MAJOR 20)
4+
SET(VERSION_MINOR 5)
5+
SET(VERSION_PATCH 1)
6+
SET(VERSION_GITHASH 91df18a906dcffdbee6816e5389df6c65f86e35f)
7+
SET(VERSION_DESCRIBE v20.5.1.1-prestable)
8+
SET(VERSION_STRING 20.5.1.1)
9+
# end of autochange

‎cmake/version.cmake‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
# This strings autochanged from release_lib.sh:
2-
set(VERSION_REVISION 54435)
3-
set(VERSION_MAJOR 20)
4-
set(VERSION_MINOR 5)
5-
set(VERSION_PATCH 1)
6-
set(VERSION_GITHASH 91df18a906dcffdbee6816e5389df6c65f86e35f)
7-
set(VERSION_DESCRIBE v20.5.1.1-prestable)
8-
set(VERSION_STRING 20.5.1.1)
9-
# end of autochange
1+
include(${CMAKE_SOURCE_DIR}/cmake/autogenerated_versions.txt)
102

113
set(VERSION_EXTRA "" CACHE STRING "")
124
set(VERSION_TWEAK "" CACHE STRING "")

‎cmake/yandex/ya.make.versions.inc‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/autogenerated_versions.txt)
2+
3+
# TODO: not sure if this is customizable per-binary
4+
SET(VERSION_NAME "ClickHouse")
5+
6+
# TODO: not quite sure how to replace dash with space in ya.make
7+
SET(VERSION_FULL "${VERSION_NAME}-${VERSION_STRING}")
8+
9+
CFLAGS (GLOBAL -DDBMS_NAME=\"ClickHouse\")
10+
CFLAGS (GLOBAL -DDBMS_VERSION_MAJOR=${VERSION_MAJOR})
11+
CFLAGS (GLOBAL -DDBMS_VERSION_MINOR=${VERSION_MINOR})
12+
CFLAGS (GLOBAL -DDBMS_VERSION_PATCH=${VERSION_PATCH})
13+
CFLAGS (GLOBAL -DVERSION_FULL=\"\\\"${VERSION_FULL}\\\"\")
14+
CFLAGS (GLOBAL -DVERSION_MAJOR=${VERSION_MAJOR})
15+
CFLAGS (GLOBAL -DVERSION_MINOR=${VERSION_MINOR})
16+
CFLAGS (GLOBAL -DVERSION_PATCH=${VERSION_PATCH})
17+
18+
# TODO: not supported yet, not sure if ya.make supports arithmetics.
19+
CFLAGS (GLOBAL -DVERSION_INTEGER=0)
20+
21+
CFLAGS (GLOBAL -DVERSION_NAME=\"\\\"${VERSION_NAME}\\\"\")
22+
CFLAGS (GLOBAL -DVERSION_OFFICIAL=\"-arcadia\")
23+
CFLAGS (GLOBAL -DVERSION_REVISION=${VERSION_REVISION})
24+
CFLAGS (GLOBAL -DVERSION_STRING=\"\\\"${VERSION_STRING}\\\"\")
25+

‎src/Common/ya.make‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,7 @@ PEERDIR(
1818
contrib/restricted/ryu
1919
)
2020

21-
# TODO: stub for config_version.h
22-
CFLAGS (GLOBAL -DDBMS_NAME=\"ClickHouse\")
23-
CFLAGS (GLOBAL -DDBMS_VERSION_MAJOR=0)
24-
CFLAGS (GLOBAL -DDBMS_VERSION_MINOR=0)
25-
CFLAGS (GLOBAL -DDBMS_VERSION_PATCH=0)
26-
CFLAGS (GLOBAL -DVERSION_FULL=\"ClickHouse\")
27-
CFLAGS (GLOBAL -DVERSION_INTEGER=0)
28-
CFLAGS (GLOBAL -DVERSION_MAJOR=0)
29-
CFLAGS (GLOBAL -DVERSION_MINOR=0)
30-
CFLAGS (GLOBAL -DVERSION_PATCH=0)
31-
CFLAGS (GLOBAL -DVERSION_NAME=\"ClickHouse\")
32-
CFLAGS (GLOBAL -DVERSION_OFFICIAL=\"\\\(arcadia\\\)\")
33-
CFLAGS (GLOBAL -DVERSION_REVISION=0)
34-
CFLAGS (GLOBAL -DVERSION_STRING=\"Unknown\")
21+
INCLUDE(${ARCADIA_ROOT}/clickhouse/cmake/yandex/ya.make.versions.inc)
3522

3623
SRCS(
3724
ActionLock.cpp

‎utils/release/release_lib.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ function gen_version_string {
1212
function get_version {
1313
if [ -z "$VERSION_MAJOR" ] && [ -z "$VERSION_MINOR" ] && [ -z "$VERSION_PATCH" ]; then
1414
BASEDIR=$(dirname "${BASH_SOURCE[0]}")/../../
15-
VERSION_REVISION=`grep "set(VERSION_REVISION" ${BASEDIR}/cmake/version.cmake | sed 's/^.*VERSION_REVISION \(.*\)$/\1/' | sed 's/[) ].*//'`
16-
VERSION_MAJOR=`grep "set(VERSION_MAJOR" ${BASEDIR}/cmake/version.cmake | sed 's/^.*VERSION_MAJOR \(.*\)/\1/' | sed 's/[) ].*//'`
17-
VERSION_MINOR=`grep "set(VERSION_MINOR" ${BASEDIR}/cmake/version.cmake | sed 's/^.*VERSION_MINOR \(.*\)/\1/' | sed 's/[) ].*//'`
18-
VERSION_PATCH=`grep "set(VERSION_PATCH" ${BASEDIR}/cmake/version.cmake | sed 's/^.*VERSION_PATCH \(.*\)/\1/' | sed 's/[) ].*//'`
15+
VERSION_REVISION=`grep "SET(VERSION_REVISION" ${BASEDIR}/cmake/autogenerated_versions.txt | sed 's/^.*VERSION_REVISION \(.*\)$/\1/' | sed 's/[) ].*//'`
16+
VERSION_MAJOR=`grep "SET(VERSION_MAJOR" ${BASEDIR}/cmake/autogenerated_versions.txt | sed 's/^.*VERSION_MAJOR \(.*\)/\1/' | sed 's/[) ].*//'`
17+
VERSION_MINOR=`grep "SET(VERSION_MINOR" ${BASEDIR}/cmake/autogenerated_versions.txt | sed 's/^.*VERSION_MINOR \(.*\)/\1/' | sed 's/[) ].*//'`
18+
VERSION_PATCH=`grep "SET(VERSION_PATCH" ${BASEDIR}/cmake/autogenerated_versions.txt | sed 's/^.*VERSION_PATCH \(.*\)/\1/' | sed 's/[) ].*//'`
1919
fi
2020
VERSION_PREFIX="${VERSION_PREFIX:-v}"
2121
VERSION_POSTFIX_TAG="${VERSION_POSTFIX:--testing}"
@@ -90,28 +90,28 @@ function gen_revision_author {
9090

9191
git_describe=`git describe`
9292
git_hash=`git rev-parse HEAD`
93-
sed -i -e "s/set(VERSION_REVISION [^) ]*/set(VERSION_REVISION $VERSION_REVISION/g;" \
94-
-e "s/set(VERSION_DESCRIBE [^) ]*/set(VERSION_DESCRIBE $git_describe/g;" \
95-
-e "s/set(VERSION_GITHASH [^) ]*/set(VERSION_GITHASH $git_hash/g;" \
96-
-e "s/set(VERSION_MAJOR [^) ]*/set(VERSION_MAJOR $VERSION_MAJOR/g;" \
97-
-e "s/set(VERSION_MINOR [^) ]*/set(VERSION_MINOR $VERSION_MINOR/g;" \
98-
-e "s/set(VERSION_PATCH [^) ]*/set(VERSION_PATCH $VERSION_PATCH/g;" \
99-
-e "s/set(VERSION_STRING [^) ]*/set(VERSION_STRING $VERSION_STRING/g;" \
100-
cmake/version.cmake
93+
sed -i -e "s/SET(VERSION_REVISION [^) ]*/SET(VERSION_REVISION $VERSION_REVISION/g;" \
94+
-e "s/SET(VERSION_DESCRIBE [^) ]*/SET(VERSION_DESCRIBE $git_describe/g;" \
95+
-e "s/SET(VERSION_GITHASH [^) ]*/SET(VERSION_GITHASH $git_hash/g;" \
96+
-e "s/SET(VERSION_MAJOR [^) ]*/SET(VERSION_MAJOR $VERSION_MAJOR/g;" \
97+
-e "s/SET(VERSION_MINOR [^) ]*/SET(VERSION_MINOR $VERSION_MINOR/g;" \
98+
-e "s/SET(VERSION_PATCH [^) ]*/SET(VERSION_PATCH $VERSION_PATCH/g;" \
99+
-e "s/SET(VERSION_STRING [^) ]*/SET(VERSION_STRING $VERSION_STRING/g;" \
100+
cmake/autogenerated_versions.txt
101101

102102
gen_changelog "$VERSION_STRING" "" "$AUTHOR" ""
103103
gen_dockerfiles "$VERSION_STRING"
104104
src/Storages/System/StorageSystemContributors.sh ||:
105105
utils/list-versions/list-versions.sh > utils/list-versions/version_date.tsv
106106

107-
git commit -m "$auto_message [$VERSION_STRING] [$VERSION_REVISION]" cmake/version.cmake debian/changelog docker/*/Dockerfile src/Storages/System/StorageSystemContributors.generated.cpp utils/list-versions/version_date.tsv
107+
git commit -m "$auto_message [$VERSION_STRING] [$VERSION_REVISION]" cmake/autogenerated_versions.txt debian/changelog docker/*/Dockerfile src/Storages/System/StorageSystemContributors.generated.cpp utils/list-versions/version_date.tsv
108108
if [ -z $NO_PUSH ]; then
109109
git push
110110
fi
111111

112112
echo "Generated version: ${VERSION_STRING}, revision: ${VERSION_REVISION}."
113113

114-
# Second tag for correct version information in version.cmake inside tag
114+
# Second tag for correct version information in autogenerated_versions.txt inside tag
115115
if git tag --force -a "$tag" -m "$tag"
116116
then
117117
if [ -z $NO_PUSH ]; then

0 commit comments

Comments
 (0)