From 019c4471adc370cb8095e358c568a0e16f96080d Mon Sep 17 00:00:00 2001 From: Mathieu Rene Date: Thu, 1 Apr 2010 15:49:32 -0400 Subject: [PATCH 01/15] add switch_channel_export_variable --- src/include/switch_channel.h | 5 +++++ src/switch_channel.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h index 1f7f733aef..5529d9af66 100644 --- a/src/include/switch_channel.h +++ b/src/include/switch_channel.h @@ -245,6 +245,11 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_ #define switch_channel_set_variable(_channel, _var, _val) switch_channel_set_variable_var_check(_channel, _var, _val, SWITCH_TRUE) #define switch_channel_set_variable_partner(_channel, _var, _val) switch_channel_set_variable_partner_var_check(_channel, _var, _val, SWITCH_TRUE) + +SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal); + +#define switch_channel_export_variable(_channel, _varname, _value, _nolocal) switch_channel_export_variable_var_check(_channel, _varname, _value, SWITCH_TRUE, _nolocal) + /*! \brief Retrieve a variable from a given channel \param channel channel to retrieve variable from diff --git a/src/switch_channel.c b/src/switch_channel.c index fe661d4d66..ba9429721a 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -737,6 +737,37 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_profile_var(switch_channel_t return status; } +SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal) +{ + const char *exports, *exports_varname = varname; + switch_status_t status; + + exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE); + + if (nolocal) { + exports_varname = switch_mprintf("nolocal:%s", varname); + } + + if ((status = switch_channel_set_variable_var_check(channel, exports_varname, value, var_check)) != SWITCH_STATUS_SUCCESS) { + goto done; + } + + if (varname && value) { + if (exports) { + switch_channel_set_variable_printf(channel, SWITCH_EXPORT_VARS_VARIABLE, "%s,%s", exports, exports_varname); + } else { + switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, exports_varname); + } + } + +done: + if (exports_varname != varname) { + free((char*)exports_varname); + } + + return status; +} + SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check) { From a647f768d579b5e1d14f4bae1c52830cea82dd7a Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Thu, 1 Apr 2010 21:23:56 +0000 Subject: [PATCH 02/15] Improved the post-tagging push instructions on the release tagging script. --- scripts/tagscript.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tagscript.sh b/scripts/tagscript.sh index 9ba4826dbc..8a4a4e821b 100755 --- a/scripts/tagscript.sh +++ b/scripts/tagscript.sh @@ -69,8 +69,8 @@ rm -rf $dst_dir cat 1>&2 < Date: Thu, 1 Apr 2010 21:33:11 +0000 Subject: [PATCH 03/15] Leave SWITCH_VERSION_REVISION alone in the tagging script unless it is explicitly specified. --- scripts/tagscript.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tagscript.sh b/scripts/tagscript.sh index 8a4a4e821b..48a377ffd7 100755 --- a/scripts/tagscript.sh +++ b/scripts/tagscript.sh @@ -35,11 +35,11 @@ fi 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_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \ -i configure.in if [ -n "$rev" ]; then - sed -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \ + sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \ + -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \ -i configure.in fi From b0692630b1b538baa1f9774eacd17efe83bc05ce Mon Sep 17 00:00:00 2001 From: Raymond Chandler Date: Fri, 2 Apr 2010 00:19:02 +0000 Subject: [PATCH 04/15] fix mod_enum build when udns is already on the base system --- src/mod/applications/mod_enum/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mod/applications/mod_enum/Makefile.am b/src/mod/applications/mod_enum/Makefile.am index 65199901d0..c512f7691d 100644 --- a/src/mod/applications/mod_enum/Makefile.am +++ b/src/mod/applications/mod_enum/Makefile.am @@ -2,13 +2,12 @@ include $(top_srcdir)/build/modmake.rulesam MODNAME=mod_enum UDNS_DIR=$(switch_srcdir)/libs/udns -AM_CFLAGS += -I$(UDNS_DIR) -DHAVE_POLL +mod_enum_la_CFLAGS = -I$(UDNS_DIR) -DHAVE_POLL $(AM_CFLAGS) mod_LTLIBRARIES = mod_enum.la mod_enum_la_SOURCES = mod_enum.c mod_enum_la_SOURCES += $(UDNS_DIR)/udns_dn.c $(UDNS_DIR)/udns_dntosp.c $(UDNS_DIR)/udns_parse.c $(UDNS_DIR)/udns_misc.c mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_a.c $(UDNS_DIR)/udns_rr_ptr.c $(UDNS_DIR)/udns_rr_mx.c $(UDNS_DIR)/udns_rr_txt.c $(UDNS_DIR)/udns_bl.c mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_srv.c $(UDNS_DIR)/udns_rr_naptr.c $(UDNS_DIR)/udns_codes.c $(UDNS_DIR)/udns_resolver.c -mod_enum_la_CFLAGS = $(AM_CFLAGS) mod_enum_la_LIBADD = $(switch_builddir)/libfreeswitch.la mod_enum_la_LDFLAGS = -avoid-version -module -no-undefined -shared From c9eacf2ba0c0060c0364422d7b245ddc2401ca0e Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 1 Apr 2010 20:23:26 -0400 Subject: [PATCH 05/15] .gitignore --- .gitignore | 2 ++ libs/.gitignore | 59 ++++++++++++++++++++++++++++++++++++++++++++++ src/mod/.gitignore | 7 ++++++ 3 files changed, 68 insertions(+) diff --git a/.gitignore b/.gitignore index f113a797d2..d0e1708230 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ Makefile.in NEWS README aclocal.m4 +autom4te.cache build/Makefile build/Makefile.in build/config/compile @@ -33,6 +34,7 @@ config.cache config.log config.status configure +configure.lineno freeswitch fs_cli fs_ivrd diff --git a/libs/.gitignore b/libs/.gitignore index 5cce65bcdb..699cf81e76 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -189,6 +189,9 @@ ilbc/src/ilbc.h ilbc/src/stamp-h1 ilbc/tests/Makefile ilbc/tests/Makefile.in +js/nsprpub/lib/ds/libplds4.so.1 +js/nsprpub/lib/libc/src/libplc4.so.1 +js/nsprpub/pr/src/libnspr4.so.1 js/Makefile js/aclocal.m4 js/config.guess @@ -990,3 +993,59 @@ unimrcp/build/acmacros/ltoptions.m4 unimrcp/build/acmacros/ltsugar.m4 unimrcp/build/acmacros/ltversion.m4 unimrcp/build/acmacros/lt~obsolete.m4 +celt-0.7.1.tar.gz +celt-0.7.1/ +flite-1.3.99-latest.tar.gz +flite-1.3.99/ +freeradius-client-1.1.6.tar.gz +freeradius-client-1.1.6/ +iksemel/test/tst-dom +iksemel/test/tst-filter +iksemel/test/tst-iks +iksemel/test/tst-ikstack +iksemel/test/tst-jid +iksemel/test/tst-md5 +iksemel/test/tst-sax +iksemel/test/tst-sha +iksemel/tools/ikslint +iksemel/tools/iksperf +iksemel/tools/iksroster +json-c-0.9.tar.gz +json-c-0.9/ +lame-3.97.tar.gz +lame-3.97/ +libmemcached-0.32.tar.gz +libmemcached-0.32/ +libshout-2.2.2.tar.gz +libshout-2.2.2/ +mpg123.tar.gz +mpg123/ +openldap-2.4.19.tar.gz +openldap-2.4.19/ +pocketsphinx-0.5.99-20091212.tar.gz +pocketsphinx-0.5.99/ +portaudio/bin-stamp +portaudio/bin/ +portaudio/lib-stamp +silk/Decoder +silk/Encoder +silk/signalCompare +soundtouch-1.3.1.tar.gz +soundtouch-1.3.1/ +sphinxbase-0.4.99-20091212.tar.gz +sphinxbase-0.4.99/ +unimrcp/platforms/asr-client/asrclient +unimrcp/platforms/umc/umc +unimrcp/platforms/unimrcp-client/unimrcpclient +unimrcp/platforms/unimrcp-server/unimrcpserver +yaml/config.h +yaml/stamp-h1 +yaml/tests/example-deconstructor +yaml/tests/example-deconstructor-alt +yaml/tests/example-reformatter +yaml/tests/example-reformatter-alt +yaml/tests/run-dumper +yaml/tests/run-emitter +yaml/tests/run-loader +yaml/tests/run-parser +yaml/tests/run-scanner diff --git a/src/mod/.gitignore b/src/mod/.gitignore index 83b4ba82ed..0edc647bec 100644 --- a/src/mod/.gitignore +++ b/src/mod/.gitignore @@ -50,3 +50,10 @@ loggers/mod_logfile/Makefile loggers/mod_syslog/Makefile say/mod_say_en/Makefile say/mod_say_ru/Makefile +applications/mod_stress/mod_stress.log +asr_tts/mod_unimrcp/mod_unimrcp.log +endpoints/mod_portaudio/mod_portaudio.log +endpoints/mod_skypopen/mod_skypopen.log +formats/mod_portaudio_stream/mod_portaudio_stream.log +languages/mod_java/freeswitch.jar +languages/mod_managed/freeswitch_wrap.cpp From 74b76461e348d73c7a2764b33a86eb830aad1a87 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 1 Apr 2010 21:00:45 -0400 Subject: [PATCH 06/15] add back empty dirs --- libs/apr-util/test/data/.empty | 0 libs/esl/java/classes/.empty | 0 libs/js/nsprpub/include/.empty | 0 libs/js/nsprpub/macbuild/.empty | 0 libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty | 0 libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty | 0 libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty | 0 libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty | 0 libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty | 0 libs/js/nsprpub/pkg/solaris/SUNWprx/.empty | 0 libs/js/nsprpub/pr/src/cthreads/.empty | 0 libs/js/nsprpub/pr/tests/macbuild/.empty | 0 libs/portaudio/doc/html/.empty | 0 libs/sqlite/art/tmp/.empty | 0 libs/sqlite/notes/.empty | 0 libs/sqlite/src/ex/.empty | 0 src/mod/timers/.empty | 0 web/etc/.empty | 0 web/planet/.empty | 0 19 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 libs/apr-util/test/data/.empty create mode 100644 libs/esl/java/classes/.empty create mode 100644 libs/js/nsprpub/include/.empty create mode 100644 libs/js/nsprpub/macbuild/.empty create mode 100644 libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty create mode 100644 libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty create mode 100644 libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty create mode 100644 libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty create mode 100644 libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty create mode 100644 libs/js/nsprpub/pkg/solaris/SUNWprx/.empty create mode 100644 libs/js/nsprpub/pr/src/cthreads/.empty create mode 100644 libs/js/nsprpub/pr/tests/macbuild/.empty create mode 100644 libs/portaudio/doc/html/.empty create mode 100644 libs/sqlite/art/tmp/.empty create mode 100644 libs/sqlite/notes/.empty create mode 100644 libs/sqlite/src/ex/.empty create mode 100644 src/mod/timers/.empty create mode 100644 web/etc/.empty create mode 100644 web/planet/.empty diff --git a/libs/apr-util/test/data/.empty b/libs/apr-util/test/data/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/esl/java/classes/.empty b/libs/esl/java/classes/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/include/.empty b/libs/js/nsprpub/include/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/macbuild/.empty b/libs/js/nsprpub/macbuild/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty b/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty b/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty b/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty b/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty b/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty b/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pr/src/cthreads/.empty b/libs/js/nsprpub/pr/src/cthreads/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/js/nsprpub/pr/tests/macbuild/.empty b/libs/js/nsprpub/pr/tests/macbuild/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/portaudio/doc/html/.empty b/libs/portaudio/doc/html/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/sqlite/art/tmp/.empty b/libs/sqlite/art/tmp/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/sqlite/notes/.empty b/libs/sqlite/notes/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/sqlite/src/ex/.empty b/libs/sqlite/src/ex/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/mod/timers/.empty b/src/mod/timers/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/web/etc/.empty b/web/etc/.empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/web/planet/.empty b/web/planet/.empty new file mode 100644 index 0000000000..e69de29bb2 From 92c3f93874e64cb08446fdca1b4cadab808dd90f Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 1 Apr 2010 21:08:31 -0400 Subject: [PATCH 07/15] .gitignore for windows (FSBUILD-269) --- .gitignore | 22 ++++++++++++++++++++++ libs/.gitignore | 34 ++++++++++++++++++++++------------ 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index d0e1708230..188ea88d55 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,28 @@ .deps .\#* \#* +Debug/ +Release/ +All/ +bin/ +*.user +*.suo +*.ncb +*.pdb +*.map +*.lib +*.obj +*.idb +*.res +*.exp +*.exe +*.manifest +*.dep +*.dll +BuildLog.htm +Path +w32/Library/lastversion +w32/Library/tmpVersion.Bat .version AUTHORS COPYING diff --git a/libs/.gitignore b/libs/.gitignore index 699cf81e76..1ae42f9e3e 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -993,11 +993,9 @@ unimrcp/build/acmacros/ltoptions.m4 unimrcp/build/acmacros/ltsugar.m4 unimrcp/build/acmacros/ltversion.m4 unimrcp/build/acmacros/lt~obsolete.m4 -celt-0.7.1.tar.gz +*.tar.gz celt-0.7.1/ -flite-1.3.99-latest.tar.gz flite-1.3.99/ -freeradius-client-1.1.6.tar.gz freeradius-client-1.1.6/ iksemel/test/tst-dom iksemel/test/tst-filter @@ -1010,19 +1008,12 @@ iksemel/test/tst-sha iksemel/tools/ikslint iksemel/tools/iksperf iksemel/tools/iksroster -json-c-0.9.tar.gz json-c-0.9/ -lame-3.97.tar.gz lame-3.97/ -libmemcached-0.32.tar.gz libmemcached-0.32/ -libshout-2.2.2.tar.gz libshout-2.2.2/ -mpg123.tar.gz mpg123/ -openldap-2.4.19.tar.gz openldap-2.4.19/ -pocketsphinx-0.5.99-20091212.tar.gz pocketsphinx-0.5.99/ portaudio/bin-stamp portaudio/bin/ @@ -1030,9 +1021,7 @@ portaudio/lib-stamp silk/Decoder silk/Encoder silk/signalCompare -soundtouch-1.3.1.tar.gz soundtouch-1.3.1/ -sphinxbase-0.4.99-20091212.tar.gz sphinxbase-0.4.99/ unimrcp/platforms/asr-client/asrclient unimrcp/platforms/umc/umc @@ -1049,3 +1038,24 @@ yaml/tests/run-emitter yaml/tests/run-loader yaml/tests/run-parser yaml/tests/run-scanner +Communicator_semi_40.cd_semi_6000/ +libogg-1.1.3/ +pthreads-w32-2-7-0-release/ +sounds/ +sphinxbase-0.4.99/ +sofia-sip/libsofia-sip-ua/http/http_tag_dll.c +sofia-sip/libsofia-sip-ua/iptsec/auth_tag_dll.c +sofia-sip/libsofia-sip-ua/msg/msg_tag_dll.c +sofia-sip/libsofia-sip-ua/msg/msg_tag_ref.c +sofia-sip/libsofia-sip-ua/nea/nea_tag_dll.c +sofia-sip/libsofia-sip-ua/nta/nta_tag_dll.c +sofia-sip/libsofia-sip-ua/nth/nth_tag_dll.c +sofia-sip/libsofia-sip-ua/nua/nua_tag_dll.c +sofia-sip/libsofia-sip-ua/sdp/sdp_tag_dll.c +sofia-sip/libsofia-sip-ua/sip/sip_tag_dll.c +sofia-sip/libsofia-sip-ua/soa/soa_tag_dll.c +sofia-sip/libsofia-sip-ua/stun/stun_tag_dll.c +sofia-sip/libsofia-sip-ua/su/su_tag_dll.c +sofia-sip/libsofia-sip-ua/tport/tport_tag_dll.c +sofia-sip/libsofia-sip-ua/url/url_tag_dll.c +win32/pcre/pcre_chartables.c From 0b10cd7c6353d6af69d9c0f8b53ea46428b3c671 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 1 Apr 2010 22:19:15 -0400 Subject: [PATCH 08/15] .gitignore windows build --- libs/.gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/.gitignore b/libs/.gitignore index 1ae42f9e3e..838f103194 100644 --- a/libs/.gitignore +++ b/libs/.gitignore @@ -1059,3 +1059,8 @@ sofia-sip/libsofia-sip-ua/su/su_tag_dll.c sofia-sip/libsofia-sip-ua/tport/tport_tag_dll.c sofia-sip/libsofia-sip-ua/url/url_tag_dll.c win32/pcre/pcre_chartables.c +apr-util/include/apu_config.h +apr-util/include/apu_select_dbm.h +include/ +js/nsprpub/pr/include/prcpucfg.h +apr-util/xml/expat/lib/config.h From 8e76877a26d92b62c6cb50fa846bc977c59ada3b Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 2 Apr 2010 00:07:02 -0400 Subject: [PATCH 09/15] update makefile and version generation to work with git working copy too --- Makefile.am | 56 ++++++++++++++++++++++++++++++-------------- configure.in | 6 ++--- scripts/tagscript.sh | 1 + 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index afb5673877..8fad740092 100644 --- a/Makefile.am +++ b/Makefile.am @@ -349,7 +349,21 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree cat src/include/switch_version.h.in > src/include/switch_version.h ; \ touch .version ; \ else \ - version=`svnversion . -n || echo hacked` ; \ + if [ -d .git ] ; then \ + version=`git log --format="%h %ci" -1 HEAD | head -1 || echo hacked` ; \ + if [ "x$$version" == "xhacked" ] ; then \ + version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \ + else \ + version="git-$$version" ; \ + fi ;\ + else \ + version=`svnversion . -n || echo hacked` ; \ + if [ "x$$version" == "xhacked" ] ; then \ + version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \ + else \ + version="svn-$$version" ; \ + fi ;\ + fi ; \ oldversion=`cat .version 2>/dev/null || echo "0"` ; \ if test "$$oldversion" != "$$version" || test $$force = 1 ; then \ cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \ @@ -437,23 +451,29 @@ install-data-local: test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs -is-svn: - @if [ ! -d .svn ] ; then \ +is-scm: + @if [ ! -d .svn -a ! -d .git ] ; then \ echo ; echo ; \ - echo "**************************************************************************************************" ; \ - echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \ - echo "**************************************************************************************************" ; \ + echo "*****************************************************************************************************" ; \ + echo "You can not update a release tarball or without a git or svn working copy please clone our git tree: " ; \ + echo "git clone git://git.freeswitch.org/freeswitch.git " ; \ + echo "or check out our read only svn mirror: " ; \ + echo "svn checkout http://svn.freeswitch.org/svn/freeswitch/trunk " ; \ + echo "*****************************************************************************************************" ; \ echo ; echo ; \ exit 1; \ fi -update: is-svn +update: is-scm @if test -d .svn ; then \ test ! -f .version || rm -f .version ; \ echo Updating... ; \ svn update ; \ + elif test -d .git ; then \ + echo "Pulling updates..." ; \ + git pull ; \ else \ - echo "This source directory is not an svn working copy" ; \ + echo "This source directory is not a git tree or svn working copy" ; \ fi .nodepends: @@ -483,18 +503,18 @@ core_install: install_core everything: install -up: is-svn clean - svn update +up: is-scm clean + $(MAKE) update $(MAKE) -j core $(MAKE) -j modules $(MAKE) install -sync: is-svn - svn update +sync: is-scm + $(MAKE) update $(MAKE) install -speedy-sync: is-svn - svn update +speedy-sync: is-scm + $(MAKE) update $(MAKE) -j install libs/openzap/Makefile: @@ -570,15 +590,15 @@ cluecon: @echo @echo http://www.cluecon.com @sleep 5 -current: cluecon is-svn update-clean - svn update +current: cluecon update-clean is-scm + $(MAKE) update $(MAKE) all $(MAKE) install installall: current -speedy-current: is-svn update-clean - svn update +speedy-current: update-clean is-scm + $(MAKE) update $(MAKE) speedy-sure $(MAKE) install diff --git a/configure.in b/configure.in index de262a86db..16ba3e6999 100644 --- a/configure.in +++ b/configure.in @@ -3,11 +3,11 @@ # Must change all of the below together # For a release, set revision for that tagged release as well and uncomment -AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS) +AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS) AC_SUBST(SWITCH_VERSION_MAJOR, [1]) AC_SUBST(SWITCH_VERSION_MINOR, [0]) -AC_SUBST(SWITCH_VERSION_MICRO, [trunk]) -#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here]) +AC_SUBST(SWITCH_VERSION_MICRO, [head]) +#AC_SUBST(SWITCH_VERSION_REVISION, []) AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template]) AC_CONFIG_FILES([.version:.version.in]) diff --git a/scripts/tagscript.sh b/scripts/tagscript.sh index 48a377ffd7..7556c075d0 100755 --- a/scripts/tagscript.sh +++ b/scripts/tagscript.sh @@ -35,6 +35,7 @@ fi 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 if [ -n "$rev" ]; then From 0eb03063973b10377681df0cb9c8de2dd81897df Mon Sep 17 00:00:00 2001 From: Brian West Date: Thu, 1 Apr 2010 23:09:00 -0500 Subject: [PATCH 10/15] swigall --- .../languages/mod_managed/freeswitch_wrap.cxx | 20 +++++++++++++++++++ src/mod/languages/mod_managed/managed/swig.cs | 8 ++++++++ 2 files changed, 28 insertions(+) diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index aab23429f8..737940ec6c 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -21403,6 +21403,26 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_partner(void * } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) { + int jresult ; + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + char *arg2 = (char *) 0 ; + char *arg3 = (char *) 0 ; + switch_bool_t arg4 ; + switch_bool_t arg5 ; + switch_status_t result; + + arg1 = (switch_channel_t *)jarg1; + arg2 = (char *)jarg2; + arg3 = (char *)jarg3; + arg4 = (switch_bool_t)jarg4; + arg5 = (switch_bool_t)jarg5; + result = (switch_status_t)switch_channel_export_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5); + jresult = result; + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3) { char * jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index 90b0c57877..13756d32a6 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -2904,6 +2904,11 @@ public class freeswitch { return ret; } + public static switch_status_t switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check, switch_bool_t nolocal) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check, (int)nolocal); + return ret; + } + public static string switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel channel, string varname, switch_bool_t dup) { string ret = freeswitchPINVOKE.switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, (int)dup); return ret; @@ -10209,6 +10214,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_partner")] public static extern string switch_channel_get_variable_partner(HandleRef jarg1, string jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_export_variable_var_check")] + public static extern int switch_channel_export_variable_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4, int jarg5); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_dup")] public static extern string switch_channel_get_variable_dup(HandleRef jarg1, string jarg2, int jarg3); From d18416df8b4cd3cf36d556d68055dcbb464ac91e Mon Sep 17 00:00:00 2001 From: Brian West Date: Thu, 1 Apr 2010 23:15:53 -0500 Subject: [PATCH 11/15] cleanup a few things in the swigall --- build/swigall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/swigall.sh b/build/swigall.sh index ee7abf19cd..0525faf073 100755 --- a/build/swigall.sh +++ b/build/swigall.sh @@ -1,6 +1,6 @@ cd src/mod/languages/mod_lua make swigclean -make mod_lua_wrap.cpp +make lua_wrap cd ../../../.. cd src/mod/languages/mod_perl From b45a11770a8ad1dc6dd78ca1700411cd89015720 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Fri, 2 Apr 2010 01:00:08 -0400 Subject: [PATCH 12/15] Fix portaudio modules on FreeBSD (-I include order issue) --- src/mod/endpoints/mod_portaudio/Makefile.am | 3 +-- src/mod/formats/mod_portaudio_stream/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mod/endpoints/mod_portaudio/Makefile.am b/src/mod/endpoints/mod_portaudio/Makefile.am index 56f82daf79..88d8754868 100644 --- a/src/mod/endpoints/mod_portaudio/Makefile.am +++ b/src/mod/endpoints/mod_portaudio/Makefile.am @@ -6,8 +6,7 @@ PALA=$(switch_builddir)/libs/portaudio/lib/libportaudio.la mod_LTLIBRARIES = mod_portaudio.la mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c -mod_portaudio_la_CFLAGS = $(AM_CFLAGS) -mod_portaudio_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 +mod_portaudio_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 $(AM_CFLAGS) mod_portaudio_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA) mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS) diff --git a/src/mod/formats/mod_portaudio_stream/Makefile.am b/src/mod/formats/mod_portaudio_stream/Makefile.am index 9b9900c03a..ae9896a7b0 100644 --- a/src/mod/formats/mod_portaudio_stream/Makefile.am +++ b/src/mod/formats/mod_portaudio_stream/Makefile.am @@ -7,8 +7,7 @@ MODPA_DIR=$(switch_srcdir)/src/mod/endpoints/mod_portaudio mod_LTLIBRARIES = mod_portaudio_stream.la mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c $(MODPA_DIR)/pablio.c $(MODPA_DIR)/pa_ringbuffer.c -mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS) -mod_portaudio_stream_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) +mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS) mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA) mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS) From 957d92c430d1808a093489f261323cb3ee82015c Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 2 Apr 2010 01:15:18 -0400 Subject: [PATCH 13/15] fix openbsd sofia build --- libs/sofia-sip/configure.ac | 5 ++++- libs/sofia-sip/libsofia-sip-ua/sofia.am | 2 +- libs/sofia-sip/rules/sofia.am | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac index fcedf33260..0eb2418ad9 100644 --- a/libs/sofia-sip/configure.ac +++ b/libs/sofia-sip/configure.ac @@ -100,13 +100,16 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then fi fi +SOFIA_PLAT_CFLAGS= # openbsd seems to not define NULL as a void pointer, I blame standards by committee for this. # This is a dirty hack, but shuts up all the warnings case "$host" in - *-openbsd*) SOFIA_CFLAGS="$SOFIA_CFLAGS -DNULL='(void *) 0L'";; + *-openbsd*) SOFIA_PLAT_CFLAGS="-DNULL='(void *) 0L'";; *) ;; esac +AC_SUBST(SOFIA_PLAT_CFLAGS, $SOFIA_PLAT_CFLAGS) + ### checks for header files ### ----------------------- diff --git a/libs/sofia-sip/libsofia-sip-ua/sofia.am b/libs/sofia-sip/libsofia-sip-ua/sofia.am index b5e5ec88f2..a7d8c346d6 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sofia.am +++ b/libs/sofia-sip/libsofia-sip-ua/sofia.am @@ -1,7 +1,7 @@ # common Makefile targets for libsofia-sip-ua modules # --------------------------------------------------- -AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) +AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) $(SOFIA_PLAT_CFLAGS) # Use with --enable-ndebug if NDEBUG diff --git a/libs/sofia-sip/rules/sofia.am b/libs/sofia-sip/rules/sofia.am index 3d3b88f50f..a312e1355f 100644 --- a/libs/sofia-sip/rules/sofia.am +++ b/libs/sofia-sip/rules/sofia.am @@ -4,7 +4,7 @@ sofiasrcdir = ${top_srcdir}/libsofia-sip-ua sofiabuilddir = ${top_builddir}/libsofia-sip-ua -AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) +AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS) SOFIA_COVERAGE = $(COVERAGE_FLAGS) From 597675ec14c5d13e7d1d903961e12aa0c7f7a131 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 2 Apr 2010 01:24:20 -0400 Subject: [PATCH 14/15] disable isdn mod here for now, it will be replaced soon --- libs/freetdm/Makefile.am | 60 ++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am index 5f829b6614..a90da6659e 100644 --- a/libs/freetdm/Makefile.am +++ b/libs/freetdm/Makefile.am @@ -105,7 +105,7 @@ core-install: install-libLTLIBRARIES # # tools & test programs # -noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testpri testr2 testanalog testapp testcid +noinst_PROGRAMS = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid #testisdn if HAVE_SCTP noinst_PROGRAMS += testboost endif @@ -131,9 +131,9 @@ detect_dtmf_SOURCES = $(SRC)/detect_dtmf.c detect_dtmf_LDADD = libfreetdm.la detect_dtmf_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -testisdn_SOURCES = $(SRC)/testisdn.c -testisdn_LDADD = libfreetdm.la -testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) +#testisdn_SOURCES = $(SRC)/testisdn.c +#testisdn_LDADD = libfreetdm.la +#testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) testpri_SOURCES = $(SRC)/testpri.c testpri_LDADD = libfreetdm.la @@ -160,7 +160,7 @@ testanalog_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) # # ftmod modules # -mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_isdn.la ftmod_analog.la ftmod_analog_em.la +mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la #ftmod_isdn.la if HAVE_SCTP @@ -196,32 +196,32 @@ ftmod_wanpipe_la_LDFLAGS = -module -avoid-version -lsangoma ftmod_wanpipe_la_LIBADD = $(MYLIB) endif -ftmod_isdn_la_SOURCES = \ -$(SRC)/isdn/EuroISDNStateNT.c \ -$(SRC)/isdn/EuroISDNStateTE.c \ -$(SRC)/isdn/mfifo.c \ -$(SRC)/isdn/Q921.c \ -$(SRC)/isdn/Q931api.c \ -$(SRC)/isdn/Q931.c \ -$(SRC)/isdn/Q931ie.c \ -$(SRC)/isdn/Q931mes.c \ -$(SRC)/isdn/Q931StateNT.c \ -$(SRC)/isdn/Q931StateTE.c \ -$(SRC)/isdn/nationalmes.c \ -$(SRC)/isdn/nationalStateNT.c \ -$(SRC)/isdn/nationalStateTE.c \ -$(SRC)/isdn/DMSmes.c \ -$(SRC)/isdn/DMSStateNT.c \ -$(SRC)/isdn/DMSStateTE.c \ -$(SRC)/isdn/5ESSmes.c \ -$(SRC)/isdn/5ESSStateNT.c \ -$(SRC)/isdn/5ESSStateTE.c \ -$(SRC)/isdn/Q932mes.c \ -$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c +#ftmod_isdn_la_SOURCES = \ +#$(SRC)/isdn/EuroISDNStateNT.c \ +#$(SRC)/isdn/EuroISDNStateTE.c \ +#$(SRC)/isdn/mfifo.c \ +#$(SRC)/isdn/Q921.c \ +#$(SRC)/isdn/Q931api.c \ +#$(SRC)/isdn/Q931.c \ +#$(SRC)/isdn/Q931ie.c \ +#$(SRC)/isdn/Q931mes.c \ +#$(SRC)/isdn/Q931StateNT.c \ +#$(SRC)/isdn/Q931StateTE.c \ +#$(SRC)/isdn/nationalmes.c \ +#$(SRC)/isdn/nationalStateNT.c \ +#$(SRC)/isdn/nationalStateTE.c \ +#$(SRC)/isdn/DMSmes.c \ +#$(SRC)/isdn/DMSStateNT.c \ +#$(SRC)/isdn/DMSStateTE.c \ +#$(SRC)/isdn/5ESSmes.c \ +#$(SRC)/isdn/5ESSStateNT.c \ +#$(SRC)/isdn/5ESSStateTE.c \ +#$(SRC)/isdn/Q932mes.c \ +#$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c -ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE -ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version -ftmod_isdn_la_LIBADD = $(MYLIB) +#ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE +#ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version +#ftmod_isdn_la_LIBADD = $(MYLIB) ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c ftmod_analog_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) From 14226d2d94e82bec351c0e8ad3f4708183539fe6 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Fri, 2 Apr 2010 02:08:53 -0400 Subject: [PATCH 15/15] we don't always have this --- scripts/tagscript.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tagscript.sh b/scripts/tagscript.sh index 7556c075d0..b3705b300d 100755 --- a/scripts/tagscript.sh +++ b/scripts/tagscript.sh @@ -64,7 +64,7 @@ rm -rf .git cd .. tar -czvf $dst_name.tar.gz $dst_dir tar -cjvf $dst_name.tar.bz2 $dst_dir -tar -cJvf $dst_name.tar.xz $dst_dir +tar -cJvf $dst_name.tar.xz $dst_dir || echo tar does not support -J rm -rf $dst_dir cat 1>&2 <