chakrashim,src,test: fix build issues

Chakra changes
* Removed the "inspector" subdirectory from chakrashim
* Integrated inspector build into chakrashim.gyp
* Enabled native inspector tests
* Cleaned up the node.gyp/node.gypi files
* Updated regexes in test-repl.js for Chakra
* Added flaky-tests parameter in Makefile

V8 changes
* Fixed node.gyp file issue related to upstream inspector refactor
* Fixed env-inl.h to build correctly for both V8 and Linux
* Fixed test issue in test-repl.js for V8

PR-URL: #241
Reviewed-By: Sandeep Agarwal <saagarwa@microsoft.com>
Reviewed-By: Kunal Pathak <Kunal.Pathak@microsoft.com>

Makefile

@@ -195,7 +195,7 @@ test: all
 	$(MAKE) build-addons
 	$(MAKE) build-addons-napi
 	$(MAKE) cctest
-	$(PYTHON) tools/test.py --mode=release -J \
+	$(PYTHON) tools/test.py --mode=release --flaky-tests=$(FLAKY_TESTS) -J \
 		doctool inspector known_issues message pseudo-tty parallel sequential $(CI_NATIVE_SUITES)
 	$(MAKE) lint
 

deps/chakrashim/chakrashim.gyp

@@ -5,8 +5,11 @@
       'lib/chakra_debug.js',
       'lib/chakra_inspector.js'
     ],
+    'v8_enable_inspector%': 0,
   },
-
+  'includes': [
+    'src/inspector/inspector.gypi'
+  ],
   'targets': [
     {
       'target_name': 'chakrashim',
@@ -48,6 +51,14 @@
             'OTHER_CFLAGS': [ '-fexceptions' ],
           },
         }],
+        ['v8_enable_inspector==1', {
+          'sources': [
+            '<@(inspector_all_sources)'
+          ],
+          'dependencies': [
+            'src/inspector/inspector.gyp:protocol_generated_sources',
+          ],
+        }],
       ],
       'msvs_use_library_dependency_inputs': 1,
 

deps/chakrashim/include/v8.h

@@ -693,11 +693,6 @@ class Global : public PersistentBase<T> {
     other._weakWrapper = nullptr;
   }
 
-  template <class S>
-  static Global<S> New(Isolate* isolate, Local<S> that) {
-    return Global<S>(isolate, that);
-  }
-
   V8_INLINE ~Global() { this->Reset(); }
 
   template <class S>

deps/chakrashim/inspector/src/inspector/inspector.gyp → deps/chakrashim/src/inspector/inspector.gyp

@@ -4,15 +4,22 @@
 
 {
   'variables': {
-    'protocol_path': '../../third_party/WebKit/Source/platform/inspector_protocol',
+    'protocol_path': '../../third_party/inspector_protocol',
   },
   'includes': [
     'inspector.gypi',
-    '../../third_party/WebKit/Source/platform/inspector_protocol/inspector_protocol.gypi',
+    '<(PRODUCT_DIR)/../../../third_party/inspector_protocol/inspector_protocol.gypi',
   ],
   'targets': [
     { 'target_name': 'protocol_compatibility',
       'type': 'none',
+      'conditions': [
+        ['want_separate_host_toolset==1', {
+          'toolsets': ['host', 'target'],
+        }, {
+          'toolsets': ['target'],
+        }]
+      ],
       'actions': [
         {
           'action_name': 'protocol_compatibility',
@@ -35,6 +42,13 @@
     { 'target_name': 'protocol_generated_sources',
       'type': 'none',
       'dependencies': [ 'protocol_compatibility' ],
+      'conditions': [
+        ['want_separate_host_toolset==1', {
+          'toolsets': ['host', 'target'],
+        }, {
+          'toolsets': ['target'],
+        }]
+      ],
       'actions': [
         {
           'action_name': 'protocol_generated_sources',
@@ -57,24 +71,5 @@
         },
       ]
     },
-    {
-      'target_name': 'standalone_inspector',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/include',
-        '../../include',
-        '../..',
-        '../../../'
-      ],
-      'sources': [
-        '<@(inspector_all_sources)'
-      ],
-      'dependencies': [
-        'protocol_generated_sources',
-        '../../../chakracore.gyp:chakracore#host',
-        '../../../chakrashim.gyp:chakrashim',
-      ],
-    },
   ],
 }

deps/chakrashim/src/inspector/inspector.gypi

@@ -0,0 +1,72 @@
+# Copyright 2016 the V8 project authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'inspector_generated_sources': [
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Forward.h',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Protocol.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Protocol.h',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Console.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Console.h',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Debugger.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Debugger.h',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Runtime.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Runtime.h',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Schema.cpp',
+      '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Schema.h',
+      '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Debugger.h',
+      '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Runtime.h',
+      '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Schema.h',
+    ],
+
+    'inspector_all_sources': [
+      '<@(inspector_generated_sources)',
+      'include/v8-inspector.h',
+      'include/v8-inspector-protocol.h',
+      'src/inspector/inspected-context.cc',
+      'src/inspector/inspected-context.h',
+      'src/inspector/java-script-call-frame.cc',
+      'src/inspector/java-script-call-frame.h',
+      'src/inspector/protocol-platform.h',
+      'src/inspector/script-breakpoint.h',
+      'src/inspector/search-util.cc',
+      'src/inspector/search-util.h',
+      'src/inspector/string-16.cc',
+      'src/inspector/string-16.h',
+      'src/inspector/string-util.cc',
+      'src/inspector/string-util.h',
+      'src/inspector/v8-console.cc',
+      'src/inspector/v8-console.h',
+      'src/inspector/v8-console-agent-impl.cc',
+      'src/inspector/v8-console-agent-impl.h',
+      'src/inspector/v8-console-message.cc',
+      'src/inspector/v8-console-message.h',
+      'src/inspector/v8-debugger.cc',
+      'src/inspector/v8-debugger.h',
+      'src/inspector/v8-debugger-agent-impl.cc',
+      'src/inspector/v8-debugger-agent-impl.h',
+      'src/inspector/v8-debugger-script.cc',
+      'src/inspector/v8-debugger-script.h',
+      'src/inspector/v8-function-call.cc',
+      'src/inspector/v8-function-call.h',
+      'src/inspector/v8-inspector-impl.cc',
+      'src/inspector/v8-inspector-impl.h',
+      'src/inspector/v8-inspector-session-impl.cc',
+      'src/inspector/v8-inspector-session-impl.h',
+      'src/inspector/v8-internal-value-type.cc',
+      'src/inspector/v8-internal-value-type.h',
+      'src/inspector/v8-regex.cc',
+      'src/inspector/v8-regex.h',
+      'src/inspector/v8-runtime-agent-impl.cc',
+      'src/inspector/v8-runtime-agent-impl.h',
+      'src/inspector/v8-schema-agent-impl.cc',
+      'src/inspector/v8-schema-agent-impl.h',
+      'src/inspector/v8-stack-trace-impl.cc',
+      'src/inspector/v8-stack-trace-impl.h',
+      'src/inspector/v8-value-copier.cc',
+      'src/inspector/v8-value-copier.h',
+    ]
+  }
+}

