Merge branch 'version' into 'master' Fix finding Version See merge request !26
o9000 mrovi9000@gmail.com
3 files changed,
5 insertions(+),
5 deletions(-)
M
CMakeLists.txt
→
CMakeLists.txt
@@ -217,7 +217,7 @@ SET(ASAN_C_FLAGS "")
SET(ASAN_L_FLAGS "") endif() -add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" "\"${PROJECT_SOURCE_DIR}\"" ) +add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_version.sh" -- "\"${PROJECT_SOURCE_DIR}/\"" ) link_directories( ${X11_LIBRARY_DIRS} ${PANGOCAIRO_LIBRARY_DIRS}
M
get_version.sh
→
get_version.sh
@@ -33,10 +33,10 @@ fi
fi VERSION=$(git describe --exact-match 2>/dev/null || echo "$MAJOR-git$(git show -s --pretty=format:%ci | cut -d ' ' -f 1 | tr -d '-').$(git show -s --pretty=format:%h)")$DIRTY else - VERSION=$( (head -n 1 ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 2) - if [ "$VERSION" = "master" ] + VERSION=$(head -n 1 ${2}ChangeLog | cut -d ' ' -f 2) + if [ $VERSION = "master" ] then - VERSION=$VERSION-$( (head -n 1 ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 1) + VERSION=$VERSION-$(head -n 1 ${2}ChangeLog | cut -d ' ' -f 1) fi fi
M
packaging/make_ubuntu.sh
→
packaging/make_ubuntu.sh
@@ -14,7 +14,7 @@ MINOR="1"
fi # Get version (and check that the repository is clean) -VERSION=$(../get_version.sh --strict) +VERSION=$(../get_version.sh --strict ../) if [ ! $? -eq 0 ] then echo >&2 "Error: get_version.sh failed!"