From: <sv...@op...> - 2025-05-26 09:12:13
|
Author: manx Date: Mon May 26 11:12:01 2025 New Revision: 23202 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23202 Log: Merged revision(s) 23201 from trunk/OpenMPT: [Fix] build: Fix version gathering in libopenmpt release script. ........ Modified: branches/OpenMPT-1.32/ (props changed) branches/OpenMPT-1.32/build/svn/do_libopenmpt_release.sh branches/OpenMPT-1.32/build/svn/do_libopenmpt_release_rc.sh Modified: branches/OpenMPT-1.32/build/svn/do_libopenmpt_release.sh ============================================================================== --- branches/OpenMPT-1.32/build/svn/do_libopenmpt_release.sh Mon May 26 11:11:39 2025 (r23201) +++ branches/OpenMPT-1.32/build/svn/do_libopenmpt_release.sh Mon May 26 11:12:01 2025 (r23202) @@ -15,7 +15,7 @@ svn ci -m "[Mod] libopenmpt: Prepare for release." svn up make QUIET=1 distversion-pure -NEWVER=$(cat distversion-pure) +NEWVER=$(cat bin/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: branches/OpenMPT-1.32/build/svn/do_libopenmpt_release_rc.sh ============================================================================== --- branches/OpenMPT-1.32/build/svn/do_libopenmpt_release_rc.sh Mon May 26 11:11:39 2025 (r23201) +++ branches/OpenMPT-1.32/build/svn/do_libopenmpt_release_rc.sh Mon May 26 11:12:01 2025 (r23202) @@ -5,7 +5,7 @@ svn up make QUIET=1 distversion-pure -NEWVER=$(cat distversion-pure) +NEWVER=$(cat bin/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) |