From cb58568080f7e38f722615e37ecd8fb729d7d850 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Wed, 19 Mar 2014 19:11:31 +0000 Subject: [PATCH] Follow rename to configure.ac in scripts/ --- scripts/ci/common.sh | 8 ++++---- scripts/dailys.sh | 6 +++--- scripts/tagscript.sh | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh index adb8d56d80..d317541ca2 100755 --- a/scripts/ci/common.sh +++ b/scripts/ci/common.sh @@ -103,16 +103,16 @@ set_fs_ver () { -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \ -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \ -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$ver\2|" \ - configure.in > configure.in.$$ - mv configure.in.$$ configure.in + configure.ac > configure.ac.$$ + mv configure.ac.$$ configure.ac if [ -n "$rev" ]; then [ -n "$hrev" ] || hrev="$rev" sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \ -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, \[\).*\(\])\)|\1'$hrev'\2|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \ - configure.in > configure.in.$$ - mv configure.in.$$ configure.in + configure.ac > configure.ac.$$ + mv configure.ac.$$ configure.ac fi } diff --git a/scripts/dailys.sh b/scripts/dailys.sh index 430de62d22..770f9c2aa5 100755 --- a/scripts/dailys.sh +++ b/scripts/dailys.sh @@ -40,17 +40,17 @@ sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \ -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \ -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \ -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \ - -i configure.in + -i configure.ac if [ -n "$rev" ]; then sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \ -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, \[\).*\(\])\)|\1$rev\2|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \ - -i configure.in + -i configure.ac fi -#git add configure.in +#git add configure.ac #git commit -m "Release freeswitch-$ver" #git tag -a -m "freeswitch-$ver release" v$ver diff --git a/scripts/tagscript.sh b/scripts/tagscript.sh index 78253a10c5..a5a50ded40 100755 --- a/scripts/tagscript.sh +++ b/scripts/tagscript.sh @@ -130,11 +130,11 @@ echo "Setting next-release version ($next_ver)..." >&2 echo "${next_ver}" > build/next-release.txt git add build/next-release.txt -echo "Changing the version of configure.in..." >&2 +echo "Changing the version of configure.ac..." >&2 set_fs_ver "$gver" "$gmajor" "$gminor" "$gmicro" "$grev" echo "Committing the new version..." >&2 -git add configure.in +git add configure.ac if ! (git commit --allow-empty -m "release FreeSWITCH $gver"); then cat >&2 <