Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version' into 'master'

Browse Source 
Fix finding Version

See merge request !26
This commit is contained in:
o9000
2017-06-26 20:29:57 +00:00
parent c8ccf053ff 7a350a5e83
commit cb174592be
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -217,7 +217,7 @@ else()
SET(ASAN_L_FLAGS "") SET(ASAN_L_FLAGS "")
endif() 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} link_directories( ${X11_LIBRARY_DIRS}
${PANGOCAIRO_LIBRARY_DIRS} ${PANGOCAIRO_LIBRARY_DIRS}

6
get_version.sh
View File

@@ -33,10 +33,10 @@ then
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 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 else
VERSION=$( (head -n 1 ChangeLog || head -n 1 ../ChangeLog) | cut -d ' ' -f 2) VERSION=$(head -n 1 ${2}ChangeLog | cut -d ' ' -f 2)
if [ "$VERSION" = "master" ] if [ $VERSION = "master" ]
then 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
fi fi

2
packaging/make_ubuntu.sh
View File

@@ -14,7 +14,7 @@ else
fi fi
# Get version (and check that the repository is clean) # Get version (and check that the repository is clean)
VERSION=$(../get_version.sh --strict) VERSION=$(../get_version.sh --strict ../)
if [ ! $? -eq 0 ] if [ ! $? -eq 0 ]
then then
echo >&2 "Error: get_version.sh failed!" echo >&2 "Error: get_version.sh failed!"