<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: 17d521128014853b24f983307fc28317f11e950b (commit)
from: e81e8096507dc39c8ba457f9641dc0a1c09900f7 (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Brian West
comments:
add make targets for mod_com_g729 mod_com_g729-activate mod_com_g729-install mod_com_g729-clean mod_com_g729-uninstall
<span style="color: #000080; font-weight: bold">diff --git a/.gitignore b/.gitignore</span>
<span style="color: #000080; font-weight: bold">index c53d07d..2480b83 100644</span>
<span style="color: #A00000">--- a/.gitignore</span>
<span style="color: #00A000">+++ b/.gitignore</span>
<span style="color: #800080; font-weight: bold">@@ -46,45 +46,47 @@ core.*</span>
!/w32/Console/FreeSwitchConsole.vcproj.user
!/w32/Setup/inno_setup/vcredist_x64.exe
!/w32/Setup/inno_setup/vcredist_x86.exe
<span style="color: #A00000">-/.version</span>
<span style="color: #A00000">-/AUTHORS</span>
<span style="color: #A00000">-/COPYING</span>
<span style="color: #A00000">-/ChangeLog</span>
<span style="color: #A00000">-/Makefile</span>
<span style="color: #A00000">-/Makefile.in</span>
<span style="color: #A00000">-/NEWS</span>
<span style="color: #A00000">-/README</span>
<span style="color: #A00000">-/TAGS</span>
<span style="color: #00A000">+.version</span>
<span style="color: #00A000">+AUTHORS</span>
<span style="color: #00A000">+COPYING</span>
<span style="color: #00A000">+ChangeLog</span>
<span style="color: #00A000">+Makefile</span>
<span style="color: #00A000">+Makefile.in</span>
<span style="color: #00A000">+NEWS</span>
<span style="color: #00A000">+README</span>
<span style="color: #00A000">+TAGS</span>
aclocal.m4
autom4te.cache
<span style="color: #A00000">-/build/Makefile</span>
<span style="color: #A00000">-/build/Makefile.in</span>
<span style="color: #A00000">-/build/config/compile</span>
<span style="color: #A00000">-/build/config/config.guess</span>
<span style="color: #A00000">-/build/config/depcomp</span>
<span style="color: #A00000">-/build/config/install-sh</span>
<span style="color: #A00000">-/build/config/ltmain.sh</span>
<span style="color: #A00000">-/build/config/missing</span>
<span style="color: #A00000">-/build/freeswitch.pc</span>
<span style="color: #A00000">-/build/getlib.sh</span>
<span style="color: #A00000">-/build/getsounds.sh</span>
<span style="color: #A00000">-/build/modmake.rules</span>
<span style="color: #00A000">+build/Makefile</span>
<span style="color: #00A000">+build/Makefile.in</span>
<span style="color: #00A000">+build/config/compile</span>
<span style="color: #00A000">+build/config/config.guess</span>
<span style="color: #00A000">+build/config/depcomp</span>
<span style="color: #00A000">+build/config/install-sh</span>
<span style="color: #00A000">+build/config/ltmain.sh</span>
<span style="color: #00A000">+build/config/missing</span>
<span style="color: #00A000">+build/freeswitch.pc</span>
<span style="color: #00A000">+build/getlib.sh</span>
<span style="color: #00A000">+build/getsounds.sh</span>
<span style="color: #00A000">+build/modmake.rules</span>
<span style="color: #00A000">+build/getg729.sh</span>
config.cache
config.log
config.status
<span style="color: #A00000">-/configure</span>
<span style="color: #00A000">+configure</span>
configure.lineno
<span style="color: #A00000">-/freeswitch</span>
<span style="color: #A00000">-/fs_cli</span>
<span style="color: #A00000">-/fs_encode</span>
<span style="color: #A00000">-/fs_ivrd</span>
<span style="color: #A00000">-/libtool</span>
<span style="color: #A00000">-/modules.conf</span>
<span style="color: #A00000">-/quiet_libtool</span>
<span style="color: #A00000">-/tone2wav</span>
<span style="color: #A00000">-/scripts/fsxs</span>
<span style="color: #A00000">-/scripts/gentls_cert</span>
<span style="color: #A00000">-/a.out.dSYM</span>
<span style="color: #00A000">+freeswitch</span>
<span style="color: #00A000">+fs_cli</span>
<span style="color: #00A000">+fs_encode</span>
<span style="color: #00A000">+fs_ivrd</span>
<span style="color: #00A000">+libtool</span>
<span style="color: #00A000">+noreg</span>
<span style="color: #00A000">+modules.conf</span>
<span style="color: #00A000">+quiet_libtool</span>
<span style="color: #00A000">+tone2wav</span>
<span style="color: #00A000">+scripts/fsxs</span>
<span style="color: #00A000">+scripts/gentls_cert</span>
<span style="color: #00A000">+a.out.dSYM</span>
src/mod/applications/mod_easyroute/Makefile
src/mod/applications/mod_lcr/Makefile
src/mod/applications/mod_nibblebill/Makefile
<span style="color: #800080; font-weight: bold">@@ -102,6 +104,7 @@ src/mod/say/mod_say_th/Makefile</span>
src/mod/say/mod_say_zh/Makefile
libs/curl/lib/ca-bundle.h
libs/g729/
<span style="color: #00A000">+libs/fsg729-*-installer</span>
src/mod/codecs/mod_com_g729/
src/mod/languages/mod_lua/mod_lua_wrap.cpp.orig
src/mod/languages/mod_perl/mod_perl_wrap.cpp.orig
<span style="color: #000080; font-weight: bold">diff --git a/build/getg729.sh.in b/build/getg729.sh.in</span>
new file mode 100755
<span style="color: #000080; font-weight: bold">index 0000000..c8a7227</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/build/getg729.sh.in</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,34 @@</span>
<span style="color: #00A000">+#!/bin/sh</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+TAR=@TAR@</span>
<span style="color: #00A000">+ZCAT=@ZCAT@</span>
<span style="color: #00A000">+WGET=@WGET@</span>
<span style="color: #00A000">+CURL=@CURL@</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+if [ -f "$WGET" ] ; then</span>
<span style="color: #00A000">+ DOWNLOAD_CMD=$WGET</span>
<span style="color: #00A000">+else</span>
<span style="color: #00A000">+ if [ -f "$CURL" ] ; then</span>
<span style="color: #00A000">+ DOWNLOAD_CMD="$CURL -O"</span>
<span style="color: #00A000">+ fi</span>
<span style="color: #00A000">+fi</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+base=http://files.freeswitch.org/g729/</span>
<span style="color: #00A000">+tarfile=$1</span>
<span style="color: #00A000">+url=`echo $tarfile | grep "://"`</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+if [ ! -z $url ] ; then</span>
<span style="color: #00A000">+ base=$tarfile/</span>
<span style="color: #00A000">+ tarfile=$2</span>
<span style="color: #00A000">+fi</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+if [ ! -f $tarfile ] ; then</span>
<span style="color: #00A000">+ $DOWNLOAD_CMD $base$tarfile</span>
<span style="color: #00A000">+ if [ ! -f $tarfile ] ; then</span>
<span style="color: #00A000">+ echo cannot find $tarfile</span>
<span style="color: #00A000">+ exit 1</span>
<span style="color: #00A000">+ fi</span>
<span style="color: #00A000">+fi</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+exit 0</span>
<span style="color: #00A000">+</span>
<span style="color: #000080; font-weight: bold">diff --git a/build/modules.conf.in b/build/modules.conf.in</span>
<span style="color: #000080; font-weight: bold">index 8d3dfaa..63a0ab4 100644</span>
<span style="color: #A00000">--- a/build/modules.conf.in</span>
<span style="color: #00A000">+++ b/build/modules.conf.in</span>
<span style="color: #800080; font-weight: bold">@@ -42,6 +42,7 @@ codecs/mod_amr</span>
#codecs/mod_silk
#codecs/mod_codec2
codecs/mod_g729
<span style="color: #00A000">+#codecs/mod_com_g729</span>
codecs/mod_h26x
codecs/mod_bv
codecs/mod_ilbc
<span style="color: #000080; font-weight: bold">diff --git a/configure.in b/configure.in</span>
<span style="color: #000080; font-weight: bold">index d91cf11..a0c9418 100644</span>
<span style="color: #A00000">--- a/configure.in</span>
<span style="color: #00A000">+++ b/configure.in</span>
<span style="color: #800080; font-weight: bold">@@ -730,6 +730,8 @@ AC_PATH_PROGS(WGET, wget)</span>
AC_PATH_PROGS(CURL, curl)
GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_builddir/build/getlib.sh"
AC_SUBST(GETLIB)
<span style="color: #00A000">+GETG729="cd $switch_srcdir/libs && ${SHELL} $switch_builddir/build/getg729.sh"</span>
<span style="color: #00A000">+AC_SUBST(GETG729)</span>
GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
AC_SUBST(GETSOUNDS)
<span style="color: #800080; font-weight: bold">@@ -916,6 +918,7 @@ AC_CONFIG_FILES([Makefile</span>
src/mod/applications/mod_osp/Makefile
src/mod/applications/mod_stress/Makefile
src/mod/applications/mod_hash/Makefile
<span style="color: #00A000">+ src/mod/codecs/mod_com_g729/Makefile</span>
src/mod/endpoints/mod_portaudio/Makefile
src/mod/endpoints/mod_skinny/Makefile
src/mod/endpoints/mod_skypopen/Makefile
<span style="color: #800080; font-weight: bold">@@ -930,6 +933,7 @@ AC_CONFIG_FILES([Makefile</span>
src/include/switch_am_config.h
build/getsounds.sh
build/getlib.sh
<span style="color: #00A000">+ build/getg729.sh</span>
build/freeswitch.pc
build/modmake.rules
libs/xmlrpc-c/include/xmlrpc-c/config.h
<span style="color: #800080; font-weight: bold">@@ -1023,6 +1027,7 @@ AC_OUTPUT</span>
##
## Registering for ClueCon
##
<span style="color: #00A000">+if ! test -f noreg ; then</span>
echo ""
echo ""
echo $ECHO_N "Registering you for ClueCon http://www.cluecon.com $ECHO_C" 1>&6
<span style="color: #800080; font-weight: bold">@@ -1040,6 +1045,7 @@ sleep 1</span>
AC_MSG_RESULT([ See you in August. ;-)])
sleep 2
echo ""
<span style="color: #00A000">+fi</span>
##
## Configuration summary
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am</span>
<span style="color: #000080; font-weight: bold">index e655cf7..5af782d 100644</span>
<span style="color: #A00000">--- a/src/mod/Makefile.am</span>
<span style="color: #00A000">+++ b/src/mod/Makefile.am</span>
<span style="color: #800080; font-weight: bold">@@ -21,7 +21,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL</span>
fi ; \
fi ; \
if test -z "$$target" ; then target="all" ; fi ; \
<span style="color: #A00000">- if ! test -f $$moddir/$$modname.c && ! test -f $$moddir/$$modname.cpp ; \</span>
<span style="color: #00A000">+ if ! test -f $$moddir/$$modname.c && ! test -f $$moddir/$$modname.cpp && test $$modname != "mod_com_g729" ; \</span>
then echo ; echo "WARNING $$modname is not a valid FreeSWITCH module dir, skipping it..." ; else \
echo ;\
echo making $$target $$modname ;\
<span style="color: #800080; font-weight: bold">@@ -35,6 +35,9 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL</span>
fi; \
test -z "$$fail" ;
<span style="color: #00A000">+mod_com_g729-activate:</span>
<span style="color: #00A000">+ cd $(switch_builddir)/src/mod/codecs/mod_com_g729 && $(MAKE) $(AM_MAKEFLAGS) activate</span>
<span style="color: #00A000">+</span>
.DEFAULT:
@if test -z "`echo $@ | grep all`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/codecs/mod_com_g729/Makefile.am b/src/mod/codecs/mod_com_g729/Makefile.am</span>
new file mode 100644
<span style="color: #000080; font-weight: bold">index 0000000..7b63138</span>
<span style="color: #A00000">--- /dev/null</span>
<span style="color: #00A000">+++ b/src/mod/codecs/mod_com_g729/Makefile.am</span>
<span style="color: #800080; font-weight: bold">@@ -0,0 +1,39 @@</span>
<span style="color: #00A000">+include $(top_srcdir)/build/modmake.rulesam</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+MODNAME=mod_com_g729</span>
<span style="color: #00A000">+VERSION=193</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+if ISLINUX</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+G729INSTALLER = $(top_srcdir)/libs/fsg729-$(VERSION)-installer</span>
<span style="color: #00A000">+LICSERVER=/usr/sbin/freeswitch_licence_server</span>
<span style="color: #00A000">+VALIDATOR=$(bindir)/validator</span>
<span style="color: #00A000">+MOD=$(moddir)/mod_com_g729.so</span>
<span style="color: #00A000">+BUILT_SOURCES = $(G729INSTALLER)</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+install: $(LICSERVER) $(VALIDATOR) $(MOD)</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+$(LICSERVER) $(VALIDATOR) $(MOD): $(G729INSTALLER)</span>
<span style="color: #00A000">+ $(SHELL) $(G729INSTALLER) $(bindir) $(moddir) nobanner</span>
<span style="color: #00A000">+ $(ECHO)</span>
<span style="color: #00A000">+ $(ECHO)</span>
<span style="color: #00A000">+ $(ECHO) Now you can activate your license by running $(MAKE) mod_com_g729-activate</span>
<span style="color: #00A000">+ $(ECHO)</span>
<span style="color: #00A000">+ $(ECHO)</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+$(G729INSTALLER):</span>
<span style="color: #00A000">+ rm -f $(top_srcdir)/libs/fsg729-*-installer*</span>
<span style="color: #00A000">+ $(GETG729) fsg729-$(VERSION)-installer</span>
<span style="color: #00A000">+ chmod 755 $(G729INSTALLER)</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+clean:</span>
<span style="color: #00A000">+ rm -f $(top_srcdir)/libs/fsg729-*-installer*</span>
<span style="color: #00A000">+ rm -rf /tmp/fsg729</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+activate: $(LICSERVER) $(VALIDATOR) $(MOD)</span>
<span style="color: #00A000">+ $(VALIDATOR)</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+uninstall: clean</span>
<span style="color: #00A000">+ rm -f $(LICSERVER) $(VALIDATOR) $(MOD)</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+endif</span>
</pre></div>
========================================================================<pre>
Summary of changes:
.gitignore | 69 ++++++++++++++++---------------
build/getg729.sh.in | 34 +++++++++++++++
build/modules.conf.in | 1 +
configure.in | 6 +++
src/mod/Makefile.am | 5 ++-
src/mod/codecs/mod_com_g729/Makefile.am | 39 +++++++++++++++++
6 files changed, 120 insertions(+), 34 deletions(-)
create mode 100755 build/getg729.sh.in
create mode 100644 src/mod/codecs/mod_com_g729/Makefile.am
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>