From acaff9290d1b4f3b29a1ccc85852e4f0978332ad Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Nov 2008 17:35:06 +0000
Subject: Add a --changelog-rev option that truncates the ChangeLog at a
 specific revision. Also, add -i to the svn2cl options so that the actual svn
 revision numbers are included in the log. (trunk r11889)

Use svn2cl --reparagraph option for better ChangeLog formatting. (trunk r11906)

svn path=/main/trunk/; revision=11907
---
 mkrelease.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'mkrelease.sh')

diff --git a/mkrelease.sh b/mkrelease.sh
index cb1ffc557..b0be479a5 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -5,6 +5,10 @@ SOURCE_DIR=${RELEASE_BUILDDIR}/checkout
 BRANCH=${BRANCH:-trunk}
 REPOSITORY=svn+ssh://cvs.gentoo.org/var/svnroot/portage/main
 SVN_LOCATION=${REPOSITORY}/${BRANCH}
+CHANGELOG_REVISION=""
+CREATE_TAG=
+CHANGELOG_REVISION=
+UPLOAD_LOCATION=
 
 die() {
 	echo $@
@@ -12,7 +16,8 @@ die() {
 	exit 1
 }
 
-ARGS=$(getopt -o tu: --long anon,tag,upload: -n $(basename $0) -- "$@")
+ARGS=$(getopt -o tu: --long anon,changelog-rev:,tag,upload: \
+	-n ${0##*/} -- "$@")
 [ $? != 0 ] && die "initialization error"
 
 eval set -- "${ARGS}"
@@ -24,6 +29,10 @@ while true; do
 			SVN_LOCATION=${REPOSITORY}/${BRANCH}
 			shift
 			;;
+		--changelog-rev)
+			CHANGELOG_REVISION=$2
+			shift 2
+			;;
 		-t|--tag)
 			CREATE_TAG=true
 			shift
@@ -58,7 +67,10 @@ echo ">>> Starting Subversion export"
 svn export "${SVN_LOCATION}" "${SOURCE_DIR}" > /dev/null || die "svn export failed"
 
 echo ">>> Creating Changelog"
-svn2cl -o "${SOURCE_DIR}/ChangeLog" "${SVN_LOCATION}" || die "ChangeLog creation failed"
+svn2cl_opts="-i --reparagraph"
+[ -n $CHANGELOG_REVISION ] && svn2cl_opts+=" -r HEAD:$CHANGELOG_REVISION"
+svn2cl $svn2cl_opts -o "${SOURCE_DIR}/ChangeLog" "${SVN_LOCATION}" \
+	|| die "ChangeLog creation failed"
 
 echo ">>> Building release tree"
 cp -a "${SOURCE_DIR}/"{bin,cnf,doc,man,pym,src} "${RELEASE_DIR}/" || die "directory copy failed"
-- 
cgit v1.2.3-1-g7c22