jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' of github.com:oliver----/swig-v8 into devel

Browse source
This commit is contained in:
Oliver Buchtala 2013-01-22 19:24:12 +01:00
commit b0cb875ac1
8 changed files with 114 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.gitignore vendored Normal file
View file

@ -0,0 +1,13 @@
Makefile
/Examples/Makefile
/Examples/*/Makefile
/Examples/test-suite/*/Makefile
/CCache
*.Po
swigp4.ml
Source/Include/stamp-h1
Source/Include/swigconfig.h
config.log
config.status
preinst-swig
swig.spec

3
Examples/test-suite/javascript/Makefile.in
View file

@ -47,7 +47,8 @@ CPP_TEST_CASES = \
typemap_namespace \
typemap_ns_using \
using1 \
using2
using2 \
javascript_unicode
SKIP_CPP_CASES = @SKIP_CPP_CASES@
SKIP_C_CASES = @SKIP_C_CASES@

7
Examples/test-suite/javascript/javascript_unicode_runme.js Normal file
View file

@ -0,0 +1,7 @@
var str = "olé";
var copy = javascript_unicode.copy_string(str);
if (str !== copy) {
print("Error: copy is not equal: original="+str+", copy="+copy);
}

10
Examples/test-suite/javascript_unicode.i Normal file
View file

@ -0,0 +1,10 @@
%module javascript_unicode
%newobject copy_string;
%inline %{
#include <string.h>
const char* copy_string(const char* str) {
return strdup(str);
}
%}

6
Lib/javascript/jsc/javascriptstrings.swg
View file

