From: Lasse Collin <lasse.collin@tukaani.org>
Date: Fri, 26 Apr 2024 14:58:27 +0000 (+0300)
Subject: Use version.txt instead of version.sh
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03c8f1016eb38363df4af6e88c05c8c025c10c4a;p=thirdparty%2Fxz.git

Use version.txt instead of version.sh
---

diff --git a/configure.ac b/configure.ac
index 68a02c97..d044c7a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]),
+AC_INIT([XZ Utils], m4_esyscmd([tr -d '\r\n' < build-aux/version.txt]),
 	[xz@tukaani.org], [xz], [https://tukaani.org/xz/])
 AC_CONFIG_SRCDIR([src/liblzma/common/common.h])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/doxygen/update-doxygen b/doxygen/update-doxygen
index 87dfffb2..5fea78af 100755
--- a/doxygen/update-doxygen
+++ b/doxygen/update-doxygen
@@ -38,7 +38,7 @@ if test ! -f Doxyfile; then
 fi
 
 # Get the package version so that it can be included in the generated docs.
-PACKAGE_VERSION=`cd .. && sh build-aux/version.sh` || exit 1
+PACKAGE_VERSION=`cat ../build-aux/version.txt` || exit 1
 
 # If no arguments are specified, default to generating liblzma API header
 # documentation only.
diff --git a/po4a/update-po b/po4a/update-po
index d886ad0d..0a292cdb 100755
--- a/po4a/update-po
+++ b/po4a/update-po
@@ -29,7 +29,7 @@ if test ! -f po4a.conf; then
 	fi
 fi
 
-PACKAGE_VERSION=`cd .. && sh build-aux/version.sh` || exit 1
+PACKAGE_VERSION=`cat ../build-aux/version.txt` || exit 1
 
 # Put the author info from the .po files into the header comment of
 # the generated man pages.
diff --git a/src/liblzma/validate_map.sh b/src/liblzma/validate_map.sh
index dd1589d2..528060c7 100644
--- a/src/liblzma/validate_map.sh
+++ b/src/liblzma/validate_map.sh
@@ -95,7 +95,7 @@ SYMS=$(sed -n 's/^extern LZMA_API([^)]*) \([a-z0-9_]*\)(.*$/\1;/p' \
 	| grep -Fve "$(sed '/[{}:*]/d;/^$/d;s/^	//' liblzma_generic.map)")
 
 # Check that there are no old alpha or beta versions listed.
-VER=$(cd ../.. && sh build-aux/version.sh)
+VER=$(cat ../../build-aux/version.txt)
 NAMES=
 case $VER in
 	*alpha | *beta)
diff --git a/windows/build.bash b/windows/build.bash
index fa7b938c..bf4d8992 100644
--- a/windows/build.bash
+++ b/windows/build.bash
@@ -221,7 +221,7 @@ do
 done
 
 if [ -x "$SEVENZ" ]; then
-	VER=$(sh build-aux/version.sh)
+	VER=$(cat build-aux/version.txt)
 	cd pkg
 	"$SEVENZ" a -tzip ../xz-$VER-windows.zip *
 	"$SEVENZ" a ../xz-$VER-windows.7z *