Skip to content

Commit cb58568

Browse files
committed
Follow rename to configure.ac in scripts/
1 parent 83125da commit cb58568

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

scripts/ci/common.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@ set_fs_ver () {
103103
-e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
104104
-e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
105105
-e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$ver\2|" \
106-
configure.in > configure.in.$$
107-
mv configure.in.$$ configure.in
106+
configure.ac > configure.ac.$$
107+
mv configure.ac.$$ configure.ac
108108
if [ -n "$rev" ]; then
109109
[ -n "$hrev" ] || hrev="$rev"
110110
sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
111111
-e "s|\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, \[\).*\(\])\)|\1'$hrev'\2|" \
112112
-e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
113113
-e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \
114-
configure.in > configure.in.$$
115-
mv configure.in.$$ configure.in
114+
configure.ac > configure.ac.$$
115+
mv configure.ac.$$ configure.ac
116116
fi
117117
}
118118

scripts/dailys.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
4040
-e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
4141
-e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
4242
-e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \
43-
-i configure.in
43+
-i configure.ac
4444

4545
if [ -n "$rev" ]; then
4646
sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
4747
-e "s|\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, \[\).*\(\])\)|\1$rev\2|" \
4848
-e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
4949
-e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \
50-
-i configure.in
50+
-i configure.ac
5151
fi
5252

53-
#git add configure.in
53+
#git add configure.ac
5454
#git commit -m "Release freeswitch-$ver"
5555
#git tag -a -m "freeswitch-$ver release" v$ver
5656

scripts/tagscript.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@ echo "Setting next-release version ($next_ver)..." >&2
130130
echo "${next_ver}" > build/next-release.txt
131131
git add build/next-release.txt
132132

133-
echo "Changing the version of configure.in..." >&2
133+
echo "Changing the version of configure.ac..." >&2
134134
set_fs_ver "$gver" "$gmajor" "$gminor" "$gmicro" "$grev"
135135

136136
echo "Committing the new version..." >&2
137-
git add configure.in
137+
git add configure.ac
138138
if ! (git commit --allow-empty -m "release FreeSWITCH $gver"); then
139139
cat >&2 <<EOF
140140
Committing the new version failed for some reason. Definitely look

0 commit comments

Comments
 (0)