From 106ce0c4eb66c5a1bf53b9d221221ef9cf2c6559 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 27 Apr 2023 10:39:38 +0300
Subject: [PATCH] build-aux: Update version scripts
---
build-aux/git-abi-version-gen | 36 +++++++++++++++++++++++++------
build-aux/git-tarname-version-gen | 14 ------------
build-aux/git-version-gen | 2 +-
3 files changed, 30 insertions(+), 22 deletions(-)
delete mode 100755 build-aux/git-tarname-version-gen
diff --git a/build-aux/git-abi-version-gen b/build-aux/git-abi-version-gen
index f25ccd733..3d96b2a19 100755
--- a/build-aux/git-abi-version-gen
+++ b/build-aux/git-abi-version-gen
@@ -1,14 +1,36 @@
#!/bin/sh
-## serial 1
+set -eu
-if test "${VERSION}" != ""; then
- VN=`echo ${VERSION} | sed -e "s/^\([0-9]*\.[0-9]*\)\.\([0-9]*\).*/\1.ABIv\2(${VERSION})/"`
+# serial 2
+
+# Converts version to ABI version (discards extra information)
+
+mangle_version()
+{
+ case "$1" in
+ # Convert YYYY.nn-foo+bar (rolling release) to
+ # YYYY.ABIvnn
+ 20*[[:digit:]].*[[:digit:]])
+ echo \"`echo $1 | sed -e "s/^\(20[0-9]*\)\.\([0-9]*\).*/\1.ABIv\2/"`\"
+ ;;
+ # Convert 2.x.x-foo+bar and 3.x.x-foo+bar to
+ # MAJOR.MINOR.ABIvPATCH
+ [23].*[[:digit:]].*[[:digit:]])
+ echo \"`echo $1 | sed -e "s/^\([0-9]*\.[0-9]*\)\.\([0-9]*\).*/\1.ABIv\2/"`\"
+ ;;
+ *)
+ echo "\"0.0.ABIv0\""
+ ;;
+ esac
+}
+
+if test "${VERSION:-}" != ""; then
+ :
elif test -f version; then
- VN=`cat version`
- VN=`echo $VN | sed -e "s/^\([0-9]*\.[0-9]*\)\.\([0-9]*\).*/\1.ABIv\2($VN)/"`
+ VERSION="`cat version`"
else test -d .git;
- VN="0.0.ABIv0(0.0.0)"
+ VERSION="0.0.0"
fi
-echo \"$VN\"
+mangle_version $VERSION
diff --git a/build-aux/git-tarname-version-gen b/build-aux/git-tarname-version-gen
deleted file mode 100755
index 021cbd61f..000000000
--- a/build-aux/git-tarname-version-gen
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-## serial 1
-
-if test "${VERSION}" != ""; then
- VN=`echo ${VERSION} | sed -e "s/^\([0-9]*\.[0-9]*\)\.\([0-9]*\).*/dovecot-\1-pigeonhole/"`
-elif test -f version; then
- VN=`cat version`
- VN=`echo $VN | sed -e "s/^\([0-9]*\.[0-9]*\)\.\([0-9]*\).*/dovecot-\1-pigeonhole/"`
-else
- VN='dovecot-0.0-pigeonhole'
-fi
-
-echo $VN
diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 0ea1638a0..e86abccdd 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -1,6 +1,6 @@
#!/bin/sh
-## serial 2
+# serial 2
if test "${VERSION}" != ""; then
VN="${VERSION}"
--
GitLab