obuild: update node.gyp to reference gypfiles/v8.gyp

[joyeecheung]

Refs: v8/v8@f9934aa
Fixes: #36

Also noticed that parallel/test-inspector-esm currently fails because the scope chain and the format of the responses from the inspector have changed.

Checklist

• make -j4 test (UNIX), or vcbuild test (Windows) passes
• commit message follows commit guidelines

Affected core subsystem(s)

[hashseed]

LGTM.

Also note that I already fixed parallel/test-inspector-esm on node/master. It was not due to the format of the inspector response, but because the scoping for modules changed in V8.

[targos]

@joyeecheung thanks, I was working on it yesterday but couldn't finish. I am unable to compile though, here is the error I get (with V8 lkgr):

... member /home/mzasso/git/nodejs/node-canary/out/Release/obj.target/v8_base/deps/v8/src/api.o in archive is not an object
collect2: error: ld returned 1 exit status

[targos]

diff --git a/Makefile b/Makefile
index f2ceb6e029..462fd283c9 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ $(NODE_G_EXE): config.gypi out/Makefile
 
 out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
               deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
-              deps/v8/gypfiles/features.gypi deps/v8/src/v8.gyp node.gyp \
+              deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
               config.gypi
        $(PYTHON) tools/gyp_node.py -f make
 
diff --git a/node.gypi b/node.gypi
index bc9db9b814..f1029f2571 100644
--- a/node.gypi
+++ b/node.gypi
@@ -86,7 +86,7 @@
        target_arch=="ia32" or target_arch=="x32")', {
       'defines': [ 'NODE_ENABLE_VTUNE_PROFILING' ],
       'dependencies': [
-        'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune'
+        'deps/v8/gypfiles/v8vtune.gyp:v8_vtune'
       ],
     }],
     [ 'node_no_browser_globals=="true"', {

@joyeecheung I'm adding this diff to your commit and trying to run CI

[targos]

CI: https://ci.nodejs.org/job/node-test-commit-node-v8/286/

[targos]

Error on CI: g++: error: /data/iojs/build/workspace/node-test-commit-linuxone/nodes/rhel72-s390x/out/Release/obj.target/deps/v8/src/libv8_base.a: No such file or directory

[hashseed]

I think you also need to change the paths in common.gypi since libv8_base.a is no longer in obj.target/deps/v8/src/, but instead in obj.target/deps/v8/gypfiles.

diff --git a/common.gypi b/common.gypi
index cdc11bd909..3a328129d2 100644
--- a/common.gypi
+++ b/common.gypi
@@ -45,14 +45,14 @@
     'conditions': [
       ['GENERATOR=="ninja"', {
         'OBJ_DIR': '<(PRODUCT_DIR)/obj',
-        'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/src/libv8_base.a',
+        'V8_BASE': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a',
        }, {
          'OBJ_DIR%': '<(PRODUCT_DIR)/obj.target',
          'conditions': [
            [ 'build_v8_with_gn=="true"', {
              'V8_BASE': '<(PRODUCT_DIR)/obj.target/v8_monolith/geni/gn/obj/libv8_monolith.a',
            }, {
-             'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/src/libv8_base.a',
+             'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/gypfiles/libv8_base.a',
            }],
          ],
       }],

[hashseed]

Err... that patch doesn't apply on your branch since it's for our vee-eight-lkgr.

[targos]

@hashseed thanks! new try: https://ci.nodejs.org/job/node-test-commit-node-v8/287/

[targos]

This is resolved!