- Refactor the isolate callback mechanism to also include creation of the

bin/bin.gypi

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 {
   'variables': {
     'builtin_in_cc_file': 'builtin_in.cc',
     'builtin_cc_file': '<(SHARED_INTERMEDIATE_DIR)/builtin_gen.cc',
     'snapshot_in_cc_file': 'snapshot_in.cc',
     'snapshot_bin_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.bin',
@@ skipping 55 matching lines @@
     {
       'target_name': 'libdart_builtin',
       'type': 'static_library',
       'dependencies': [
         'generate_builtin_cc_file',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
-        'builtin.cc',
+        'builtin_natives.cc',
         'builtin.h',
         'dartutils.h',
         'dartutils.cc',
         'directory.h',
         'directory.cc',
         'directory_posix.cc',
         'directory_win.cc',
         'eventhandler.cc',
         'eventhandler.h',
         'eventhandler_linux.cc',
@@ skipping 20 matching lines @@
         'process.h',
         'process_linux.cc',
         'process_macos.cc',
         'process_win.cc',
         'socket.cc',
         'socket.h',
         'socket_linux.cc',
         'socket_macos.cc',
         'socket_win.cc',
         'set.h',
-        # Include generated source files.
-        '<(builtin_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {'sources/' : [
           ['exclude', 'fdutils.h'],
         ]}],
       ],
     },
     {
+      'target_name': 'libdart_withcore',
+      'type': 'static_library',
+      'dependencies': [
+        'libdart_lib_withcore',
+        'libdart_vm',
+        'libjscre',
+        'libdouble_conversion',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        '../include/dart_api.h',
+        '../vm/dart_api_impl.cc',
+      ],
+    },
+    {
       # Completely statically linked dart binary.
       'target_name': 'dart_no_snapshot',
       'type': 'executable',
       'dependencies': [
-        'libdart',
+        'libdart_withcore',
         'libdart_builtin',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
         'snapshot_empty.cc',
+        'builtin.cc',
+        # Include generated source files.
+        '<(builtin_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
        }]],
     },
     {
       # Completely statically linked binary for generating snapshots.
       'target_name': 'gen_snapshot',
       'type': 'executable',
       'dependencies': [
-        'libdart',
+        'libdart_withcore',
         'libdart_builtin',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'gen_snapshot.cc',
+        'builtin.cc',
+        # Include generated source files.
+        '<(builtin_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
        }]],
     },
     {
       # Generate snapshot file.
@@ skipping 36 matching lines @@
       'dependencies': [
         'libdart',
         'libdart_builtin',
         'generate_snapshot_file',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
+        'builtin_nolib.cc',
         '<(snapshot_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
        }]],
     },
     {
       'target_name': 'process_test',
       'type': 'executable',
       'sources': [
         'process_test.cc',
       ]
     },
     {
       'target_name': 'run_vm_tests',
       'type': 'executable',
       'dependencies': [
-        'libdart',
+        'libdart_withcore',
         'generate_snapshot_test_dat_file',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'run_vm_tests.cc',
         'dartutils.h',
         'dartutils.cc',
@@ skipping 99 matching lines @@
         ]}],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
         }],
       ],
     },
   ],
 }