[OMPT-svn-commit] OpenMPT r21047 - in trunk/OpenMPT/build: git svn

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

Author: manx
Date: Sat Jun 22 10:48:49 2024
New Revision: 21047
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21047

Log:
[Ref] build: Simplify xpath processing.

Modified:
   trunk/OpenMPT/build/git/generate_gitignore.sh
   trunk/OpenMPT/build/svn/do_libopenmpt_release.sh
   trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh

Modified: trunk/OpenMPT/build/git/generate_gitignore.sh
==============================================================================
--- trunk/OpenMPT/build/git/generate_gitignore.sh	Fri Jun 21 10:47:54 2024	(r21046)
+++ trunk/OpenMPT/build/git/generate_gitignore.sh	Sat Jun 22 10:48:49 2024	(r21047)
@@ -7,7 +7,7 @@
 echo "# This file was generated automatically by running build/git/generate_gitignore.sh inside a svn working copy." > .gitignore
 
 (
-	svn pl --recursive --xml | xpath -q -e '/properties/target[property/@name = "svn:ignore"]' | grep '^<target' | sed 's/<target path=//g' | sed 's/>$//g' | sed 's/"//g'
+	svn pl --recursive --xml | xpath -q -e '/properties/target[property/@name = "svn:ignore"]/@path' | sed 's/ path=//g' | sed 's/>$//g' | sed 's/"//g'
 ) | sort | while IFS=$'\n' read -r WCDIR ; do
 	if [ "x$WCDIR" = "x." ] ; then
 		PREFIX="/"

Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release.sh
==============================================================================
--- trunk/OpenMPT/build/svn/do_libopenmpt_release.sh	Fri Jun 21 10:47:54 2024	(r21046)
+++ trunk/OpenMPT/build/svn/do_libopenmpt_release.sh	Sat Jun 22 10:48:49 2024	(r21047)
@@ -15,7 +15,7 @@
 svn ci -m "[Mod] libopenmpt: Prepare for release."
 svn up
 NEWVER=$(make distversion-pure)
-NEWREV=$(svn info --xml . | xpath -e '/info/entry/commit/@revision' -q | sed 's/revision//g' | tr '"' ' ' | tr '=' ' ' | sed 's/ //g')
+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
 build/update_libopenmpt_version.sh bumpltrev

Modified: trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh
==============================================================================
--- trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh	Fri Jun 21 10:47:54 2024	(r21046)
+++ trunk/OpenMPT/build/svn/do_libopenmpt_release_rc.sh	Sat Jun 22 10:48:49 2024	(r21047)
@@ -5,9 +5,9 @@
 svn up
 
 NEWVER=$(make distversion-pure)
-NEWREV=$(svn info --xml . | xpath -e '/info/entry/commit/@revision' -q | sed 's/revision//g' | tr '"' ' ' | tr '=' ' ' | sed 's/ //g')
+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 '/info/entry/commit/@revision' -q | sed 's/revision//g' | tr '"' ' ' | tr '=' ' ' | sed 's/ //g')
+TAGREV=$(svn info --xml https://source.openmpt.org/svn/openmpt/tags/libopenmpt-${NEWVER} | xpath -e 'string(/info/entry/commit/@revision)' -q)
 
 echo "ALL DONE."
 echo "run './release-0.8.sh $NEWVER +r${TAGREV}' in a website checkout after buildbot has finished."