From d8aeaa129e4cb34bc221a09ac7551e7859978aee Mon Sep 17 00:00:00 2001 From: Roman Peshkurov Date: Fri, 28 Aug 2015 19:31:53 +0300 Subject: [PATCH 1/2] version-numerating: set fixed version for stash repo. [NO CASE] --- libs/libcommon/src/create_revision.sh.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/libcommon/src/create_revision.sh.cmake b/libs/libcommon/src/create_revision.sh.cmake index a6acfad3f1d..8fe1f2c5689 100644 --- a/libs/libcommon/src/create_revision.sh.cmake +++ b/libs/libcommon/src/create_revision.sh.cmake @@ -15,6 +15,12 @@ revision=$(git tag --points-at HEAD 2> /dev/null | tail -1) if [[ "$revision" = "" ]]; then revision=$( ( git describe --tags || echo 1 ) | cut -d "-" -f 1 ) fi + +is_it_github=$( git config --get remote.origin.url | grep 'github') +if [[ "$is_it_github" = "" ]] then + revision=53190 +fi + echo $revision >> "${CMAKE_CURRENT_BINARY_DIR}/src/revision.h"; echo "#endif" >> "${CMAKE_CURRENT_BINARY_DIR}/src/revision.h" From c29531227c8a7f7d00ad617e20fcc8181e47eaf5 Mon Sep 17 00:00:00 2001 From: Roman Peshkurov Date: Fri, 28 Aug 2015 19:43:37 +0300 Subject: [PATCH 2/2] version-numerating: try to fix scrypt. [NO CASE] --- libs/libcommon/src/create_revision.sh.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/libcommon/src/create_revision.sh.cmake b/libs/libcommon/src/create_revision.sh.cmake index 8fe1f2c5689..7da01ee5b95 100644 --- a/libs/libcommon/src/create_revision.sh.cmake +++ b/libs/libcommon/src/create_revision.sh.cmake @@ -16,8 +16,8 @@ if [[ "$revision" = "" ]]; then revision=$( ( git describe --tags || echo 1 ) | cut -d "-" -f 1 ) fi -is_it_github=$( git config --get remote.origin.url | grep 'github') -if [[ "$is_it_github" = "" ]] then +is_it_github=$( git config --get remote.origin.url | grep 'github' ) +if [[ "$is_it_github" = "" ]]; then revision=53190 fi