Minor fixes

  - support changes to js2c in Visual Studio build
  - handle empty handles in Utf8Value
  - add /nologo to sample link in SCons build

TBR=plesner
Review URL: http://codereview.chromium.org/7816

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@538 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/SConstruct b/SConstruct
index 74aa56e6f0ee5dd6adff9e1e105d469dc4f623a4..6e5bc7a0ab6385288327d03b826f0145c836961b 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -197,6 +197,7 @@ SAMPLE_FLAGS = {
   'msvc': {
     'all': {
       'CCFLAGS': ['/nologo'],
+      'LINKFLAGS': ['/nologo'],
     },
     'library:shared': {
       'CPPDEFINES': ['USING_V8_SHARED']

diff --git a/src/api.cc b/src/api.cc
index ad82901c337b6443d7be4f08cfc07f9ce134cc04..a0b3c092ccbba225759d3e1a9fb8f24ecd5fe0f3 100644 (file)
--- a/src/api.cc
+++ b/src/api.cc
@@ -2623,6 +2623,11 @@ void V8::SetGlobalGCEpilogueCallback(GCCallback callback) {
 
 String::Utf8Value::Utf8Value(v8::Handle<v8::Value> obj) {
   EnsureInitialized("v8::String::Utf8Value::Utf8Value()");
+  if (obj.IsEmpty()) {
+    str_ = NULL;
+    length_ = 0;
+    return;
+  }
   HandleScope scope;
   TryCatch try_catch;
   Handle<String> str = obj->ToString();

diff --git a/tools/visual_studio/js2c.cmd b/tools/visual_studio/js2c.cmd
index 10df45e8b829a54e8b9c753972db62ee422ea82b..b6a46a2a6c47b4578fed840ffb05363c50b277af 100644 (file)
--- a/tools/visual_studio/js2c.cmd
+++ b/tools/visual_studio/js2c.cmd
@@ -3,4 +3,4 @@ set SOURCE_DIR=%1
 set TARGET_DIR=%2
 set PYTHON="..\..\..\third_party\python_24\python.exe"
 if not exist %PYTHON% set PYTHON=python.exe
-%PYTHON% ..\js2c.py %TARGET_DIR%\natives.cc %TARGET_DIR%\natives-empty.cc %SOURCE_DIR%\macros.py %SOURCE_DIR%\runtime.js %SOURCE_DIR%\v8natives.js %SOURCE_DIR%\array.js %SOURCE_DIR%\string.js %SOURCE_DIR%\uri.js %SOURCE_DIR%\math.js %SOURCE_DIR%\messages.js %SOURCE_DIR%\apinatives.js %SOURCE_DIR%\debug-delay.js %SOURCE_DIR%\mirror-delay.js %SOURCE_DIR%\date-delay.js %SOURCE_DIR%\regexp-delay.js
+%PYTHON% ..\js2c.py %TARGET_DIR%\natives.cc %TARGET_DIR%\natives-empty.cc CORE %SOURCE_DIR%\macros.py %SOURCE_DIR%\runtime.js %SOURCE_DIR%\v8natives.js %SOURCE_DIR%\array.js %SOURCE_DIR%\string.js %SOURCE_DIR%\uri.js %SOURCE_DIR%\math.js %SOURCE_DIR%\messages.js %SOURCE_DIR%\apinatives.js %SOURCE_DIR%\debug-delay.js %SOURCE_DIR%\mirror-delay.js %SOURCE_DIR%\date-delay.js %SOURCE_DIR%\regexp-delay.js