[Freeswitch-svn] [commit] r3696 - in freeswitch/trunk: libs/js/src src/mod/languages/mod_spidermonkey src/mod/languages/mod_spidermonkey_core_db src/mod/languages/mod_spidermonkey_odbc src/mod/languages/mod_spidermonkey_teletone
Freeswitch SVN
brian at freeswitch.org
Mon Dec 18 13:10:33 EST 2006
Author: brian
Date: Mon Dec 18 13:10:31 2006
New Revision: 3696
Modified:
freeswitch/trunk/libs/js/src/jsautocfg.h
freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile
Log:
wip
Modified: freeswitch/trunk/libs/js/src/jsautocfg.h
==============================================================================
--- freeswitch/trunk/libs/js/src/jsautocfg.h (original)
+++ freeswitch/trunk/libs/js/src/jsautocfg.h Mon Dec 18 13:10:31 2006
@@ -10,42 +10,42 @@
#define JS_BYTES_PER_SHORT 2L
#define JS_BYTES_PER_INT 4L
#define JS_BYTES_PER_INT64 8L
-#define JS_BYTES_PER_LONG 8L
+#define JS_BYTES_PER_LONG 4L
#define JS_BYTES_PER_FLOAT 4L
#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD 8L
+#define JS_BYTES_PER_WORD 4L
#define JS_BYTES_PER_DWORD 8L
#define JS_BITS_PER_BYTE 8L
#define JS_BITS_PER_SHORT 16L
#define JS_BITS_PER_INT 32L
#define JS_BITS_PER_INT64 64L
-#define JS_BITS_PER_LONG 64L
+#define JS_BITS_PER_LONG 32L
#define JS_BITS_PER_FLOAT 32L
#define JS_BITS_PER_DOUBLE 64L
-#define JS_BITS_PER_WORD 64L
+#define JS_BITS_PER_WORD 32L
#define JS_BITS_PER_BYTE_LOG2 3L
#define JS_BITS_PER_SHORT_LOG2 4L
#define JS_BITS_PER_INT_LOG2 5L
#define JS_BITS_PER_INT64_LOG2 6L
-#define JS_BITS_PER_LONG_LOG2 6L
+#define JS_BITS_PER_LONG_LOG2 5L
#define JS_BITS_PER_FLOAT_LOG2 5L
#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2 6L
+#define JS_BITS_PER_WORD_LOG2 5L
#define JS_ALIGN_OF_SHORT 2L
#define JS_ALIGN_OF_INT 4L
-#define JS_ALIGN_OF_LONG 8L
-#define JS_ALIGN_OF_INT64 8L
+#define JS_ALIGN_OF_LONG 4L
+#define JS_ALIGN_OF_INT64 4L
#define JS_ALIGN_OF_FLOAT 4L
-#define JS_ALIGN_OF_DOUBLE 8L
-#define JS_ALIGN_OF_POINTER 8L
-#define JS_ALIGN_OF_WORD 8L
+#define JS_ALIGN_OF_DOUBLE 4L
+#define JS_ALIGN_OF_POINTER 4L
+#define JS_ALIGN_OF_WORD 4L
-#define JS_BYTES_PER_WORD_LOG2 3L
+#define JS_BYTES_PER_WORD_LOG2 2L
#define JS_BYTES_PER_DWORD_LOG2 3L
-#define JS_WORDS_PER_DWORD_LOG2 0L
+#define JS_WORDS_PER_DWORD_LOG2 1L
#define JS_STACK_GROWTH_DIRECTION (-1)
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Mon Dec 18 13:10:31 2006
@@ -1,17 +1,15 @@
include sm.mak
-OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl
-LINKER=$(CC)
-
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends:
- BUILD_OPT=$(BO) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX)
+ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js/nsprpub --prefix=$(PREFIX) --with-pic
+ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install js --prefix=$(PREFIX) --with-pic --with-nspr=yes
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) --without-libidn
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
+ $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
+ $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
clean:
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Mon Dec 18 13:10:31 2006
@@ -2248,35 +2248,6 @@
};
-SWITCH_SM_DECLARE(int) eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval)
-{
- JSScript *script = NULL;
- char *cptr;
- char *path = NULL;
- int res = 0;
-
- JS_ClearPendingException(cx);
-
- if (code[0] == '~') {
- cptr = code + 1;
- script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1);
- } else {
- if (*code == '/') {
- script = JS_CompileFile(cx, obj, code);
- } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) {
- script = JS_CompileFile(cx, obj, path);
- switch_safe_free(path);
- }
- }
-
- if (script) {
- res = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0;
- JS_DestroyScript(cx, script);
- }
-
- return res;
-}
-
static int env_init(JSContext *cx, JSObject *javascript_object)
{
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Mon Dec 18 13:10:31 2006
@@ -76,7 +76,35 @@
#define SWITCH_SM_DECLARE(type) type
#endif
-SWITCH_SM_DECLARE(int) eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval);
+static int eval_some_js(char *code, JSContext *cx, JSObject *obj, jsval *rval)
+{
+ JSScript *script = NULL;
+ char *cptr;
+ char *path = NULL;
+ int res = 0;
+
+ JS_ClearPendingException(cx);
+
+ if (code[0] == '~') {
+ cptr = code + 1;
+ script = JS_CompileScript(cx, obj, cptr, strlen(cptr), "inline", 1);
+ } else {
+ if (*code == '/') {
+ script = JS_CompileFile(cx, obj, code);
+ } else if ((path = switch_mprintf("%s%s%s", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR, code))) {
+ script = JS_CompileFile(cx, obj, path);
+ switch_safe_free(path);
+ }
+ }
+
+ if (script) {
+ res = JS_ExecuteScript(cx, obj, script, rval) == JS_TRUE ? 1 : 0;
+ JS_DestroyScript(cx, script);
+ }
+
+ return res;
+}
+
typedef switch_status_t(*spidermonkey_load_t)(JSContext *cx, JSObject *obj);
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Mon Dec 18 13:10:31 2006
@@ -1,67 +1,2 @@
-# This is all used to make sure we use the right options during build and link.
-
-OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/))
-#VER=DBG
-#BO=0
-VER=OPT
-BO=1
-
-# Attempt to differentiate between SunOS 5.4 and x86 5.4
-OS_CPUARCH := $(shell uname -m)
-ifeq ($(OS_CPUARCH),i86pc)
-OS_RELEASE := $(shell uname -r)_$(OS_CPUARCH)
-else
-ifeq ($(OS_ARCH),AIX)
-OS_RELEASE := $(shell uname -v).$(shell uname -r)
-else
-OS_RELEASE := $(shell uname -r)
-endif
-endif
-ifeq ($(OS_ARCH),IRIX64)
-OS_ARCH := IRIX
-endif
-
-# Handle output from win32 unames other than Netscape's version
-ifeq (,$(filter-out Windows_95 Windows_98 CYGWIN_95-4.0 CYGWIN_98-4.10, $(OS_ARCH)))
- OS_ARCH := WIN95
-endif
-ifeq ($(OS_ARCH),WIN95)
- OS_ARCH := WINNT
- OS_RELEASE := 4.0
-endif
-ifeq ($(OS_ARCH), Windows_NT)
- OS_ARCH := WINNT
- OS_MINOR_RELEASE := $(shell uname -v)
- ifeq ($(OS_MINOR_RELEASE),00)
- OS_MINOR_RELEASE = 0
- endif
- OS_RELEASE := $(OS_RELEASE).$(OS_MINOR_RELEASE)
-endif
-ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH)))
- OS_RELEASE := $(patsubst CYGWIN_NT-%,%,$(OS_ARCH))
- OS_ARCH := WINNT
-endif
-ifeq ($(OS_ARCH), CYGWIN32_NT)
- OS_ARCH := WINNT
-endif
-ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH)))
- OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
- OS_ARCH := WINNT
-endif
-
-ifeq ($(OS_ARCH),Linux)
-OS_CONFIG := Linux_All
-else
-ifeq ($(OS_ARCH),dgux)
-OS_CONFIG := dgux
-else
-ifeq ($(OS_ARCH),Darwin)
-OS_CONFIG := Darwin
-else
-OS_CONFIG := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE)
-endif
-endif
-endif
-
-CFLAGS += -I../mod_spidermonkey -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_$(VER).OBJ
-LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr
+CFLAGS += -I$(PREFIX)/include/js -I$(PREFIX)/include/nspr -DXP_UNIX -I../mod_spidermonkey
+LDFLAGS += -lnspr4 -ljs -lcurl
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile Mon Dec 18 13:10:31 2006
@@ -1,16 +1,12 @@
include ../mod_spidermonkey/sm.mak
-OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a
-LINKER=$(CC)
-
-
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends:
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
+ $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
clean:
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Mon Dec 18 13:10:31 2006
@@ -1,7 +1,4 @@
include ../mod_spidermonkey/sm.mak
-
-OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a
-LINKER=$(CC)
LDFLAGS+=-lodbc
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
@@ -11,7 +8,7 @@
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
+ $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
clean:
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Mon Dec 18 13:10:31 2006
@@ -1,16 +1,13 @@
include ../mod_spidermonkey/sm.mak
+LDFLAGS+=-lteletone
-OBJS=#$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a
-LINKER=$(CC)
-
-
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends:
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
+ $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
clean:
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
More information about the Freeswitch-svn
mailing list