Fix generating release version.

This commit is contained in:
proller 2017-02-01 17:05:03 +03:00 committed by alexey-milovidov
parent 8d4a08cf9f
commit d59f34f052
2 changed files with 4 additions and 7 deletions

View File

@ -1,5 +0,0 @@
# Get last revision number
function get_revision {
BASEDIR=`dirname "$0"`
grep "set(VERSION_REVISION" ${BASEDIR}/libs/libcommon/cmake/version.cmake | sed 's/^.*VERSION_REVISION \(.*\))$/\1/'
}

View File

@ -1,4 +1,7 @@
source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/libs/libcommon/src/get_revision_lib.sh" function get_revision {
BASEDIR=$(dirname "${BASH_SOURCE[0]}")
grep "set(VERSION_REVISION" ${BASEDIR}/libs/libcommon/cmake/version.cmake | sed 's/^.*VERSION_REVISION \(.*\))$/\1/'
}
function add_daemon_impl { function add_daemon_impl {
local daemon=$1 local daemon=$1
@ -61,7 +64,6 @@ function gen_revision_author {
if [[ $STANDALONE != 'yes' ]] if [[ $STANDALONE != 'yes' ]]
then then
#needed for libs/libcommon/src/get_revision_lib.sh
git fetch --tags git fetch --tags
# Создадим номер ревизии и попытаемся залить на сервер. # Создадим номер ревизии и попытаемся залить на сервер.