diff --git a/.gitignore b/.gitignore index f113a797d2..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 @@ -17,6 +39,7 @@ Makefile.in NEWS README aclocal.m4 +autom4te.cache build/Makefile build/Makefile.in build/config/compile @@ -33,6 +56,7 @@ config.cache config.log config.status configure +configure.lineno freeswitch fs_cli fs_ivrd 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/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 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/libs/.gitignore b/libs/.gitignore index 5cce65bcdb..838f103194 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,74 @@ unimrcp/build/acmacros/ltoptions.m4 unimrcp/build/acmacros/ltsugar.m4 unimrcp/build/acmacros/ltversion.m4 unimrcp/build/acmacros/lt~obsolete.m4 +*.tar.gz +celt-0.7.1/ +flite-1.3.99/ +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/ +lame-3.97/ +libmemcached-0.32/ +libshout-2.2.2/ +mpg123/ +openldap-2.4.19/ +pocketsphinx-0.5.99/ +portaudio/bin-stamp +portaudio/bin/ +portaudio/lib-stamp +silk/Decoder +silk/Encoder +silk/signalCompare +soundtouch-1.3.1/ +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 +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 +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 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/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) 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/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) 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/scripts/tagscript.sh b/scripts/tagscript.sh index 9ba4826dbc..b3705b300d 100755 --- a/scripts/tagscript.sh +++ b/scripts/tagscript.sh @@ -35,11 +35,12 @@ 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|" \ + -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\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 @@ -63,14 +64,14 @@ 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 <