mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-19 16:20:50 +00:00
fix moveing cmake files
This commit is contained in:
parent
8607cac261
commit
4271ef80ea
@ -88,8 +88,6 @@ if (APPLE OR CMAKE_SYSTEM MATCHES "FreeBSD")
|
||||
src/IO/WriteBufferAIO.cpp)
|
||||
endif()
|
||||
|
||||
#include (${CMAKE_SOURCE_DIR}/libs/libcommon/cmake/version.cmake)
|
||||
|
||||
if (USE_STATIC_LIBRARIES)
|
||||
add_library(dbms ${dbms_headers} ${dbms_sources})
|
||||
else ()
|
||||
|
4
release
4
release
@ -48,8 +48,8 @@ fi
|
||||
|
||||
if [[ $TEST != 'yes' ]]
|
||||
then
|
||||
# now done in external release scripts via --version
|
||||
#gen_revision_author
|
||||
# now incrementing done in external release scripts via --version
|
||||
get_revision_author
|
||||
else
|
||||
REVISION=99999
|
||||
fi
|
||||
|
@ -1,6 +1,6 @@
|
||||
function get_revision {
|
||||
BASEDIR=$(dirname "${BASH_SOURCE[0]}")
|
||||
grep "set(VERSION_REVISION" ${BASEDIR}/libs/libcommon/cmake/version.cmake | sed 's/^.*VERSION_REVISION \(.*\))$/\1/'
|
||||
grep "set(VERSION_REVISION" ${BASEDIR}/dbms/cmake/version.cmake | sed 's/^.*VERSION_REVISION \(.*\))$/\1/'
|
||||
}
|
||||
|
||||
function add_daemon_impl {
|
||||
@ -101,9 +101,9 @@ function gen_revision_author {
|
||||
git_log_grep=`git log --oneline --max-count=1 | grep "$auto_message"`
|
||||
if [ "$git_log_grep" == "" ]; then
|
||||
git_describe=`git describe`
|
||||
sed -i -- "s/VERSION_REVISION .*)/VERSION_REVISION $REVISION)/g" libs/libcommon/cmake/version.cmake
|
||||
sed -i -- "s/VERSION_DESCRIBE .*)/VERSION_DESCRIBE $git_describe)/g" libs/libcommon/cmake/version.cmake
|
||||
git commit -m "$auto_message [$REVISION]" libs/libcommon/cmake/version.cmake
|
||||
sed -i -- "s/VERSION_REVISION .*)/VERSION_REVISION $REVISION)/g" dbms/cmake/version.cmake
|
||||
sed -i -- "s/VERSION_DESCRIBE .*)/VERSION_DESCRIBE $git_describe)/g" dbms/cmake/version.cmake
|
||||
git commit -m "$auto_message [$REVISION]" dbms/cmake/version.cmake
|
||||
# git push
|
||||
fi
|
||||
|
||||
@ -114,6 +114,13 @@ function gen_revision_author {
|
||||
export AUTHOR
|
||||
}
|
||||
|
||||
function get_revision_author {
|
||||
REVISION=$(get_revision)
|
||||
AUTHOR=$(git config --get user.name)
|
||||
export REVISION
|
||||
export AUTHOR
|
||||
}
|
||||
|
||||
# Генерируем changelog из changelog.in.
|
||||
# изменяет
|
||||
# programs/CMakeLists.txt
|
||||
|
Loading…
Reference in New Issue
Block a user