Merge pull request #189 from krunt/origin/_v8

porting to linux/mac

Author: jmgasper

cmake/V8Deps.cmake

@@ -21,7 +21,10 @@ if (WIN32)
           icutools.lib icustubdata.lib icudata.lib icuucx.lib icui18n.lib
           libuv.lib openssl.lib v8_inspector_stl.lib cctest.lib
          )
-else (WIN32)
+elseif (APPLE)
+    set(V8_LIBRARY_DIRS ${NODEDIR})
+    set(V8_LIBRARIES node)
+else ()
       set(V8_LIBRARY_DIRS 
           ${NODEDIR}/out/Release/obj.target
           ${NODEDIR}/out/Release/obj.target/deps/v8_inspector/third_party/v8_inspector/platform/v8_inspector
@@ -48,7 +51,7 @@ else (WIN32)
           icuucx
           icudata
          )
-endif (WIN32)
+endif ()
 
 if (NOT SUPPORT_V8)
     unset(V8_INCLUDE_DIRS)

examples/pxScene2d/src/mkapp.sh

@@ -67,13 +67,19 @@ ${minJS} shell.js $bundleRes/shell.js
 ${minJS} browser.js $bundleRes/browser.js
 ${minJS} about.js $bundleRes/about.js
 ${minJS} browser/editbox.js $bundleRes/browser/editbox.js
+${minJS} test_binding.js $bundleRes/test_binding.js
+${minJS} test_module_loading.js $bundleRes/test_module_loading.js
+${minJS} test_promises.js $bundleRes/test_promises.js
 #./jsMinFolder.sh browser $bundleRes/browser
 
 
 # Copy duktape modules
 cp -a duk_modules $bundleRes/duk_modules
 # Copy node modules
 cp -a node_modules $bundleRes/node_modules
+# Copy v8 modules
+cp -a v8_modules $bundleRes/v8_modules
+
 
 # Copy OTHER to Resources...
 #

src/rtScriptV8/rtScriptV8.cpp

@@ -591,12 +591,12 @@ Local<Value> rtV8Context::loadV8Module(const rtString &name)
 
 static void requireCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-  assert(args.Data()->isExternal());
+  assert(args.Data()->IsExternal());
   v8::External *val = v8::External::Cast(*args.Data());
   assert(val != NULL);
   rtV8Context *ctx = (rtV8Context *)val->Value();
   assert(args.Length() == 1);
-  assert(args[0].IsString());
+  assert(args[0]->IsString());
 
   rtString moduleName = toString(args[0]->ToString());
   args.GetReturnValue().Set(ctx->loadV8Module(moduleName));

src/rtScriptV8/rtWrapperUtils.cpp

@@ -135,6 +135,8 @@ HandleMap::clearAllForContext(uint32_t contextId)
 
 void HandleMap::addWeakReference(v8::Isolate* isolate, const rtObjectRef& from, Local<Object>& to)
 {
+    // TODO
+#if 0
   HandleScope handleScope(isolate);
   Local<Context> creationContext = to->CreationContext();
 
@@ -161,6 +163,7 @@ void HandleMap::addWeakReference(v8::Isolate* isolate, const rtObjectRef& from,
     objectMap.insert(std::make_pair(from.getPtr(), entry));
   }
 rtWrapperSceneUpdateExit();
+#endif
 
   #if 0
   static FILE* f = NULL;