X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=tools%2Frelease%2Fversion.sh;h=d6c9434b3f2b0557b6264b083f08704f25b228d4;hb=ebece4a9817e91c92884998b33aa921c3f277193;hp=bef79d0e29eb94abf4aa88628e0fd7c9df337da9;hpb=07c85e41a47b418d7c6647041542764861105231;p=fw%2Fopenocd

diff --git a/tools/release/version.sh b/tools/release/version.sh
index bef79d0e2..d6c9434b3 100755
--- a/tools/release/version.sh
+++ b/tools/release/version.sh
@@ -1,9 +1,20 @@
-#!/bin/sh -e
+#!/bin/bash
 # version.sh: openocd version process automation
 # Copyright (C) 2009 by Zachary T Welch <zw@superlucidity.net>
 # Release under the GNU GPL v2 (or later versions).
 
-source "tools/release/helpers.sh"
+# FIXME Remove more bash-isms.  Fix errors making "ash -e" lose.
+
+# NOTE Use with care!  "RC" should only follow x.x.x, with
+# vendor tags after that.  Be traditional; avoid "rc0".
+
+# NOTE:  This *ONLY* updates the "configure.ac" version tag.
+# It does not affect GIT tags.  Use this script immediately
+# before making a release, to remove the "-dev" tag and to
+# update the version label.  Then commit the change and tag
+# that commit to match the version label.
+
+. "tools/release/helpers.sh"
 
 do_version_usage() {
 	cat << USAGE
@@ -15,6 +26,7 @@ Version Commands:
   bump tag <label>             Add or bump a versioned tag (e.g. -rcN).
   bump final <label>           Remove a versioned tag (e.g. -rcN).
 USAGE
+# REVISIT ... "commit" not listed.
 }
 
 do_version_sed() {
@@ -22,7 +34,7 @@ do_version_sed() {
 	local NEW_VERSION="$1"
 	local MSG="$2"
 
-	sed -i -e "/AC_INIT/ s|${OLD_VERSION}|${NEW_VERSION}|" configure.in
+	sed -i -e "/AC_INIT/ s|${OLD_VERSION}|${NEW_VERSION}|" configure.ac
 	package_info_load
 	echo "${MSG}: ${OLD_VERSION} -> ${NEW_VERSION}"
 }