svn commit: r1920089 - in /apr/site/trunk/release: r2-prep-vote.sh r3-push-release-tars.sh

[co...@apache.org]

Author: covener
Date: Wed Aug 21 00:20:13 2024
New Revision: 1920089

URL: http://svn.apache.org/viewvc?rev=1920089&view=rev
Log:
stage changes in dev, move during release

Modified:
    apr/site/trunk/release/r2-prep-vote.sh
    apr/site/trunk/release/r3-push-release-tars.sh

Modified: apr/site/trunk/release/r2-prep-vote.sh
URL: http://svn.apache.org/viewvc/apr/site/trunk/release/r2-prep-vote.sh?rev=1920089&r1=1920088&r2=1920089&view=diff
==============================================================================
--- apr/site/trunk/release/r2-prep-vote.sh (original)
+++ apr/site/trunk/release/r2-prep-vote.sh Wed Aug 21 00:20:13 2024
@@ -44,8 +44,10 @@ SVN_DEST="tags/${FULL_VERSION}-candidate
 if [ -f include/apr_version.h ]; then
     is_apr=1
     ANNOUNCEFILE=Announcement1.x
+    CHANGES=CHANGES-APR
 else
     ANNOUNCEFILE=Announcement-aprutil-1.x
+    CHANGES=CHANGES-APR-UTIL
     is_apr=0
 fi
 
@@ -84,6 +86,10 @@ cp "${TAR_PATH}"*.tar.* "${AO_DIST_DEV_P
 cp "${TAR_PATH}"*.zip* "${AO_DIST_DEV_PATH}"/
 svn add "${AO_DIST_DEV_PATH}"/${TAR_BASENAME}*.tar.* "${AO_DIST_DEV_PATH}"/${TAR_BASENAME}*.zip.* >/dev/null
 
+cp "${DIST_DIR}/${TAR_BASENAME}"/CHANGES "${AO_DIST_DEV_PATH}"/${CHANGES}-${v_major}-${v_minor}
+# maybe already added
+svn add "${AO_DIST_DEV_PATH}"/${CHANGES}-${v_major}-${v_minor} >/dev/null 2>/dev/null || true
+
 echo "updating Announcement${v_major}.${v_minor}.*"
 #Prep announcement files with latest version
 perl -pi -e "s/$v_major\.$v_minor\.\d+ (Released|of the)/$VERSION \1/g" \

Modified: apr/site/trunk/release/r3-push-release-tars.sh
URL: http://svn.apache.org/viewvc/apr/site/trunk/release/r3-push-release-tars.sh?rev=1920089&r1=1920088&r2=1920089&view=diff
==============================================================================
--- apr/site/trunk/release/r3-push-release-tars.sh (original)
+++ apr/site/trunk/release/r3-push-release-tars.sh Wed Aug 21 00:20:13 2024
@@ -107,8 +107,7 @@ if test "${VERSION}" != "${FULL_VERSION}
   done
 fi
 
-# We did not stage a CHANGES file, grab from ${EXP_PATH}/CHANGES. Should have been done in r0!
-cp "${DIST_DIR}/${PROJECT}-${FULL_VERSION}-candidate/CHANGES" "${AO_DIST_RELEASE_PATH}/${CHANGES}-${v_major}.${v_minor}"
+svn mv "${AO_DIST_DEV_PATH}/${PROJECT}-${FULL_VERSION}-candidate/{CHANGES}-${v_major}.${v_minor} "${AO_DIST_RELEASE_PATH}"/
 
 echo ""
 echo "changes ready for commit in: ${AO_DIST_PATH}"