Follow rename to configure.ac in scripts/
This commit is contained in:
parent
83125dada5
commit
cb58568080
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 <<EOF
|
||||
Committing the new version failed for some reason. Definitely look
|
||||
|
|
Loading…
Reference in New Issue