X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=tools%2Frelease.sh;h=f1ed4a73ada15cfeccfb53e518faf66b273f5d50;hb=4aacf01e194d09fb55dc759fc42ac42c8432c015;hp=de0946b78b33f7e1391c6e78bb4fe1db5d274d1e;hpb=eccd9059d31ab67308dbd17c262fd9e5cdca4754;p=openocd.git

diff --git a/tools/release.sh b/tools/release.sh
index de0946b78b..f1ed4a73ad 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -97,7 +97,7 @@ package_info_load() {
 
 	PACKAGE_VERSION="$(package_info_load_version)"
 	[ "${RELEASE_VERSION}" ] || \
-		RELEASE_VERSION=${PACKAGE_VERSION/-in-development/}
+		RELEASE_VERSION=${PACKAGE_VERSION/-dev/}
 
 	[ "${PACKAGE_NAME}" -a "${PACKAGE_VERSION}" ] || \
 		die "package information is missing from configure script"
@@ -282,9 +282,10 @@ do_version_usage() {
 usage: $0 version <command>
 Version Commands:
   tag {add|remove} <label>     Add or remove the specified tag.
-  bump {major|minor|micro|rc}  Bump the specified version number;
-                               resets less-significant numbers to zero.
-			       All but 'rc' releases drop that tag.
+  bump {major|minor|micro}     Bump the specified version number, and
+                               reset less-significant numbers to zero.
+  bump tag <label>             Add or bump a versioned tag (e.g. -rcN).
+  bump final <label>           Remove a versioned tag (e.g. -rcN).
 USAGE
 }
 
@@ -319,7 +320,7 @@ do_version_bump_tag() {
 	[ "${TAG}" ] || die "TAG argument is missing"
 	local TAGS="${PACKAGE_VERSION_TAGS}"
 	if has_version_tag "${TAG}"; then
-		local RC=$(echo ${TAGS} | perl -ne "/-${TAG}"'(\d+)/ && print $1')
+		local RC=$(do_version_tag_value "${TAG}")
 		RC=$((${RC} + 1))
 		TAGS=$(echo ${TAGS} | perl -npe "s/-${TAG}[\\d]*/-${TAG}${RC}/")
 	else
@@ -328,12 +329,17 @@ do_version_bump_tag() {
 	PACKAGE_VERSION_TAGS="${TAGS}"
 	do_version_bump_sed "${PACKAGE_VERSION_BASE}"
 }
-do_version_bump_rc() { do_version_bump_tag 'rc'; }
+do_version_bump_final() {
+	local TAG="$1"
+	[ "${TAG}" ] || die "TAG argument is missing"
+	has_version_tag "${TAG}" || die "-${TAG} tag is missing"
+	do_version_tag_remove "${TAG}$(do_version_tag_value "${TAG}")"
+}
 do_version_bump() {
 	CMD="$1"
 	shift
 	case "${CMD}" in
-	major|minor|micro|rc|tag)
+	major|minor|micro|final|tag)
 		eval "do_version_bump_${CMD}" "$@"
 		;;
 	*)
@@ -345,7 +351,10 @@ do_version_bump() {
 has_version_tag() {
 	test "${PACKAGE_VERSION/-${1}/}" != "${PACKAGE_VERSION}"
 }
-
+do_version_tag_value() {
+	local TAG="$1"
+	echo ${PACKAGE_VERSION_TAGS} | perl -ne "/-${TAG}"'(\d+)/ && print $1'
+}
 do_version_tag_add() {
 	local TAG="$1"
 	has_version_tag "${TAG}" && \
@@ -418,7 +427,7 @@ do_commit() {
 	package_info_load
 	svn_setup_load
 
-	[ "${PACKAGE_VERSION/in-development/}" = "${PACKAGE_VERSION}" ] || \
+	[ "${PACKAGE_VERSION/dev/}" = "${PACKAGE_VERSION}" ] || \
 		die "'${PACKAGE_NAME}-${PACKAGE_VERSION}' cannot be released"
 
 	[ "${PACKAGE_VERSION%.0}" = "${PACKAGE_VERSION}" ] || \
@@ -428,7 +437,7 @@ do_commit() {
 
 
 do_release_step_prep() {
-	do_version tag remove in-development
+	do_version tag remove dev
 	# reset RELEASE_VERSION now to allow release version to be detected
 	export RELEASE_VERSION=
 }
@@ -438,7 +447,7 @@ do_release_step_branch_bump() {
 	local TYPE="$1"
 	echo "Bump ${TYPE} version and add tag:"
 	do_version_bump ${TYPE}
-	do_version_tag_add in-development
+	do_version_tag_add dev
 }
 do_release_step_branch() {
 	do_svn_switch "${PACKAGE_BRANCH}"