summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-11-14 17:35:06 +0000
committerZac Medico <zmedico@gentoo.org>2008-11-14 17:35:06 +0000
commitacaff9290d1b4f3b29a1ccc85852e4f0978332ad (patch)
tree358d1ff25c66d45ffcd0cac7f15a5e4c9eafd005
parentf9e226bb8b93c03ee1b84ba29b91b4e35a2ac744 (diff)
downloadportage-acaff9290d1b4f3b29a1ccc85852e4f0978332ad.tar.gz
portage-acaff9290d1b4f3b29a1ccc85852e4f0978332ad.tar.bz2
portage-acaff9290d1b4f3b29a1ccc85852e4f0978332ad.zip
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
-rwxr-xr-xmkrelease.sh16
1 files changed, 14 insertions, 2 deletions
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"