[OMPT-svn-commit] OpenMPT r22027 - in trunk/OpenMPT: . build/autotools build/svn

[<sv...@op...>]

Author: manx
Date: Mon Oct 28 17:29:49 2024
New Revision: 22027
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22027

Log:
[Ref] build: Makefile: Do not rely on parsing stdout of make runs for distversion. Use an output file instead.

Modified:
   trunk/OpenMPT/Makefile
   trunk/OpenMPT/build/autotools/autoconfiscate.sh
   trunk/OpenMPT/build/svn/do_libopenmpt_release.sh
   trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh

Modified: trunk/OpenMPT/Makefile
==============================================================================
--- trunk/OpenMPT/Makefile	Mon Oct 28 16:55:33 2024	(r22026)
+++ trunk/OpenMPT/Makefile	Mon Oct 28 17:29:49 2024	(r22027)
@@ -1488,6 +1488,9 @@
 LIBOPENMPT_LDFLAGS += -Wl,-soname,$(LIBOPENMPT_SONAME)
 endif
 
+MISC_OUTPUTS += bin/distversion
+MISC_OUTPUTS += bin/distversion-pure
+MISC_OUTPUTS += bin/distversion-tarball
 MISC_OUTPUTS += bin/$(FLAVOUR_DIR)empty.cpp
 MISC_OUTPUTS += bin/$(FLAVOUR_DIR)empty.out
 MISC_OUTPUTS += bin/$(FLAVOUR_DIR)openmpt123$(EXESUFFIX).norpath
@@ -2316,12 +2319,12 @@
 
 .PHONY: distversion
 distversion:
-	$(SILENT)echo "$(DIST_LIBOPENMPT_VERSION)"
+	$(SILENT)echo "$(DIST_LIBOPENMPT_VERSION)" > bin/distversion
 
 .PHONY: distversion-pure
 distversion-pure:
-	$(SILENT)echo "$(DIST_LIBOPENMPT_VERSION_PURE)"
+	$(SILENT)echo "$(DIST_LIBOPENMPT_VERSION_PURE)" > bin/distversion-pure
 
 .PHONY: distversion-tarball
 distversion-tarball:
-	$(SILENT)echo "$(DIST_LIBOPENMPT_TARBALL_VERSION)"
+	$(SILENT)echo "$(DIST_LIBOPENMPT_TARBALL_VERSION)" > bin/distversion-tarball

Modified: trunk/OpenMPT/build/autotools/autoconfiscate.sh
==============================================================================
--- trunk/OpenMPT/build/autotools/autoconfiscate.sh	Mon Oct 28 16:55:33 2024	(r22026)
+++ trunk/OpenMPT/build/autotools/autoconfiscate.sh	Mon Oct 28 17:29:49 2024	(r22027)
@@ -285,7 +285,8 @@
 
 echo "Building dist-autotools.tar ..."
 cd "$OLDDIR"
-MPT_LIBOPENMPT_VERSION=$($MAKE distversion-tarball)
+$MAKE QUIET=1 distversion-tarball
+MPT_LIBOPENMPT_VERSION=$(cat bin/distversion-tarball)
 cd bin/dist-autotools
 rm -rf libopenmpt
 mkdir -p libopenmpt/src.autotools/$MPT_LIBOPENMPT_VERSION/

Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release.sh
==============================================================================
--- trunk/OpenMPT/build/svn/do_libopenmpt_release.sh	Mon Oct 28 16:55:33 2024	(r22026)
+++ trunk/OpenMPT/build/svn/do_libopenmpt_release.sh	Mon Oct 28 17:29:49 2024	(r22027)
@@ -14,7 +14,8 @@
 build/update_libopenmpt_version.sh release
 svn ci -m "[Mod] libopenmpt: Prepare for release."
 svn up
-NEWVER=$(make distversion-pure)
+make QUIET=1 distversion-pure
+NEWVER=$(cat distversion-pure)
 NEWREV=$(svn info --xml . | xpath -e 'string(/info/entry/commit/@revision)' -q)
 svn cp -m "tag libopenmpt-${NEWVER}" -r ${NEWREV} https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32 https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER}
 build/update_libopenmpt_version.sh bumppatch

Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh
==============================================================================
--- trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh	Mon Oct 28 16:55:33 2024	(r22026)
+++ trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh	Mon Oct 28 17:29:49 2024	(r22027)
@@ -4,7 +4,8 @@
 
 svn up
 
-NEWVER=$(make distversion-pure)
+make QUIET=1 distversion-pure
+NEWVER=$(cat distversion-pure)
 NEWREV=$(svn info --xml . | xpath -e 'string(/info/entry/commit/@revision)' -q)
 svn cp -m "tag libopenmpt-${NEWVER}" -r ${NEWREV} https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32 https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER}
 TAGREV=$(svn info --xml https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} | xpath -e 'string(/info/entry/commit/@revision)' -q)