@ -8,12 +8,12 @@ SWIG_JSC_AsCharPtrAndSize(JSContextRef context, JSValueRef valRef, char** cptr,
if(JSValueIsString(context, valRef)) {
JSStringRef js_str = JSValueToStringCopy(context, valRef, NULL);
size_t len = JSStringGetMaximumUTF8CStringSize(js_str);
size_t abs_len = JSStringGetLength(js_str);
char* cstr = (char*) malloc(len * sizeof(char));
JSStringGetUTF8CString(js_str, cstr, len);
/* JSStringGetUTF8CString returns the length including 0-terminator */
len = JSStringGetUTF8CString(js_str, cstr, len);
if(alloc) *alloc = SWIG_NEWOBJ;
if(psize) *psize = abs_len + 1;
if(psize) *psize = len;
if(cptr) *cptr = cstr;
return SWIG_OK;

7
Tools/javascript/js_shell.cxx
View file

@ -6,11 +6,16 @@
#include <stdlib.h>
#ifdef __GNUC__
#ifdef __APPLE__
#define LIBRARY_EXT ".dylib"
#else
#define LIBRARY_EXT ".so"
#endif
#include <dlfcn.h>
#define LOAD_LIBRARY(name) dlopen(name, RTLD_LAZY)
#define CLOSE_LIBRARY(handle) dlclose(handle)
#define LIBRARY_ERROR dlerror
#define LIBRARYFILE(name) std::string("lib").append(name).append(".so")
#define LIBRARYFILE(name) std::string("lib").append(name).append(LIBRARY_EXT)
#else
#error "implement dll loading"
#endif

2
Tools/javascript/v8_shell.cxx
View file

@ -149,6 +149,7 @@ bool V8Shell::RunShell() {
bool V8Shell::InitializeEngine() {
return true;
}
void V8Shell::ExtendEngine() {
@ -194,6 +195,7 @@ bool V8Shell::ExecuteScript(const std::string& source, const std::string& name)
}
bool V8Shell::DisposeEngine() {
return true;
}
v8::Persistent<v8::Context> V8Shell::CreateShellContext() {

89
configure.in
View file

@ -1106,11 +1106,13 @@ if test -z "$JSCOREINCDIR"; then
esac
fi
JSCORE=0
for d in $JSCOREINCDIR ; do
if test -r "$d/JavaScriptCore/JavaScript.h" || test -r "$d/JavaScript.h" ; then
AC_MSG_RESULT($d)
JSCOREINCDIR=$d
JSCOREINC=-I\"$d\"
JSCORE=1
break
fi
done
@ -1119,42 +1121,46 @@ if test "$JSCOREINC" = "" ; then
AC_MSG_RESULT(not found)
fi
# under linux look for the javascript core library
case $host in
*-*-linux*)
# check for JavaScriptCore, Webkit libraries
AC_ARG_WITH(jscorelib,[ --with-jscorelib =path Set location of JavaScriptCore (Webkit) library directory], [JSCORELIB="-L$withval"], [JSCORELIB=])
AC_MSG_CHECKING(for JavaScriptCore(Webkit) library)
# check for JavaScriptCore, Webkit libraries
AC_ARG_WITH(jscorelib,[ --with-jscorelib =path Set location of JavaScriptCore (Webkit) library directory],
[JSCORELIB="-L$withval"], [JSCORELIB=])
AC_MSG_CHECKING(for JavaScriptCore(Webkit) library)
if test -z "$JSCORELIB"; then
JSCORELIBDIRS="/usr/lib/ /usr/local/lib/"
for i in $JSCORELIBDIRS ; do
if test -z "$JSCORELIB"; then
dirs="/usr/lib/ /usr/local/lib/"
for i in $dirs ; do
if test -r $i/libwebkit-1.0.la; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkit-1.0"
break
fi
if test -r $i/libwebkit-1.0.la; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkit-1.0"
break
fi
if test -r $i/libjavascriptcoregtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -ljavascriptcoregtk-1.0"
break
fi
if test -r $i/libjavascriptcoregtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -ljavascriptcoregtk-1.0"
break
fi
if test -r $i/libwebkitgtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkitgtk-1.0"
break
fi
done
fi
if test -r $i/libwebkitgtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkitgtk-1.0"
break
fi
done
if test -z "$JSCORELIB"; then
AC_MSG_RESULT(not found)
JSCORE=
else
AC_MSG_RESULT($JSCORELIB)
JSCORE=1
fi
if test -z "$JSCORELIB"; then
AC_MSG_RESULT(not found)
JSCORE=0
else
AC_MSG_RESULT($JSCORELIB)
JSCORE=1
fi
;;
esac
# linking options
case $host in
@ -1163,7 +1169,7 @@ case $host in
JSCORECFLAGS=""
;;
*-*-linux*)
JSCOREDYNAMICLINKING="$JSCORELIB"
JSCOREDYNAMICLINKING="$JSCORELIB"
JSCORECFLAGS=""
;;
*)
@ -1179,13 +1185,13 @@ case $host in
esac
if test "$JS_NO_WARNINGS" == "1"; then
case $host in
*-*-darwin* | *-*-linux* | *-*-cygwin* | *-*-mingw*)
JSCXXFLAGS="`echo $CXXFLAGS | sed 's/-Wall//g'`"
;;
*)
JSCXXFLAGS="$CXXFLAGS"
esac
case $host in
*-*-darwin* | *-*-linux* | *-*-cygwin* | *-*-mingw*)
JSCXXFLAGS="`echo $CXXFLAGS | sed 's/-Wall//g'`"
;;
*)
JSCXXFLAGS="$CXXFLAGS"
esac
fi
# library output
@ -1201,7 +1207,6 @@ case $host in
JSCORECXXSHARED='$(CXXSHARED)'
;;
esac
fi
AC_SUBST(JSCORE)
AC_SUBST(JSCOREINC)
@ -1259,8 +1264,10 @@ done
if test "$JSV8LIB" = "" ; then
AC_MSG_RESULT(not found)
JSV8=
else
AC_MSG_RESULT($JSV8LIB)
JSV8=1
fi
@ -1277,8 +1284,10 @@ case $host in
;;
esac
AC_SUBST(JSV8)
AC_SUBST(JSV8INC)
AC_SUBST(JSV8DYNAMICLINKING)
AC_SUBST(JSDEFAULT)
#----------------------------------------------------------------