Elegant CURRENT_VERSION determination

Earlier today I didn't see that MAJOR, MINOR and PATCH variables were no longer needed outside the if-block, sorry.

In case the \K is unclear. Here's a great explanation: https://stackoverflow.com/a/33573989/835098
This commit is contained in:
Konrad Kleine 2021-04-09 19:30:07 +00:00
parent 9182f5787d
commit 4a581db3d8

5
debian/orig-tar.sh vendored
View File

@ -140,10 +140,7 @@ if test -z "$TAG" -a -z "$FINAL_RELEASE"; then
# In general, in Debian, we will keep X until X.0.1 is released (or rc in experimental)
# However, on apt.llvm.org, we will update the version to have X.0.1
# This code is doing that.
MAJOR=$(grep "set(LLVM_VERSION_MAJOR" llvm/CMakeLists.txt|tr -d -c '[0-9]')
MINOR=$(grep "set(LLVM_VERSION_MINOR" llvm/CMakeLists.txt|tr -d -c '[0-9]')
PATCH=$(grep "set(LLVM_VERSION_PATCH" llvm/CMakeLists.txt|tr -d -c '[0-9]')
CURRENT_VERSION="$MAJOR.$MINOR.$PATCH"
CURRENT_VERSION="$(grep -oP 'set\(\s*LLVM_VERSION_(MAJOR|MINOR|PATCH)\s\K[0-9]+' llvm/CMakeLists.txt | paste -sd '.')"
fi
# the + is here to make sure that this version is considered more recent than the svn
# dpkg --compare-versions 10~svn374977-1~exp1 lt 10~+2019-svn374977-1~exp1