| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file | 1 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file | 
| 2 # for details. All rights reserved. Use of this source code is governed by a | 2 # for details. All rights reserved. Use of this source code is governed by a | 
| 3 # BSD-style license that can be found in the LICENSE file. | 3 # BSD-style license that can be found in the LICENSE file. | 
| 4 | 4 | 
| 5 { | 5 { | 
| 6   'variables': { | 6   'variables': { | 
| 7     'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)', | 7     'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)', | 
| 8     'libgen_in_cc_file': '../lib/libgen_in.cc', | 8     'libgen_in_cc_file': '../lib/libgen_in.cc', | 
| 9     'builtin_in_cc_file': '../bin/builtin_in.cc', | 9     'builtin_in_cc_file': '../bin/builtin_in.cc', | 
| 10     'async_cc_file': '<(gen_source_dir)/async_gen.cc', | 10     'async_cc_file': '<(gen_source_dir)/async_gen.cc', | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 23     'isolate_patch_cc_file': '<(gen_source_dir)/isolate_patch_gen.cc', | 23     'isolate_patch_cc_file': '<(gen_source_dir)/isolate_patch_gen.cc', | 
| 24     'math_cc_file': '<(gen_source_dir)/math_gen.cc', | 24     'math_cc_file': '<(gen_source_dir)/math_gen.cc', | 
| 25     'math_patch_cc_file': '<(gen_source_dir)/math_patch_gen.cc', | 25     'math_patch_cc_file': '<(gen_source_dir)/math_patch_gen.cc', | 
| 26     'mirrors_cc_file': '<(gen_source_dir)/mirrors_gen.cc', | 26     'mirrors_cc_file': '<(gen_source_dir)/mirrors_gen.cc', | 
| 27     'mirrors_patch_cc_file': '<(gen_source_dir)/mirrors_patch_gen.cc', | 27     'mirrors_patch_cc_file': '<(gen_source_dir)/mirrors_patch_gen.cc', | 
| 28     'profiler_cc_file': '<(gen_source_dir)/profiler_gen.cc', | 28     'profiler_cc_file': '<(gen_source_dir)/profiler_gen.cc', | 
| 29     'snapshot_test_dat_file': '<(gen_source_dir)/snapshot_test.dat', | 29     'snapshot_test_dat_file': '<(gen_source_dir)/snapshot_test.dat', | 
| 30     'snapshot_test_in_dat_file': 'snapshot_test_in.dat', | 30     'snapshot_test_in_dat_file': 'snapshot_test_in.dat', | 
| 31     'snapshot_test_dart_file': 'snapshot_test.dart', | 31     'snapshot_test_dart_file': 'snapshot_test.dart', | 
| 32     'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc', | 32     'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc', | 
|  | 33     'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc', | 
| 33     'vmservice_cc_file': '<(gen_source_dir)/vmservice_gen.cc', | 34     'vmservice_cc_file': '<(gen_source_dir)/vmservice_gen.cc', | 
| 34     'vmservice_patch_cc_file': '<(gen_source_dir)/vmservice_patch_gen.cc', | 35     'vmservice_patch_cc_file': '<(gen_source_dir)/vmservice_patch_gen.cc', | 
| 35   }, | 36   }, | 
| 36   'targets': [ | 37   'targets': [ | 
| 37     { | 38     { | 
| 38       'target_name': 'libdart_vm', | 39       'target_name': 'libdart_vm', | 
| 39       'type': 'static_library', | 40       'type': 'static_library', | 
| 40       'toolsets':['host', 'target'], | 41       'toolsets':['host', 'target'], | 
| 41       'includes': [ | 42       'includes': [ | 
| 42         'vm_sources.gypi', | 43         'vm_sources.gypi', | 
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 226         'generate_internal_cc_file#host', | 227         'generate_internal_cc_file#host', | 
| 227         'generate_internal_patch_cc_file#host', | 228         'generate_internal_patch_cc_file#host', | 
| 228         'generate_isolate_cc_file#host', | 229         'generate_isolate_cc_file#host', | 
| 229         'generate_isolate_patch_cc_file#host', | 230         'generate_isolate_patch_cc_file#host', | 
| 230         'generate_math_cc_file#host', | 231         'generate_math_cc_file#host', | 
| 231         'generate_math_patch_cc_file#host', | 232         'generate_math_patch_cc_file#host', | 
| 232         'generate_mirrors_cc_file#host', | 233         'generate_mirrors_cc_file#host', | 
| 233         'generate_mirrors_patch_cc_file#host', | 234         'generate_mirrors_patch_cc_file#host', | 
| 234         'generate_profiler_cc_file#host', | 235         'generate_profiler_cc_file#host', | 
| 235         'generate_typed_data_cc_file#host', | 236         'generate_typed_data_cc_file#host', | 
|  | 237         'generate_typed_data_patch_cc_file#host', | 
| 236         'generate_vmservice_cc_file#host', | 238         'generate_vmservice_cc_file#host', | 
| 237         'generate_vmservice_patch_cc_file#host', | 239         'generate_vmservice_patch_cc_file#host', | 
| 238       ], | 240       ], | 
| 239       'includes': [ | 241       'includes': [ | 
| 240         '../lib/async_sources.gypi', | 242         '../lib/async_sources.gypi', | 
| 241         '../lib/collection_sources.gypi', | 243         '../lib/collection_sources.gypi', | 
| 242         '../lib/core_sources.gypi', | 244         '../lib/core_sources.gypi', | 
| 243         '../lib/developer_sources.gypi', | 245         '../lib/developer_sources.gypi', | 
| 244         '../lib/internal_sources.gypi', | 246         '../lib/internal_sources.gypi', | 
| 245         '../lib/isolate_sources.gypi', | 247         '../lib/isolate_sources.gypi', | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 264         '<(internal_cc_file)', | 266         '<(internal_cc_file)', | 
| 265         '<(internal_patch_cc_file)', | 267         '<(internal_patch_cc_file)', | 
| 266         '<(isolate_cc_file)', | 268         '<(isolate_cc_file)', | 
| 267         '<(isolate_patch_cc_file)', | 269         '<(isolate_patch_cc_file)', | 
| 268         '<(math_cc_file)', | 270         '<(math_cc_file)', | 
| 269         '<(math_patch_cc_file)', | 271         '<(math_patch_cc_file)', | 
| 270         '<(mirrors_cc_file)', | 272         '<(mirrors_cc_file)', | 
| 271         '<(mirrors_patch_cc_file)', | 273         '<(mirrors_patch_cc_file)', | 
| 272         '<(profiler_cc_file)', | 274         '<(profiler_cc_file)', | 
| 273         '<(typed_data_cc_file)', | 275         '<(typed_data_cc_file)', | 
|  | 276         '<(typed_data_patch_cc_file)', | 
| 274         '<(vmservice_cc_file)', | 277         '<(vmservice_cc_file)', | 
| 275         '<(vmservice_patch_cc_file)', | 278         '<(vmservice_patch_cc_file)', | 
| 276       ], | 279       ], | 
| 277       'include_dirs': [ | 280       'include_dirs': [ | 
| 278         '..', | 281         '..', | 
| 279       ], | 282       ], | 
| 280     }, | 283     }, | 
| 281     { | 284     { | 
| 282       'target_name': 'libdart_lib', | 285       'target_name': 'libdart_lib', | 
| 283       'type': 'static_library', | 286       'type': 'static_library', | 
| (...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 960             '--include', 'vm/bootstrap.h', | 963             '--include', 'vm/bootstrap.h', | 
| 961             '--var_name', 'dart::Bootstrap::mirrors_patch_paths_', | 964             '--var_name', 'dart::Bootstrap::mirrors_patch_paths_', | 
| 962             '--library_name', 'dart:mirrors', | 965             '--library_name', 'dart:mirrors', | 
| 963             '<@(_sources)', | 966             '<@(_sources)', | 
| 964           ], | 967           ], | 
| 965           'message': 'Generating ''<(mirrors_patch_cc_file)'' file.' | 968           'message': 'Generating ''<(mirrors_patch_cc_file)'' file.' | 
| 966         }, | 969         }, | 
| 967       ] | 970       ] | 
| 968     }, | 971     }, | 
| 969     { | 972     { | 
| 970       # Unlike the other libraries in the SDK, dart:typed_data is not |  | 
| 971       # implemented as a patch applied to the base SDK implementation. |  | 
| 972       # Instead the VM has a complete replacement library and the |  | 
| 973       # implementation in the SDK is ignored. |  | 
| 974       'target_name': 'generate_typed_data_cc_file', | 973       'target_name': 'generate_typed_data_cc_file', | 
| 975       'type': 'none', | 974       'type': 'none', | 
| 976       'toolsets':['host'], | 975       'toolsets':['host'], | 
| 977       'includes': [ | 976       'includes': [ | 
| 978         # Load the runtime implementation sources. | 977         # Load the runtime implementation sources. | 
| 979         '../lib/typed_data_sources.gypi', | 978         '../../sdk/lib/typed_data/typed_data_sources.gypi', | 
| 980       ], | 979       ], | 
| 981       'sources/': [ | 980       'sources/': [ | 
| 982         # Exclude all .[cc|h] files. | 981         # Exclude all .[cc|h] files. | 
| 983         # This is only here for reference. Excludes happen after | 982         # This is only here for reference. Excludes happen after | 
| 984         # variable expansion, so the script has to do its own | 983         # variable expansion, so the script has to do its own | 
| 985         # exclude processing of the sources being passed. | 984         # exclude processing of the sources being passed. | 
| 986         ['exclude', '\\.cc|h$'], | 985         ['exclude', '\\.cc|h$'], | 
| 987       ], | 986       ], | 
| 988       'actions': [ | 987       'actions': [ | 
| 989         { | 988         { | 
| (...skipping 14 matching lines...) Expand all  Loading... | 
| 1004             '--include', 'vm/bootstrap.h', | 1003             '--include', 'vm/bootstrap.h', | 
| 1005             '--var_name', 'dart::Bootstrap::typed_data_source_paths_', | 1004             '--var_name', 'dart::Bootstrap::typed_data_source_paths_', | 
| 1006             '--library_name', 'dart:typed_data', | 1005             '--library_name', 'dart:typed_data', | 
| 1007             '<@(_sources)', | 1006             '<@(_sources)', | 
| 1008           ], | 1007           ], | 
| 1009           'message': 'Generating ''<(typed_data_cc_file)'' file.' | 1008           'message': 'Generating ''<(typed_data_cc_file)'' file.' | 
| 1010         }, | 1009         }, | 
| 1011       ] | 1010       ] | 
| 1012     }, | 1011     }, | 
| 1013     { | 1012     { | 
|  | 1013       'target_name': 'generate_typed_data_patch_cc_file', | 
|  | 1014       'type': 'none', | 
|  | 1015       'toolsets':['host'], | 
|  | 1016       'includes': [ | 
|  | 1017         # Load the patch sources. | 
|  | 1018         '../lib/typed_data_sources.gypi', | 
|  | 1019       ], | 
|  | 1020       'sources/': [ | 
|  | 1021         # Exclude all .[cc|h] files. | 
|  | 1022         # This is only here for reference. Excludes happen after | 
|  | 1023         # variable expansion, so the script has to do its own | 
|  | 1024         # exclude processing of the sources being passed. | 
|  | 1025         ['exclude', '\\.cc|h$'], | 
|  | 1026       ], | 
|  | 1027       'actions': [ | 
|  | 1028         { | 
|  | 1029           'action_name': 'generate_typed_data_patch_cc', | 
|  | 1030           'inputs': [ | 
|  | 1031             '../tools/gen_library_src_paths.py', | 
|  | 1032             '<(libgen_in_cc_file)', | 
|  | 1033             '<@(_sources)', | 
|  | 1034           ], | 
|  | 1035           'outputs': [ | 
|  | 1036             '<(typed_data_patch_cc_file)', | 
|  | 1037           ], | 
|  | 1038           'action': [ | 
|  | 1039             'python', | 
|  | 1040             'tools/gen_library_src_paths.py', | 
|  | 1041             '--output', '<(typed_data_patch_cc_file)', | 
|  | 1042             '--input_cc', '<(libgen_in_cc_file)', | 
|  | 1043             '--include', 'vm/bootstrap.h', | 
|  | 1044             '--var_name', 'dart::Bootstrap::typed_data_patch_paths_', | 
|  | 1045             '--library_name', 'dart:typed_data', | 
|  | 1046             '<@(_sources)', | 
|  | 1047           ], | 
|  | 1048           'message': 'Generating ''<(typed_data_patch_cc_file)'' file.' | 
|  | 1049         }, | 
|  | 1050       ] | 
|  | 1051     }, | 
|  | 1052     { | 
| 1014       'target_name': 'generate_profiler_cc_file', | 1053       'target_name': 'generate_profiler_cc_file', | 
| 1015       'type': 'none', | 1054       'type': 'none', | 
| 1016       'toolsets':['host'], | 1055       'toolsets':['host'], | 
| 1017       'includes': [ | 1056       'includes': [ | 
| 1018         # Load the shared library sources. | 1057         # Load the shared library sources. | 
| 1019         '../../sdk/lib/profiler/profiler_sources.gypi', | 1058         '../../sdk/lib/profiler/profiler_sources.gypi', | 
| 1020       ], | 1059       ], | 
| 1021       'sources/': [ | 1060       'sources/': [ | 
| 1022         # Exclude all .[cc|h] files. | 1061         # Exclude all .[cc|h] files. | 
| 1023         # This is only here for reference. Excludes happen after | 1062         # This is only here for reference. Excludes happen after | 
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1248         'generate_collection_library_patch', | 1287         'generate_collection_library_patch', | 
| 1249         'generate_convert_library_patch', | 1288         'generate_convert_library_patch', | 
| 1250         'generate_core_library_patch', | 1289         'generate_core_library_patch', | 
| 1251         'generate_developer_library_patch', | 1290         'generate_developer_library_patch', | 
| 1252         'generate_internal_library_patch', | 1291         'generate_internal_library_patch', | 
| 1253         'generate_io_library_patch', | 1292         'generate_io_library_patch', | 
| 1254         'generate_isolate_library_patch', | 1293         'generate_isolate_library_patch', | 
| 1255         'generate_math_library_patch', | 1294         'generate_math_library_patch', | 
| 1256         'generate_mirrors_library_patch', | 1295         'generate_mirrors_library_patch', | 
| 1257         'generate_profiler_library_patch', | 1296         'generate_profiler_library_patch', | 
|  | 1297         'generate_typed_data_library_patch', | 
| 1258         'generate_vmservice_library_patch', | 1298         'generate_vmservice_library_patch', | 
| 1259       ], | 1299       ], | 
| 1260       'actions': [ | 1300       'actions': [ | 
| 1261         { | 1301         { | 
| 1262           'action_name': 'patch_sdk', | 1302           'action_name': 'patch_sdk', | 
| 1263           'inputs': [ | 1303           'inputs': [ | 
| 1264             '<!@(["python", "../tools/list_files.py", "relative",' | 1304             '<!@(["python", "../tools/list_files.py", "relative",' | 
| 1265                   '"dart$", "sdk/lib"])', | 1305                   '"dart$", "sdk/lib"])', | 
| 1266             '../../tools/patch_sdk.py', | 1306             '../../tools/patch_sdk.py', | 
| 1267             '../../tools/patch_sdk.dart', | 1307             '../../tools/patch_sdk.dart', | 
| 1268             # Unlike the other libraries in the SDK, dart:typed_data is not |  | 
| 1269             # implemented as a patch applied to the base SDK implementation. |  | 
| 1270             # Instead the VM has a complete replacement library and the |  | 
| 1271             # implementation in the SDK is ignored. |  | 
| 1272             '../lib/typed_data.dart', |  | 
| 1273             # Unlike the other libraries in the SDK, dart:_builtin and | 1308             # Unlike the other libraries in the SDK, dart:_builtin and | 
| 1274             # dart:nativewrappers are only available for the Dart VM. | 1309             # dart:nativewrappers are only available for the Dart VM. | 
| 1275             '../bin/builtin.dart', | 1310             '../bin/builtin.dart', | 
| 1276             '../bin/vmservice/vmservice_io.dart', | 1311             '../bin/vmservice/vmservice_io.dart', | 
| 1277             '../bin/vmservice/loader.dart', | 1312             '../bin/vmservice/loader.dart', | 
| 1278             '../bin/vmservice/server.dart', | 1313             '../bin/vmservice/server.dart', | 
| 1279             '<(gen_source_dir)/patches/async_patch.dart', | 1314             '<(gen_source_dir)/patches/async_patch.dart', | 
| 1280             '<(gen_source_dir)/patches/collection_patch.dart', | 1315             '<(gen_source_dir)/patches/collection_patch.dart', | 
| 1281             '<(gen_source_dir)/patches/convert_patch.dart', | 1316             '<(gen_source_dir)/patches/convert_patch.dart', | 
| 1282             '<(gen_source_dir)/patches/core_patch.dart', | 1317             '<(gen_source_dir)/patches/core_patch.dart', | 
| 1283             '<(gen_source_dir)/patches/developer_patch.dart', | 1318             '<(gen_source_dir)/patches/developer_patch.dart', | 
| 1284             '<(gen_source_dir)/patches/internal_patch.dart', | 1319             '<(gen_source_dir)/patches/internal_patch.dart', | 
| 1285             '<(gen_source_dir)/patches/io_patch.dart', | 1320             '<(gen_source_dir)/patches/io_patch.dart', | 
| 1286             '<(gen_source_dir)/patches/isolate_patch.dart', | 1321             '<(gen_source_dir)/patches/isolate_patch.dart', | 
| 1287             '<(gen_source_dir)/patches/math_patch.dart', | 1322             '<(gen_source_dir)/patches/math_patch.dart', | 
| 1288             '<(gen_source_dir)/patches/mirrors_patch.dart', | 1323             '<(gen_source_dir)/patches/mirrors_patch.dart', | 
| 1289             '<(gen_source_dir)/patches/profiler_patch.dart', | 1324             '<(gen_source_dir)/patches/profiler_patch.dart', | 
|  | 1325             '<(gen_source_dir)/patches/typed_data_patch.dart', | 
| 1290             '<(gen_source_dir)/patches/vmservice_patch.dart', | 1326             '<(gen_source_dir)/patches/vmservice_patch.dart', | 
| 1291           ], | 1327           ], | 
| 1292           'outputs': [ | 1328           'outputs': [ | 
| 1293             # Instead of listing all outputs we list a single well-known one. | 1329             # Instead of listing all outputs we list a single well-known one. | 
| 1294             '<(PRODUCT_DIR)/patched_sdk/lib/core/core.dart', | 1330             '<(PRODUCT_DIR)/patched_sdk/lib/core/core.dart', | 
| 1295           ], | 1331           ], | 
| 1296           'action': [ | 1332           'action': [ | 
| 1297             'python', | 1333             'python', | 
| 1298             '../tools/patch_sdk.py', | 1334             '../tools/patch_sdk.py', | 
| 1299             '--dart-executable', | 1335             '--dart-executable', | 
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1653             '--output', | 1689             '--output', | 
| 1654             '<(gen_source_dir)/patches/<(library_name)_patch.dart', | 1690             '<(gen_source_dir)/patches/<(library_name)_patch.dart', | 
| 1655             '<@(_sources)', | 1691             '<@(_sources)', | 
| 1656           ], | 1692           ], | 
| 1657           'message': 'Generating <(library_uri) patch.', | 1693           'message': 'Generating <(library_uri) patch.', | 
| 1658         }, | 1694         }, | 
| 1659       ], | 1695       ], | 
| 1660     }, | 1696     }, | 
| 1661     { | 1697     { | 
| 1662       'variables': { | 1698       'variables': { | 
|  | 1699         'library_name': 'typed_data', | 
|  | 1700         'library_uri': 'dart:typed_data', | 
|  | 1701       }, | 
|  | 1702       'target_name': 'generate_<(library_name)_library_patch', | 
|  | 1703       'type': 'none', | 
|  | 1704       'toolsets': ['host'], | 
|  | 1705       'includes': [ | 
|  | 1706         '../lib/typed_data_sources.gypi', | 
|  | 1707       ], | 
|  | 1708       'actions': [ | 
|  | 1709         { | 
|  | 1710           'action_name': 'concatenate_<(library_name)_patches', | 
|  | 1711           'inputs': [ | 
|  | 1712             '../tools/concatenate_patches.py', | 
|  | 1713             '<@(_sources)', | 
|  | 1714           ], | 
|  | 1715           'outputs': [ | 
|  | 1716             '<(gen_source_dir)/patches/<(library_name)_patch.dart' | 
|  | 1717           ], | 
|  | 1718           'action': [ | 
|  | 1719             'python', | 
|  | 1720             'tools/concatenate_patches.py', | 
|  | 1721             '--output', | 
|  | 1722             '<(gen_source_dir)/patches/<(library_name)_patch.dart', | 
|  | 1723             '<@(_sources)', | 
|  | 1724           ], | 
|  | 1725           'message': 'Generating <(library_uri) patch.', | 
|  | 1726         }, | 
|  | 1727       ], | 
|  | 1728     }, | 
|  | 1729     { | 
|  | 1730       'variables': { | 
| 1663         'library_name': 'vmservice', | 1731         'library_name': 'vmservice', | 
| 1664         'library_uri': 'dart:_vmservice', | 1732         'library_uri': 'dart:_vmservice', | 
| 1665       }, | 1733       }, | 
| 1666       'target_name': 'generate_<(library_name)_library_patch', | 1734       'target_name': 'generate_<(library_name)_library_patch', | 
| 1667       'type': 'none', | 1735       'type': 'none', | 
| 1668       'toolsets': ['host'], | 1736       'toolsets': ['host'], | 
| 1669       'includes': [ | 1737       'includes': [ | 
| 1670         '../lib/vmservice_sources.gypi', | 1738         '../lib/vmservice_sources.gypi', | 
| 1671       ], | 1739       ], | 
| 1672       'actions': [ | 1740       'actions': [ | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 1685             '--output', | 1753             '--output', | 
| 1686             '<(gen_source_dir)/patches/<(library_name)_patch.dart', | 1754             '<(gen_source_dir)/patches/<(library_name)_patch.dart', | 
| 1687             '<@(_sources)', | 1755             '<@(_sources)', | 
| 1688           ], | 1756           ], | 
| 1689           'message': 'Generating <(library_uri) patch.', | 1757           'message': 'Generating <(library_uri) patch.', | 
| 1690         }, | 1758         }, | 
| 1691       ], | 1759       ], | 
| 1692     }, | 1760     }, | 
| 1693   ] | 1761   ] | 
| 1694 } | 1762 } | 
| OLD | NEW | 
|---|