mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-15 08:29:45 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4004 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
ccd944d52b
commit
16fce97f7a
@ -100,7 +100,7 @@ DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
@ -173,7 +173,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
|
||||
|| (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
|
||||
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
|
||||
|
||||
mostlyclean-tags:
|
||||
|
||||
|
@ -92,9 +92,21 @@ INCLUDES = -I$(top_srcdir)/include
|
||||
|
||||
lib_LTLIBRARIES = libiksemel.la
|
||||
|
||||
@DO_POSIX_TRUE@posix_c = io-posix.c
|
||||
@DO_POSIX_TRUE@posix_c = @DO_POSIX_TRUE@io-posix.c
|
||||
|
||||
libiksemel_la_SOURCES = ikstack.c utility.c iks.c sax.c dom.c $(posix_c) stream.c sha.c jabber.c filter.c md5.c base64.c
|
||||
libiksemel_la_SOURCES = \
|
||||
ikstack.c \
|
||||
utility.c \
|
||||
iks.c \
|
||||
sax.c \
|
||||
dom.c \
|
||||
$(posix_c) \
|
||||
stream.c \
|
||||
sha.c \
|
||||
jabber.c \
|
||||
filter.c \
|
||||
md5.c \
|
||||
base64.c
|
||||
|
||||
|
||||
libiksemel_la_LDFLAGS = -version-info 3:0:0 -no-undefined
|
||||
@ -127,7 +139,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libiksemel_la_SOURCES)
|
||||
OBJECTS = $(libiksemel_la_OBJECTS)
|
||||
@ -233,7 +245,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
||||
|| (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
|
||||
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
||||
|
||||
mostlyclean-tags:
|
||||
|
||||
|
@ -164,7 +164,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(tst_ikstack_SOURCES) $(tst_iks_SOURCES) $(tst_sax_SOURCES) $(tst_dom_SOURCES) $(tst_sha_SOURCES) $(tst_md5_SOURCES) $(tst_filter_SOURCES) $(tst_jid_SOURCES)
|
||||
OBJECTS = $(tst_ikstack_OBJECTS) $(tst_iks_OBJECTS) $(tst_sax_OBJECTS) $(tst_dom_OBJECTS) $(tst_sha_OBJECTS) $(tst_md5_OBJECTS) $(tst_filter_OBJECTS) $(tst_jid_OBJECTS)
|
||||
@ -283,7 +283,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
||||
|| (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
|
||||
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
||||
|
||||
mostlyclean-tags:
|
||||
|
||||
|
@ -311,7 +311,7 @@ function SpeechObtainer(asr, req, wait_time) {
|
||||
if (!files[x] || files[x] == "noop") {
|
||||
continue;
|
||||
}
|
||||
rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , "", this.asr.onInput, this.asr);
|
||||
rv = this.asr.session.streamFile(this.audio_base + files[x] + this.audio_ext , this.asr.onInput, this.asr);
|
||||
if (rv) {
|
||||
break;
|
||||
}
|
||||
|
@ -402,11 +402,36 @@ JSClass event_class = {
|
||||
|
||||
static void js_error(JSContext *cx, const char *message, JSErrorReport *report)
|
||||
{
|
||||
if (message) {
|
||||
switch_log_printf(SWITCH_CHANNEL_ID_LOG, report->filename ? (char *)report->filename : "mod_spidermonkey.c", modname, report->lineno, SWITCH_LOG_ERROR,
|
||||
"%s %s%s\n", message, report->linebuf ? "near " : "", report->linebuf ? report->linebuf : "");
|
||||
const char *filename = __FILE__;
|
||||
int line = __LINE__;
|
||||
const char *text = "";
|
||||
char *ex = "";
|
||||
|
||||
if (message && report) {
|
||||
if (report->filename) {
|
||||
filename = report->filename;
|
||||
}
|
||||
line = report->lineno;
|
||||
if (report->linebuf) {
|
||||
text = report->linebuf;
|
||||
ex = "near ";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!message) {
|
||||
message = "(N/A)";
|
||||
}
|
||||
|
||||
switch_log_printf(SWITCH_CHANNEL_ID_LOG,
|
||||
filename,
|
||||
modname,
|
||||
line,
|
||||
SWITCH_LOG_ERROR,
|
||||
"%s %s%s\n",
|
||||
ex,
|
||||
message,
|
||||
text);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user