| Index: runtime/vm/vm.gypi
|
| diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi
|
| index 3b2e620dc82d7454bb0b68079ba0703fa79b70ac..a649535d8aea11ac59976b4d3535ffaae7fe7b87 100644
|
| --- a/runtime/vm/vm.gypi
|
| +++ b/runtime/vm/vm.gypi
|
| @@ -30,6 +30,8 @@
|
| 'snapshot_test_dart_file': 'snapshot_test.dart',
|
| 'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc',
|
| 'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc',
|
| + 'uri_cc_file': '<(gen_source_dir)/uri_gen.cc',
|
| + 'uri_patch_cc_file': '<(gen_source_dir)/uri_patch_gen.cc',
|
| 'vmservice_cc_file': '<(gen_source_dir)/vmservice_gen.cc',
|
| 'vmservice_patch_cc_file': '<(gen_source_dir)/vmservice_patch_gen.cc',
|
| },
|
| @@ -182,6 +184,8 @@
|
| 'generate_mirrors_patch_cc_file#host',
|
| 'generate_typed_data_cc_file#host',
|
| 'generate_typed_data_patch_cc_file#host',
|
| + 'generate_uri_cc_file#host',
|
| + 'generate_uri_patch_cc_file#host',
|
| 'generate_vmservice_cc_file#host',
|
| 'generate_vmservice_patch_cc_file#host',
|
| ],
|
| @@ -195,6 +199,7 @@
|
| '../lib/math_sources.gypi',
|
| '../lib/mirrors_sources.gypi',
|
| '../lib/typed_data_sources.gypi',
|
| + '../lib/uri_sources.gypi',
|
| '../lib/vmservice_sources.gypi',
|
| ],
|
| 'sources': [
|
| @@ -220,6 +225,8 @@
|
| '<(mirrors_patch_cc_file)',
|
| '<(typed_data_cc_file)',
|
| '<(typed_data_patch_cc_file)',
|
| + '<(uri_cc_file)',
|
| + '<(uri_patch_cc_file)',
|
| '<(vmservice_cc_file)',
|
| '<(vmservice_patch_cc_file)',
|
| ],
|
| @@ -241,6 +248,7 @@
|
| '../lib/math_sources.gypi',
|
| '../lib/mirrors_sources.gypi',
|
| '../lib/typed_data_sources.gypi',
|
| + '../lib/uri_sources.gypi',
|
| '../lib/vmservice_sources.gypi',
|
| ],
|
| 'sources': [
|
| @@ -262,7 +270,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -302,7 +310,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -342,7 +350,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -382,7 +390,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -422,7 +430,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -462,7 +470,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -502,7 +510,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -542,7 +550,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -582,7 +590,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -622,7 +630,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -662,7 +670,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -702,7 +710,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -742,7 +750,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -782,7 +790,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -822,7 +830,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -862,7 +870,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -902,7 +910,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -942,7 +950,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -982,7 +990,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -1010,6 +1018,86 @@
|
| ]
|
| },
|
| {
|
| + 'target_name': 'generate_uri_cc_file',
|
| + 'type': 'none',
|
| + 'toolsets':['host'],
|
| + 'includes': [
|
| + # Load the shared library sources.
|
| + '../../sdk/lib/uri/uri_sources.gypi',
|
| + ],
|
| + 'sources/': [
|
| + # Exclude all .[cc|h] files.
|
| + # This is only here for reference. Excludes happen after
|
| + # variable expansion, so the script has to do its own
|
| + # exclude processing of the sources being passed.
|
| + ['exclude', '\\.(cc|h)$'],
|
| + ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'generate_uri_cc',
|
| + 'inputs': [
|
| + '../tools/gen_library_src_paths.py',
|
| + '<(libgen_in_cc_file)',
|
| + '<@(_sources)',
|
| + ],
|
| + 'outputs': [
|
| + '<(uri_cc_file)',
|
| + ],
|
| + 'action': [
|
| + 'python',
|
| + 'tools/gen_library_src_paths.py',
|
| + '--output', '<(uri_cc_file)',
|
| + '--input_cc', '<(libgen_in_cc_file)',
|
| + '--include', 'vm/bootstrap.h',
|
| + '--var_name', 'dart::Bootstrap::uri_source_paths_',
|
| + '--library_name', 'dart:uri',
|
| + '<@(_sources)',
|
| + ],
|
| + 'message': 'Generating ''<(uri_cc_file)'' file.'
|
| + },
|
| + ]
|
| + },
|
| + {
|
| + 'target_name': 'generate_uri_patch_cc_file',
|
| + 'type': 'none',
|
| + 'toolsets':['host'],
|
| + 'includes': [
|
| + # Load the runtime implementation sources.
|
| + '../lib/uri_sources.gypi',
|
| + ],
|
| + 'sources/': [
|
| + # Exclude all .[cc|h] files.
|
| + # This is only here for reference. Excludes happen after
|
| + # variable expansion, so the script has to do its own
|
| + # exclude processing of the sources being passed.
|
| + ['exclude', '\\.(cc|h)$'],
|
| + ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'generate_uri_patch_cc',
|
| + 'inputs': [
|
| + '../tools/gen_library_src_paths.py',
|
| + '<(libgen_in_cc_file)',
|
| + '<@(_sources)',
|
| + ],
|
| + 'outputs': [
|
| + '<(uri_patch_cc_file)',
|
| + ],
|
| + 'action': [
|
| + 'python',
|
| + 'tools/gen_library_src_paths.py',
|
| + '--output', '<(uri_patch_cc_file)',
|
| + '--input_cc', '<(libgen_in_cc_file)',
|
| + '--include', 'vm/bootstrap.h',
|
| + '--var_name', 'dart::Bootstrap::uri_patch_paths_',
|
| + '--library_name', 'dart:uri',
|
| + '<@(_sources)',
|
| + ],
|
| + 'message': 'Generating ''<(uri_patch_cc_file)'' file.'
|
| + },
|
| + ]
|
| + },
|
| + {
|
| 'target_name': 'generate_developer_patch_cc_file',
|
| 'type': 'none',
|
| 'toolsets':['host'],
|
| @@ -1022,7 +1110,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -1090,7 +1178,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
| @@ -1130,7 +1218,7 @@
|
| # This is only here for reference. Excludes happen after
|
| # variable expansion, so the script has to do its own
|
| # exclude processing of the sources being passed.
|
| - ['exclude', '\\.cc|h$'],
|
| + ['exclude', '\\.(cc|h)$'],
|
| ],
|
| 'actions': [
|
| {
|
|
|