diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e5acad2..a3b87151 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ project(xca LANGUAGES CXX ) -file(READ VERSION ver) +file(READ VERSION.txt ver) string(REGEX MATCH "([0-9\.]*)" _ ${ver}) set(PROJECT_VERSION ${CMAKE_MATCH_1}) diff --git a/VERSION b/VERSION.txt similarity index 100% rename from VERSION rename to VERSION.txt diff --git a/release/git.release b/release/git.release index 7e6802e5..0345eb74 100755 --- a/release/git.release +++ b/release/git.release @@ -3,7 +3,7 @@ set -e type git || exit 1 -test -s VERSION && test -s changelog && test -d ../qt +test -s VERSION.txt && test -s changelog && test -d ../qt export TVERSION="$1" commit=master @@ -43,7 +43,7 @@ if test -n "$x"; then exit 1 fi -echo "$TVERSION" > VERSION +echo "$TVERSION" > VERSION.txt ( LANG=C date +"xca $TVERSION %a %b %d %Y" echo @@ -51,7 +51,7 @@ echo "$TVERSION" > VERSION ) > changelog.new mv changelog.new changelog -git commit VERSION changelog -m "Prepare XCA $TVERSION" +git commit VERSION.txt changelog -m "Prepare XCA $TVERSION" git tag -a "RELEASE.$TVERSION" -m "Release version $TVERSION" # Create the tar.gz diff --git a/release/git.release.something b/release/git.release.something index a8bc6675..50dacc75 100755 --- a/release/git.release.something +++ b/release/git.release.something @@ -22,8 +22,8 @@ fi branchname="build-$TVERSION" git checkout -b "$branchname" "$commit" -echo "$TVERSION" > VERSION -git commit VERSION -m "$TVERSION" +echo "$TVERSION" > VERSION.txt +git commit VERSION.txt -m "$TVERSION" git tag RELEASE.$TVERSION # Create the tar.gz