deps/chakrashim/third_party/README.md

@@ -0,0 +1,7 @@
+V8 Inspector support for Node.js
+================================
+
+* inspector_protocol: vendored from https://chromium.googlesource.com/chromium/src/third_party/WebKit/Source/platform/inspector_protocol
+* jinja2: vendored from https://github.com/mitsuhiko/jinja2
+  * The `tests/` directory `ext/jinja.el` file have been deleted.
+* markupsafe: vendored from https://github.com/mitsuhiko/markupsafe

node.gyp

@@ -382,7 +382,7 @@
               'conditions': [
                 [ 'node_engine=="chakracore"', {
                   'inputs': [
-                    'deps/chakrashim/inspector/src/inspector/js_protocol.json',
+                    'deps/chakrashim/src/inspector/js_protocol.json',
                   ],
                 }, {
                   'inputs': [
@@ -662,34 +662,6 @@
             'deps/v8/include'
           ],
           'conditions' : [
-            ['v8_enable_inspector==1', {
-              'sources': [
-                'test/cctest/test_inspector_socket.cc',
-                'test/cctest/test_inspector_socket_server.cc'
-              ],
-              'conditions': [
-                [ 'node_shared_zlib=="false"', {
-                  'dependencies': [
-                    'deps/zlib/zlib.gyp:zlib',
-                  ]
-                }],
-                [ 'node_shared_openssl=="false"', {
-                  'dependencies': [
-                    'deps/openssl/openssl.gyp:openssl'
-                  ]
-                }],
-                [ 'node_shared_http_parser=="false"', {
-                  'dependencies': [
-                    'deps/http_parser/http_parser.gyp:http_parser'
-                  ]
-                }],
-                [ 'node_shared_libuv=="false"', {
-                  'dependencies': [
-                    'deps/uv/uv.gyp:libuv'
-                  ]
-                }]
-              ]
-            }],
             ['node_use_v8_platform=="true"', {
               'dependencies': [
                 'deps/v8/src/v8.gyp:v8_libplatform',
@@ -699,12 +671,40 @@
         }],
         ['node_engine=="chakracore"', {
           'include_dirs': [
-            'deps/chakrashim' # include/v8_platform.h
+            'deps/chakrashim/include'
           ],
           'sources!': [
             'test/cctest/test_environment.cc', # TODO: Enable these test for node-chakracore
           ]
         }],
+        ['v8_enable_inspector==1', {
+          'sources': [
+            'test/cctest/test_inspector_socket.cc',
+            'test/cctest/test_inspector_socket_server.cc'
+          ],
+          'conditions': [
+            [ 'node_shared_zlib=="false"', {
+              'dependencies': [
+                'deps/zlib/zlib.gyp:zlib',
+              ]
+            }],
+            [ 'node_shared_openssl=="false"', {
+              'dependencies': [
+                'deps/openssl/openssl.gyp:openssl'
+              ]
+            }],
+            [ 'node_shared_http_parser=="false"', {
+              'dependencies': [
+                'deps/http_parser/http_parser.gyp:http_parser'
+              ]
+            }],
+            [ 'node_shared_libuv=="false"', {
+              'dependencies': [
+                'deps/uv/uv.gyp:libuv'
+              ]
+            }]
+          ]
+        }],
         [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', {
           'copies': [{
             'destination': '<(OBJ_DIR)/cctest/src',