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

.gitignore

@@ -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

Examples/test-suite/javascript/Makefile.in

@@ -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@

Examples/test-suite/javascript/javascript_unicode_runme.js

@@ -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);
+}

Examples/test-suite/javascript_unicode.i

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

Lib/javascript/jsc/javascriptstrings.swg

@@ -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;

Tools/javascript/js_shell.cxx

@@ -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

Tools/javascript/v8_shell.cxx

@@ -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() {

configure.in

@@ -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
+  if test -z "$JSCORELIB"; then
-AC_ARG_WITH(jscorelib,[  --with-jscorelib =path      Set location of JavaScriptCore (Webkit) library directory],
+    JSCORELIBDIRS="/usr/lib/ /usr/local/lib/"
-  [JSCORELIB="-L$withval"], [JSCORELIB=])
+    for i in $JSCORELIBDIRS ; do
-AC_MSG_CHECKING(for JavaScriptCore(Webkit) library)
 
-if test -z "$JSCORELIB"; then
+        if test -r $i/libwebkit-1.0.la; then
-dirs="/usr/lib/ /usr/local/lib/"
+                AC_MSG_RESULT($i)
-for i in $dirs ; do
+                JSCORELIB="-L$i -lwebkit-1.0"
+                break
+        fi
 
-    if test -r $i/libwebkit-1.0.la; then
+        if test -r $i/libjavascriptcoregtk-1.0.so; then
-            AC_MSG_RESULT($i)
+               AC_MSG_RESULT($i)
-            JSCORELIB="-L$i -lwebkit-1.0"
+               JSCORELIB="-L$i -ljavascriptcoregtk-1.0"
-            break
+               break
-    fi
+        fi
 
-    if test -r $i/libjavascriptcoregtk-1.0.so; then
+        if test -r $i/libwebkitgtk-1.0.so; then
-           AC_MSG_RESULT($i)
+               AC_MSG_RESULT($i)
-           JSCORELIB="-L$i -ljavascriptcoregtk-1.0"
+               JSCORELIB="-L$i -lwebkitgtk-1.0"
-           break
+               break
-    fi
+        fi
+    done
+  fi
 
-    if test -r $i/libwebkitgtk-1.0.so; then
+  if test -z "$JSCORELIB"; then
-           AC_MSG_RESULT($i)
+    AC_MSG_RESULT(not found)
-           JSCORELIB="-L$i -lwebkitgtk-1.0"
+    JSCORE=0
-           break
+  else
-    fi
+    AC_MSG_RESULT($JSCORELIB)
-done
+    JSCORE=1
-
+  fi
-if test -z "$JSCORELIB"; then
+  ;;
-	AC_MSG_RESULT(not found)
+esac
-	JSCORE=
-else
-	AC_MSG_RESULT($JSCORELIB)
-	JSCORE=1
-fi
 
 # 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
+  case $host in
-*-*-darwin* | *-*-linux* | *-*-cygwin* | *-*-mingw*) 
+  *-*-darwin* | *-*-linux* | *-*-cygwin* | *-*-mingw*)
-  JSCXXFLAGS="`echo $CXXFLAGS | sed 's/-Wall//g'`"
+    JSCXXFLAGS="`echo $CXXFLAGS | sed 's/-Wall//g'`"
-  ;;
+    ;;
-*)
+  *)
-  JSCXXFLAGS="$CXXFLAGS"
+    JSCXXFLAGS="$CXXFLAGS"
-esac
+  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)
 
 #----------------------------------------------------------------