This is an automated email from Gerrit.
Spencer Oliver (s...@spen-soft.co.uk) just uploaded a new patch set to Gerrit,
which you can find at http://openocd.zylin.com/537
-- gerrit
commit 0acf504dcda0491700368d27f7c3a0082016f2ff
Author: Spencer Oliver <s...@spen-soft.co.uk>
Date: Tue Mar 20 21:19:16 2012 +0000
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 <s...@spen-soft.co.uk>
diff --git a/tools/release.sh b/tools/release.sh
index 12dfdb6..abd721a 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 2dd5bae..47d5782 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 8c6da27..d6c9434 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}"
}
--
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
OpenOCD-devel mailing list
OpenOCD-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openocd-devel
