Author: manx
Date: Fri Apr 5 16:43:00 2024
New Revision: 20514
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20514
Log:
Merged revision(s) 20494, 20507 from trunk/OpenMPT:
[Imp] build: Autotools: Support running autoconfiscate on BSD system.
........
[Fix] build: Autotools: Assume bsdtar on BSD.
........
Modified:
branches/OpenMPT-1.31/ (props changed)
branches/OpenMPT-1.31/build/autotools/autoconfiscate.sh
Modified: branches/OpenMPT-1.31/build/autotools/autoconfiscate.sh
==============================================================================
--- branches/OpenMPT-1.31/build/autotools/autoconfiscate.sh Fri Apr 5 16:41:19 2024 (r20513)
+++ branches/OpenMPT-1.31/build/autotools/autoconfiscate.sh Fri Apr 5 16:43:00 2024 (r20514)
@@ -9,11 +9,21 @@
# checkout. The invests no effort in verifying this precondition.
#
+echo "Detecting OS ..."
+UNAME_S="$(uname -s)"
+if [[ $UNAME_S == *"BSD"* ]]; then
+ BSD=1
+ MAKE=gmake
+else
+ BSD=0
+ MAKE=make
+fi
+
echo "Gathering version ..."
. libopenmpt/libopenmpt_version.mk
echo "Cleaning local build ..."
-make clean
+$MAKE clean
echo "Cleaning dist-autotools.tar ..."
rm -rf bin/dist-autotools.tar || true
@@ -188,14 +198,14 @@
echo " BUILD_SVNDATE=${BUILD_SVNDATE}"
echo "Building man pages ..."
-make bin/openmpt123.1
+$MAKE bin/openmpt123.1
echo "Copying man pages ..."
mkdir bin/dist-autotools/man
cp bin/openmpt123.1 bin/dist-autotools/man/openmpt123.1
echo "Cleaning local buid ..."
-make clean
+$MAKE clean
echo "Changing to autotools package directory ..."
OLDDIR="$(pwd)"
@@ -239,28 +249,31 @@
./configure
echo "Running 'make dist' ..."
-make dist
+$MAKE dist
echo "Running 'make distcheck' ..."
-#make distcheck
(
- make distcheck 3>&1 1>&2 2>&3 | ( grep -v 'libtool: install: warning:' || true ) | ( grep -v 'libtool: warning: remember to run' || true ) | ( grep -v "libtool: warning: '.*la' has not been installed" || true )
+ $MAKE distcheck 3>&1 1>&2 2>&3 | ( grep -v 'libtool: install: warning:' || true ) | ( grep -v 'libtool: warning: remember to run' || true ) | ( grep -v "libtool: warning: '.*la' has not been installed" || true )
exit ${PIPESTATUS[0]}
) 3>&1 1>&2 2>&3
echo "Running 'make' ..."
-make
+$MAKE
echo "Running 'make check' ..."
-make check
+$MAKE check
echo "Building dist-autotools.tar ..."
cd "$OLDDIR"
-MPT_LIBOPENMPT_VERSION=$(make distversion-tarball)
+MPT_LIBOPENMPT_VERSION=$($MAKE distversion-tarball)
cd bin/dist-autotools
rm -rf libopenmpt
mkdir -p libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/
cp *.tar.gz libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/
-tar -cv --numeric-owner --owner=0 --group=0 -f ../dist-autotools.tar libopenmpt
+if [[ $BSD == "1" ]]; then
+ tar -cv --numeric-owner --uname "" --gname "" --uid 0 --gid 0 -f ../dist-autotools.tar libopenmpt
+else
+ tar -cv --numeric-owner --owner=0 --group=0 -f ../dist-autotools.tar libopenmpt
+fi
cd ../..
|
