Skip to content

Commit ed83f8d

Browse files
alexey-milovidovalesapin
alexey-milovidov
authored and
alesapin
committed
Merge pull request #11255 from zlobober/proper_versions_in_arcadia
Use proper versions in Arcadia build. (cherry picked from commit 04bdffd)
1 parent ba7cd8f commit ed83f8d

File tree

4 files changed

+54
-23
lines changed

4 files changed

+54
-23
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 54433)
3+
set(VERSION_MAJOR 20)
4+
set(VERSION_MINOR 3)
5+
set(VERSION_PATCH 11)
6+
set(VERSION_GITHASH 257cd6cadf7380ee6936d9c00922176e5d268992)
7+
set(VERSION_DESCRIBE v20.3.11.1-lts)
8+
set(VERSION_STRING 20.3.11.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 54433)
3-
set(VERSION_MAJOR 20)
4-
set(VERSION_MINOR 3)
5-
set(VERSION_PATCH 11)
6-
set(VERSION_GITHASH 257cd6cadf7380ee6936d9c00922176e5d268992)
7-
set(VERSION_DESCRIBE v20.3.11.1-lts)
8-
set(VERSION_STRING 20.3.11.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+

‎utils/release/release_lib.sh‎

Lines changed: 19 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,26 +90,31 @@ 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-
dbms/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 ||:
105-
git commit -m "$auto_message [$VERSION_STRING] [$VERSION_REVISION]" cmake/version.cmake debian/changelog docker/*/Dockerfile src/Storages/System/StorageSystemContributors.generated.cpp
105+
git commit -m "$auto_message [$VERSION_STRING] [$VERSION_REVISION]" autogenerated_versions.txt debian/changelog docker/*/Dockerfile src/Storages/System/StorageSystemContributors.generated.cpp
106+
=======
107+
utils/list-versions/list-versions.sh > utils/list-versions/version_date.tsv
108+
109+
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
110+
>>>>>>> 04bdffd9d7... Merge pull request #11255 from zlobober/proper_versions_in_arcadia
106111
if [ -z $NO_PUSH ]; then
107112
git push
108113
fi
109114

110115
echo "Generated version: ${VERSION_STRING}, revision: ${VERSION_REVISION}."
111116

112-
# Second tag for correct version information in version.cmake inside tag
117+
# Second tag for correct version information in autogenerated_versions.txt inside tag
113118
if git tag --force -a "$tag" -m "$tag"
114119
then
115120
if [ -z $NO_PUSH ]; then

0 commit comments

Comments
 (0)