Refactor the gypi files to eliminate some redundancy.

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',
     'snapshot_cc_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.cc',
     'cygwin_dir': '../../third_party/cygwin',
   },
   'targets': [
     {
       'target_name': 'generate_builtin_cc_file',
       'type': 'none',
       'conditions': [
         ['OS=="win"', {
           'msvs_cygwin_dirs': ['<(cygwin_dir)'],
         }],
       ],
       'sources': [
         'builtin.dart',

[Ivan Posva, 2011/12/01 22:19:31]

We should add those to the builtin_sources.gypi file instead.

[siva, 2011/12/01 23:03:25]

Done.

         'buffer_list.dart',
         'directory.dart',
         'directory_impl.dart',
         'eventhandler.dart',
         'file.dart',
         'file_impl.dart',
         'input_stream.dart',
         'output_stream.dart',
         'string_stream.dart',
         'platform.dart',
@@ skipping 33 matching lines @@
       'type': 'static_library',
       'dependencies': [
         'generate_builtin_cc_file',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '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',
-        'eventhandler_linux.h',
-        'eventhandler_macos.cc',
-        'eventhandler_macos.h',
-        'eventhandler_win.cc',
-        'eventhandler_win.h',
-        'file.cc',
-        'file.h',
-        'file_linux.cc',
-        'file_macos.cc',
-        'file_win.cc',
-        'fdutils.h',
-        'fdutils_linux.cc',
-        'fdutils_macos.cc',
-        'globals.h',
-        'platform.cc',
-        'platform.h',
-        'platform_linux.cc',
-        'platform_macos.cc',
-        'platform_win.cc',
-        'process.cc',
-        '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',
+      ],
+      'includes': [
+        'bin_sources.gypi',

[Ivan Posva, 2011/12/01 22:19:31]

builtin_sources.gypi? bin_sources I would expect to contain main.cc and similar.

[siva, 2011/12/01 23:03:25]

Done.

+      ],
+      'sources/': [
+        ['exclude', '_test\\.(cc|h)$'],
       ],
       '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_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_withcore',
         'libdart_builtin',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 73 matching lines @@
       'type': 'executable',
       'sources': [
         'process_test.cc',
       ]
     },
     {
       'target_name': 'run_vm_tests',
       'type': 'executable',
       'dependencies': [
         'libdart_withcore',
+        'libdart_builtin',
         'generate_snapshot_test_dat_file',
       ],
       'include_dirs': [
         '..',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'run_vm_tests.cc',
-        'dartutils.h',
-        'dartutils.cc',
-        'directory.h',
-        'directory.cc',
-        'directory_posix.cc',
-        'directory_win.cc',
-        'eventhandler.cc',
-        'eventhandler.h',
-        'eventhandler_linux.cc',
-        'eventhandler_linux.h',
-        'eventhandler_macos.cc',
-        'eventhandler_macos.h',
-        'eventhandler_win.cc',
-        'eventhandler_win.h',
-        'file.cc',
-        'file.h',
-        'file_test.cc',
-        'file_linux.cc',
-        'file_macos.cc',
-        'file_win.cc',
-        'fdutils.h',
-        'fdutils_linux.cc',
-        'fdutils_macos.cc',
-        'platform.cc',
-        'platform.h',
-        'platform_linux.cc',
-        'platform_macos.cc',
-        'platform_win.cc',
-        'process.cc',
-        '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',
-        'set_test.cc',
       ],
       'includes': [
+        'bin_sources.gypi',
         '../vm/vm_sources.gypi',
       ],
       'defines': [
         'TESTING',
       ],
       # Only include _test.[cc|h] files.
       'sources/': [
         ['exclude', '\\.(cc|h)$'],
         ['include', '_test\\.(cc|h)$'],
         ['include', 'run_vm_tests.cc'],
-        ['include', 'dart_api_impl.cc'],

[Ivan Posva, 2011/12/01 22:19:31]

Great cleanup!

-        ['include', 'dartutils.h'],
-        ['include', 'dartutils.cc'],
-        ['include', 'directory.h'],
-        ['include', 'directory.cc'],
-        ['include', 'eventhandler.cc'],
-        ['include', 'eventhandler.h'],
-        ['include', 'file.cc'],
-        ['include', 'file.h'],
-        ['include', 'file_test.cc'],
-        ['include', 'platform.cc'],
-        ['include', 'platform.h'],
-        ['include', 'process.cc'],
-        ['include', 'process.h'],
-        ['include', 'socket.cc'],
-        ['include', 'socket.h'],
-        ['include', 'set_test.cc'],
       ],
       'conditions': [
-        ['OS=="linux"', {'sources/' : [
-          ['include', 'directory_posix.cc'],
-          ['include', 'eventhandler_linux.cc'],
-          ['include', 'eventhandler_linux.h'],
-          ['include', 'fdutils.h'],
-          ['include', 'fdutils_linux.cc'],
-          ['include', 'file_linux.cc'],
-          ['include', 'platform_linux.cc'],
-          ['include', 'process_linux.cc'],
-          ['include', 'socket_linux.cc'],
-        ]}],
-        ['OS=="mac"', {'sources/' : [
-          ['include', 'directory_posix.cc'],
-          ['include', 'eventhandler_macos.cc'],
-          ['include', 'eventhandler_macos.h'],
-          ['include', 'fdutils.h'],
-          ['include', 'fdutils_macos.cc'],
-          ['include', 'file_macos.cc'],
-          ['include', 'platform_macos.cc'],
-          ['include', 'process_macos.cc'],
-          ['include', 'socket_macos.cc'],
-        ]}],
-        ['OS=="win"', {'sources/' : [
-          ['include', 'directory_win.cc'],
-          ['include', 'eventhandler_win.cc'],
-          ['include', 'eventhandler_win.h'],
-          ['include', 'file_win.cc'],
-          ['include', 'platform_win.cc'],
-          ['include', 'process_win.cc'],
-          ['include', 'socket_win.cc'],
-        ]}],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
         }],
       ],
     },
   ],
 }