build: fixes post merge

* node.gyp - Merged conditions for v8. * vcbuild.bat - added `--without-v8-platform --without-bundled-v8` if engine is chakra PR-URL: #89 Reviewed-By: Jianchun Xu <[email protected]>
nodejs · Jul 5, 2016 · c2ce832 · c2ce832
1 parent 93015ca
commit c2ce832
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/node.gyp b/node.gyp
@@ -780,24 +780,37 @@
             'deps/v8/tools/gyp/v8.gyp:v8',
             'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
           ],
+          'conditions' : [
+              ['v8_inspector=="true', {
+                'dependencies': [
+                    'deps/openssl/openssl.gyp:openssl',
+                    'deps/http_parser/http_parser.gyp:http_parser',
+                    'deps/uv/uv.gyp:libuv'
+                ],
+                'sources': [
+                    'src/inspector_socket.cc',
+                    'test/cctest/test_inspector_socket.cc'
+                ]
+              }],
+              ['node_use_v8_platform=="true"', {
+                 'dependencies': [
+                    'deps/v8/tools/gyp/v8.gyp:v8_libplatform',
+                ],
+              }],
+              ['node_use_bundled_v8=="true"', {
+                'dependencies': [
+                    'deps/v8/tools/gyp/v8.gyp:v8',
+                    'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
+                ],
+              }],
+          ]
         }],
         ['node_engine=="chakracore"', {
           'dependencies': [ 
              'deps/chakrashim/chakrashim.gyp:chakrashim',
              'deps/uv/uv.gyp:libuv'
           ],
         }],
-        [ 'v8_inspector=="true" and node_engine=="v8"', {
-          'dependencies': [
-            'deps/openssl/openssl.gyp:openssl',
-            'deps/http_parser/http_parser.gyp:http_parser',
-            'deps/uv/uv.gyp:libuv'
-          ],
-          'sources': [
-            'src/inspector_socket.cc',
-            'test/cctest/test_inspector_socket.cc'
-          ]
-        }]
       ],
       'msvs_settings': {
         'VCLinkerTool': {
@@ -817,17 +830,6 @@
       'sources': [
         'test/cctest/util.cc',
       ],
-        [ 'node_use_v8_platform=="true"', {
-          'dependencies': [
-            'deps/v8/tools/gyp/v8.gyp:v8_libplatform',
-          ],
-        }],
-        [ 'node_use_bundled_v8=="true"', {
-          'dependencies': [
-            'deps/v8/tools/gyp/v8.gyp:v8',
-            'deps/v8/tools/gyp/v8.gyp:v8_libplatform'
-          ],
-        }],
     }
   ], # end targets
 

diff --git a/vcbuild.bat b/vcbuild.bat
@@ -117,7 +117,7 @@ if "%i18n_arg%"=="full-icu" set configure_flags=%configure_flags% --with-intl=fu
 if "%i18n_arg%"=="small-icu" set configure_flags=%configure_flags% --with-intl=small-icu
 if "%i18n_arg%"=="intl-none" set configure_flags=%configure_flags% --with-intl=none
 if "%i18n_arg%"=="without-intl" set configure_flags=%configure_flags% --without-intl
-if "%engine%"=="chakracore" set configure_flags=%configure_flags% --without-intl --without-inspector
+if "%engine%"=="chakracore" set configure_flags=%configure_flags% --without-intl --without-inspector --without-v8-platform --without-bundled-v8
 
 if defined config_flags set configure_flags=%configure_flags% %config_flags%