aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2012-03-20 21:19:16 +0000
committerSpencer Oliver <spen@spen-soft.co.uk>2012-03-30 15:55:01 +0000
commit222afb3d0e34c5717c816c9169d8e67bd2121069 (patch)
tree37bac5348e9a1dba036c0e7e20e9f3ddd064da36 /tools
parentc68a267ee120bd027eacc0484a7a7b6e7c3f7054 (diff)
tools: update release scripts to use configure.ac
we have already updated autoconf to use configure.ac instead of configure.in, so update release.sh to use the new name. Change-Id: I2dc2beaf2f85058c4627183bc093052677ccba1b Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/537 Tested-by: jenkins
Diffstat (limited to 'tools')
-rwxr-xr-xtools/release.sh6
-rw-r--r--tools/release/helpers.sh8
-rwxr-xr-xtools/release/version.sh4
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/release.sh b/tools/release.sh
index 12dfdb6a..abd721a1 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -125,8 +125,8 @@ do_clean_all() {
do_version_commit() {
[ "$*" ] || die "usage: $0 commit <message>"
- git add configure.in || die "error: no version changes to commit"
- git commit -q -m "$*" configure.in
+ git add configure.ac || die "error: no version changes to commit"
+ git commit -q -m "$*" configure.ac
}
do_version_finalize() {
@@ -281,7 +281,7 @@ do_reset() {
maybe_bootstrap
maybe_configure
do_clean_all
- git checkout configure.in
+ git checkout configure.ac
}
LONGOPTS="fast,final,start-rc,next-tag:,next:,help"
diff --git a/tools/release/helpers.sh b/tools/release/helpers.sh
index 2dd5bae1..47d5782a 100644
--- a/tools/release/helpers.sh
+++ b/tools/release/helpers.sh
@@ -6,15 +6,15 @@ die() {
}
package_info_load_name() {
- grep AC_INIT configure.in | perl -ne 's/^.+\(\[([-\w]*)\],.+$/$1/ and print'
+ grep AC_INIT configure.ac | perl -ne 's/^.+\(\[([-\w]*)\],.+$/$1/ and print'
}
package_info_load_version() {
- grep AC_INIT configure.in | perl -ne 's/^.+\[([-\w\.]*)\],$/$1/ and print'
+ grep AC_INIT configure.ac | perl -ne 's/^.+\[([-\w\.]*)\],$/$1/ and print'
}
package_info_load() {
- [ -f "configure.in" ] || \
- die "package_info_load: configure.in is missing"
+ [ -f "configure.ac" ] || \
+ die "package_info_load: configure.ac is missing"
PACKAGE_NAME="$(package_info_load_name)"
# todo: fix this
diff --git a/tools/release/version.sh b/tools/release/version.sh
index 8c6da273..d6c9434b 100755
--- a/tools/release/version.sh
+++ b/tools/release/version.sh
@@ -8,7 +8,7 @@
# 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.in" version tag.
+# 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
@@ -34,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}"
}