From 734beef0624a9b246e892c95ca0c301c5d318331 Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Mon, 14 Aug 2017 21:54:34 -0700 Subject: [PATCH] [infra] Translate _sources.gypi files to _sources.gni files Also deletes code that becomes dead as a result. R=rmacnak@google.com Review-Url: https://codereview.chromium.org/2996903002 . --- runtime/BUILD.gn | 16 +- runtime/bin/BUILD.gn | 36 +- runtime/bin/builtin_impl_sources.gni | 80 +++ runtime/bin/builtin_impl_sources.gypi | 78 --- ...iltin_sources.gypi => builtin_sources.gni} | 8 +- runtime/bin/gypi_contents.gni | 43 -- runtime/bin/io_impl_sources.gni | 104 +++ runtime/bin/io_impl_sources.gypi | 106 --- runtime/bin/io_sources.gni | 20 + runtime/bin/io_sources.gypi | 22 - ...ice_sources.gypi => vmservice_sources.gni} | 14 +- runtime/lib/async_sources.gni | 12 + runtime/lib/async_sources.gypi | 14 - runtime/lib/collection_sources.gni | 11 + runtime/lib/collection_sources.gypi | 13 - ...nvert_sources.gypi => convert_sources.gni} | 8 +- runtime/lib/core_sources.gni | 57 ++ runtime/lib/core_sources.gypi | 59 -- runtime/lib/developer_sources.gni | 16 + runtime/lib/developer_sources.gypi | 19 - runtime/lib/internal_sources.gni | 14 + runtime/lib/internal_sources.gypi | 16 - ...olate_sources.gypi => isolate_sources.gni} | 14 +- .../{math_sources.gypi => math_sources.gni} | 12 +- runtime/lib/mirrors_sources.gni | 15 + runtime/lib/mirrors_sources.gypi | 17 - ...iler_sources.gypi => profiler_sources.gni} | 10 +- ...ta_sources.gypi => typed_data_sources.gni} | 15 +- ...ice_sources.gypi => vmservice_sources.gni} | 9 +- runtime/observatory/BUILD.gn | 11 +- runtime/observatory/observatory_sources.gni | 284 ++++++++ runtime/observatory/observatory_sources.gypi | 284 -------- runtime/observatory/update_sources.py | 44 +- runtime/platform/BUILD.gn | 34 + runtime/platform/platform_headers.gypi | 22 - runtime/platform/platform_sources.gni | 27 + runtime/platform/platform_sources.gypi | 15 - runtime/vm/BUILD.gn | 153 +++-- runtime/vm/gypi_contents.gni | 53 -- runtime/vm/service_sources.gypi | 15 - runtime/vm/vm_sources.gni | 561 ++++++++++++++++ runtime/vm/vm_sources.gypi | 560 ---------------- sdk/lib/async/async_sources.gni | 23 + sdk/lib/async/async_sources.gypi | 24 - sdk/lib/collection/collection_sources.gni | 23 + sdk/lib/collection/collection_sources.gypi | 24 - sdk/lib/convert/convert_sources.gni | 23 + sdk/lib/convert/convert_sources.gypi | 24 - sdk/lib/core/core_sources.gni | 42 ++ sdk/lib/core/core_sources.gypi | 43 -- sdk/lib/developer/developer_sources.gni | 13 + sdk/lib/developer/developer_sources.gypi | 14 - sdk/lib/internal/internal_sources.gni | 16 + sdk/lib/internal/internal_sources.gypi | 17 - sdk/lib/io/io_sources.gni | 42 ++ sdk/lib/io/io_sources.gypi | 43 -- sdk/lib/isolate/isolate_sources.gni | 10 + sdk/lib/isolate/isolate_sources.gypi | 11 - sdk/lib/math/math_sources.gni | 13 + sdk/lib/math/math_sources.gypi | 14 - sdk/lib/mirrors/mirrors_sources.gni | 8 + sdk/lib/mirrors/mirrors_sources.gypi | 10 - sdk/lib/profiler/profiler_sources.gni | 8 + sdk/lib/profiler/profiler_sources.gypi | 10 - sdk/lib/rules.gni | 59 -- sdk/lib/typed_data/typed_data_sources.gni | 8 + sdk/lib/typed_data/typed_data_sources.gypi | 10 - sdk/lib/vmservice/vmservice_sources.gni | 19 + sdk/lib/vmservice/vmservice_sources.gypi | 21 - third_party/tcmalloc/BUILD.gn | 9 +- third_party/tcmalloc/tcmalloc_sources.gni | 155 +++++ third_party/tcmalloc/tcmalloc_sources.gypi | 157 ----- tools/android_link.py | 162 ----- tools/build.py | 612 +----------------- tools/gypi_to_gn.py | 171 ----- tools/ninja.py | 8 +- tools/process_gypis.py | 69 -- 77 files changed, 1807 insertions(+), 3029 deletions(-) create mode 100644 runtime/bin/builtin_impl_sources.gni delete mode 100644 runtime/bin/builtin_impl_sources.gypi rename runtime/bin/{builtin_sources.gypi => builtin_sources.gni} (66%) delete mode 100644 runtime/bin/gypi_contents.gni create mode 100644 runtime/bin/io_impl_sources.gni delete mode 100644 runtime/bin/io_impl_sources.gypi create mode 100644 runtime/bin/io_sources.gni delete mode 100644 runtime/bin/io_sources.gypi rename runtime/bin/vmservice/{vmservice_sources.gypi => vmservice_sources.gni} (62%) create mode 100644 runtime/lib/async_sources.gni delete mode 100644 runtime/lib/async_sources.gypi create mode 100644 runtime/lib/collection_sources.gni delete mode 100644 runtime/lib/collection_sources.gypi rename runtime/lib/{convert_sources.gypi => convert_sources.gni} (56%) create mode 100644 runtime/lib/core_sources.gni delete mode 100644 runtime/lib/core_sources.gypi create mode 100644 runtime/lib/developer_sources.gni delete mode 100644 runtime/lib/developer_sources.gypi create mode 100644 runtime/lib/internal_sources.gni delete mode 100644 runtime/lib/internal_sources.gypi rename runtime/lib/{isolate_sources.gypi => isolate_sources.gni} (57%) rename runtime/lib/{math_sources.gypi => math_sources.gni} (54%) create mode 100644 runtime/lib/mirrors_sources.gni delete mode 100644 runtime/lib/mirrors_sources.gypi rename runtime/lib/{profiler_sources.gypi => profiler_sources.gni} (65%) rename runtime/lib/{typed_data_sources.gypi => typed_data_sources.gni} (55%) rename runtime/lib/{vmservice_sources.gypi => vmservice_sources.gni} (64%) create mode 100644 runtime/observatory/observatory_sources.gni delete mode 100644 runtime/observatory/observatory_sources.gypi create mode 100644 runtime/platform/BUILD.gn delete mode 100644 runtime/platform/platform_headers.gypi create mode 100644 runtime/platform/platform_sources.gni delete mode 100644 runtime/platform/platform_sources.gypi delete mode 100644 runtime/vm/gypi_contents.gni delete mode 100644 runtime/vm/service_sources.gypi create mode 100644 runtime/vm/vm_sources.gni delete mode 100644 runtime/vm/vm_sources.gypi create mode 100644 sdk/lib/async/async_sources.gni delete mode 100644 sdk/lib/async/async_sources.gypi create mode 100644 sdk/lib/collection/collection_sources.gni delete mode 100644 sdk/lib/collection/collection_sources.gypi create mode 100644 sdk/lib/convert/convert_sources.gni delete mode 100644 sdk/lib/convert/convert_sources.gypi create mode 100644 sdk/lib/core/core_sources.gni delete mode 100644 sdk/lib/core/core_sources.gypi create mode 100644 sdk/lib/developer/developer_sources.gni delete mode 100644 sdk/lib/developer/developer_sources.gypi create mode 100644 sdk/lib/internal/internal_sources.gni delete mode 100644 sdk/lib/internal/internal_sources.gypi create mode 100644 sdk/lib/io/io_sources.gni delete mode 100644 sdk/lib/io/io_sources.gypi create mode 100644 sdk/lib/isolate/isolate_sources.gni delete mode 100644 sdk/lib/isolate/isolate_sources.gypi create mode 100644 sdk/lib/math/math_sources.gni delete mode 100644 sdk/lib/math/math_sources.gypi create mode 100644 sdk/lib/mirrors/mirrors_sources.gni delete mode 100644 sdk/lib/mirrors/mirrors_sources.gypi create mode 100644 sdk/lib/profiler/profiler_sources.gni delete mode 100644 sdk/lib/profiler/profiler_sources.gypi delete mode 100644 sdk/lib/rules.gni create mode 100644 sdk/lib/typed_data/typed_data_sources.gni delete mode 100644 sdk/lib/typed_data/typed_data_sources.gypi create mode 100644 sdk/lib/vmservice/vmservice_sources.gni delete mode 100644 sdk/lib/vmservice/vmservice_sources.gypi create mode 100644 third_party/tcmalloc/tcmalloc_sources.gni delete mode 100644 third_party/tcmalloc/tcmalloc_sources.gypi delete mode 100755 tools/android_link.py delete mode 100755 tools/gypi_to_gn.py delete mode 100755 tools/process_gypis.py diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index 0ce78044c8f..c32ef284943 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -199,7 +199,7 @@ template("libdart_library") { libdart_library("libdart_jit") { extra_configs = [ ":dart_maybe_product_config" ] extra_deps = [ - "vm:libdart_platform", + "platform:libdart_platform", "vm:libdart_lib_jit", "vm:libdart_vm_jit", ] @@ -208,7 +208,7 @@ libdart_library("libdart_jit") { libdart_library("libdart_jit_product") { extra_configs = [ ":dart_product_config" ] extra_deps = [ - "vm:libdart_platform_product", + "platform:libdart_platform_product", "vm:libdart_lib_jit_product", "vm:libdart_vm_jit_product", ] @@ -220,7 +220,7 @@ libdart_library("libdart_precompiled_runtime") { ":dart_precompiled_runtime_config", ] extra_deps = [ - "vm:libdart_platform", + "platform:libdart_platform", "vm:libdart_lib_precompiled_runtime", "vm:libdart_vm_precompiled_runtime", ] @@ -232,7 +232,7 @@ libdart_library("libdart_precompiled_runtime_product") { ":dart_precompiled_runtime_config", ] extra_deps = [ - "vm:libdart_platform_product", + "platform:libdart_platform_product", "vm:libdart_lib_precompiled_runtime_product", "vm:libdart_vm_precompiled_runtime_product", ] @@ -245,7 +245,7 @@ libdart_library("libdart_nosnapshot_with_precompiler") { ":dart_precompiler_config", ] extra_deps = [ - "vm:libdart_platform", + "platform:libdart_platform", "vm:libdart_lib_nosnapshot_with_precompiler", "vm:libdart_vm_nosnapshot_with_precompiler", ] @@ -258,7 +258,7 @@ libdart_library("libdart_nosnapshot_with_precompiler_product") { ":dart_precompiler_config", ] extra_deps = [ - "vm:libdart_platform_product", + "platform:libdart_platform_product", "vm:libdart_lib_nosnapshot_with_precompiler_product", "vm:libdart_vm_nosnapshot_with_precompiler_product", ] @@ -270,7 +270,7 @@ libdart_library("libdart_with_precompiler") { ":dart_precompiler_config", ] extra_deps = [ - "vm:libdart_platform", + "platform:libdart_platform", "vm:libdart_lib_with_precompiler", "vm:libdart_vm_with_precompiler", ] @@ -282,7 +282,7 @@ libdart_library("libdart_with_precompiler_product") { ":dart_precompiler_config", ] extra_deps = [ - "vm:libdart_platform_product", + "platform:libdart_platform_product", "vm:libdart_lib_with_precompiler_product", "vm:libdart_vm_with_precompiler_product", ] diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn index 61ae0052ef7..d194b125f16 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn @@ -2,9 +2,15 @@ # 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. -import("gypi_contents.gni") -import("../runtime_args.gni") import("../../build/compiled_action.gni") +import("../../sdk/lib/io/io_sources.gni") +import("../runtime_args.gni") +import("../vm/vm_sources.gni") +import("builtin_impl_sources.gni") +import("builtin_sources.gni") +import("io_impl_sources.gni") +import("io_sources.gni") +import("vmservice/vmservice_sources.gni") declare_args() { # Controls the kind of core snapshot linked into the standalone VM. Using a @@ -23,7 +29,7 @@ action("gen_resources_cc") { # The path below is hard coded for the Mojo and Flutter trees. When moving # the Dart runtime to gn, this path might need to be updated. - sources = rebase_path(resources_sources_gypi, "", "../bin/vmservice/") + sources = rebase_path(vmservice_sources, "", "../bin/vmservice/") outputs = [ "$target_gen_dir/resources_gen.cc", ] @@ -78,29 +84,23 @@ template("gen_library_src_path") { gen_library_src_path("generate_builtin_cc_file") { name = "_builtin" kind = "source" - sources = builtin_sources_gypi + sources = builtin_sources output = "$target_gen_dir/builtin_gen.cc" } -sdk_io_sources_gypi = - exec_script("../../tools/gypi_to_gn.py", - [ rebase_path("../../sdk/lib/io/io_sources.gypi") ], - "scope", - [ "../../sdk/lib/io/io_sources.gypi" ]) -sdk_io_sources = - rebase_path(sdk_io_sources_gypi.sources, ".", "../../sdk/lib/io") +rebased_io_sdk_sources = rebase_path(io_sdk_sources, ".", "../../sdk/lib/io") gen_library_src_path("generate_io_cc_file") { name = "io" kind = "source" - sources = [ "../../sdk/lib/io/io.dart" ] + sdk_io_sources + sources = [ "../../sdk/lib/io/io.dart" ] + rebased_io_sdk_sources output = "$target_gen_dir/io_gen.cc" } gen_library_src_path("generate_io_patch_cc_file") { name = "io" kind = "patch" - sources = io_sources_gypi + sources = io_runtime_sources output = "$target_gen_dir/io_patch_gen.cc" } @@ -271,7 +271,7 @@ template("build_libdart_builtin") { "log_linux.cc", "log_macos.cc", "log_win.cc", - ] + builtin_impl_sources_gypi + ] + builtin_impl_sources } } @@ -419,7 +419,7 @@ template("build_gen_snapshot_dart_io") { defines = [ "DART_IO_SECURE_SOCKET_DISABLED" ] - sources = io_impl_sources_gypi + builtin_impl_sources_gypi + sources = io_impl_sources + builtin_impl_sources sources += [ "io_natives.cc", "io_natives.h", @@ -491,7 +491,7 @@ template("dart_io") { libs = [ "launchpad" ] } - sources = io_impl_sources_gypi + builtin_impl_sources_gypi + sources = io_impl_sources + builtin_impl_sources sources += [ "builtin_natives.cc", "io_natives.cc", @@ -981,7 +981,7 @@ executable("run_vm_tests") { # The VM sources are already included in libdart, so we just want to add in # the tests here. - vm_tests = rebase_path(vm_tests_list, ".", "../vm") + vm_tests = rebase_path(vm_sources_tests, ".", "../vm") sources = [ "error_exit.cc", @@ -992,7 +992,7 @@ executable("run_vm_tests") { "run_vm_tests.cc", "dfe.cc", "dfe.h", - ] + builtin_impl_tests_list + vm_tests + ] + builtin_impl_tests + vm_tests if (!is_win) { ldflags = [ "-rdynamic" ] diff --git a/runtime/bin/builtin_impl_sources.gni b/runtime/bin/builtin_impl_sources.gni new file mode 100644 index 00000000000..c7391071c22 --- /dev/null +++ b/runtime/bin/builtin_impl_sources.gni @@ -0,0 +1,80 @@ +# Copyright (c) 2017, 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. + +# This file contains all C++ sources for the dart:_builtin library and +# some of the C++ sources for the dart:io library. The rest are in +# io_impl_sources.gypi. + +builtin_impl_sources = [ + "crypto.cc", + "crypto.h", + "crypto_android.cc", + "crypto_fuchsia.cc", + "crypto_linux.cc", + "crypto_macos.cc", + "crypto_win.cc", + "builtin_common.cc", + "dartutils.cc", + "dartutils.h", + "directory.cc", + "directory.h", + "directory_android.cc", + "directory_fuchsia.cc", + "directory_linux.cc", + "directory_macos.cc", + "directory_unsupported.cc", + "directory_win.cc", + "extensions.h", + "extensions.cc", + "extensions_android.cc", + "extensions_fuchsia.cc", + "extensions_linux.cc", + "extensions_macos.cc", + "extensions_win.cc", + "fdutils.h", + "fdutils_android.cc", + "fdutils_fuchsia.cc", + "fdutils_linux.cc", + "fdutils_macos.cc", + "file.cc", + "file.h", + "file_android.cc", + "file_fuchsia.cc", + "file_linux.cc", + "file_macos.cc", + "file_support.cc", + "file_unsupported.cc", + "file_win.cc", + "io_buffer.cc", + "io_buffer.h", + "isolate_data.cc", + "isolate_data.h", + "lockers.h", + "thread.h", + "thread_android.cc", + "thread_android.h", + "thread_fuchsia.cc", + "thread_fuchsia.h", + "thread_linux.cc", + "thread_linux.h", + "thread_macos.cc", + "thread_macos.h", + "thread_win.cc", + "thread_win.h", + "utils.h", + "utils_android.cc", + "utils_fuchsia.cc", + "utils_linux.cc", + "utils_macos.cc", + "utils_win.cc", + "utils_win.h", +] + +builtin_impl_tests = [ + "crypto_test.cc", + "directory_test.cc", + "eventhandler_test.cc", + "file_test.cc", + "hashmap_test.cc", +] diff --git a/runtime/bin/builtin_impl_sources.gypi b/runtime/bin/builtin_impl_sources.gypi deleted file mode 100644 index ccbbc5f9557..00000000000 --- a/runtime/bin/builtin_impl_sources.gypi +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains all C++ sources for the dart:_builtin library and -# some of the C++ sources for the dart:io library. The rest are in -# io_impl_sources.gypi. -{ - 'sources': [ - 'crypto.cc', - 'crypto.h', - 'crypto_android.cc', - 'crypto_fuchsia.cc', - 'crypto_linux.cc', - 'crypto_macos.cc', - 'crypto_test.cc', - 'crypto_win.cc', - 'builtin_common.cc', - 'dartutils.cc', - 'dartutils.h', - 'directory.cc', - 'directory.h', - 'directory_android.cc', - 'directory_fuchsia.cc', - 'directory_linux.cc', - 'directory_macos.cc', - 'directory_test.cc', - 'directory_unsupported.cc', - 'directory_win.cc', - 'eventhandler_test.cc', - 'extensions.h', - 'extensions.cc', - 'extensions_android.cc', - 'extensions_fuchsia.cc', - 'extensions_linux.cc', - 'extensions_macos.cc', - 'extensions_win.cc', - 'fdutils.h', - 'fdutils_android.cc', - 'fdutils_fuchsia.cc', - 'fdutils_linux.cc', - 'fdutils_macos.cc', - 'file.cc', - 'file.h', - 'file_android.cc', - 'file_fuchsia.cc', - 'file_linux.cc', - 'file_macos.cc', - 'file_support.cc', - 'file_unsupported.cc', - 'file_test.cc', - 'file_win.cc', - 'hashmap_test.cc', - 'io_buffer.cc', - 'io_buffer.h', - 'isolate_data.cc', - 'isolate_data.h', - 'lockers.h', - 'thread.h', - 'thread_android.cc', - 'thread_android.h', - 'thread_fuchsia.cc', - 'thread_fuchsia.h', - 'thread_linux.cc', - 'thread_linux.h', - 'thread_macos.cc', - 'thread_macos.h', - 'thread_win.cc', - 'thread_win.h', - 'utils.h', - 'utils_android.cc', - 'utils_fuchsia.cc', - 'utils_linux.cc', - 'utils_macos.cc', - 'utils_win.cc', - 'utils_win.h', - ], -} diff --git a/runtime/bin/builtin_sources.gypi b/runtime/bin/builtin_sources.gni similarity index 66% rename from runtime/bin/builtin_sources.gypi rename to runtime/bin/builtin_sources.gni index fbf642e4849..c9edd406031 100644 --- a/runtime/bin/builtin_sources.gypi +++ b/runtime/bin/builtin_sources.gni @@ -1,10 +1,6 @@ -# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. # This file contains all dart sources for the dart:_builtin library. -{ - 'sources': [ - 'builtin.dart', - ], -} +builtin_sources = [ "builtin.dart" ] diff --git a/runtime/bin/gypi_contents.gni b/runtime/bin/gypi_contents.gni deleted file mode 100644 index 34fc2692964..00000000000 --- a/runtime/bin/gypi_contents.gni +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2016, 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. - -_gypi_files = [ - "builtin_sources.gypi", - "builtin_impl_sources.gypi", - "vmservice/vmservice_sources.gypi", - "io_sources.gypi", - "io_impl_sources.gypi", -] - -_gypi_contents = exec_script("../../tools/gypi_to_gn.py", - rebase_path(_gypi_files) + [ "--prefix" ], - "scope", - _gypi_files) - -resources_sources_gypi = _gypi_contents.vmservice_sources_sources - -builtin_sources_gypi = _gypi_contents.builtin_sources_sources -builtin_impl_sources_gypi = _gypi_contents.builtin_impl_sources_sources - -io_sources_gypi = _gypi_contents.io_sources_sources -io_impl_sources_gypi = _gypi_contents.io_impl_sources_sources - -_test_gypi_files = [ - "../vm/vm_sources.gypi", - "builtin_impl_sources.gypi", -] - -_test_only_gypi_contents = exec_script("../../tools/gypi_to_gn.py", - rebase_path(_test_gypi_files) + [ - "--keep_only=_test.cc", - "--keep_only=_test.h", - "--prefix", - ], - "scope", - _test_gypi_files) - -# The VM sources are already included in libdart, so we just want to add in -# the tests here. -vm_tests_list = _test_only_gypi_contents.vm_sources_sources -builtin_impl_tests_list = _test_only_gypi_contents.builtin_impl_sources_sources diff --git a/runtime/bin/io_impl_sources.gni b/runtime/bin/io_impl_sources.gni new file mode 100644 index 00000000000..e4396dcaeaa --- /dev/null +++ b/runtime/bin/io_impl_sources.gni @@ -0,0 +1,104 @@ +# Copyright (c) 2012, 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. + +# This file contains some C++ sources for the dart:io library. The other +# implementation files are in builtin_impl_sources.gypi. +io_impl_sources = [ + "eventhandler.cc", + "eventhandler.h", + "eventhandler_android.cc", + "eventhandler_android.h", + "eventhandler_fuchsia.cc", + "eventhandler_fuchsia.h", + "eventhandler_linux.cc", + "eventhandler_linux.h", + "eventhandler_macos.cc", + "eventhandler_macos.h", + "eventhandler_unsupported.cc", + "eventhandler_win.cc", + "eventhandler_win.h", + "file_system_watcher.cc", + "file_system_watcher.h", + "file_system_watcher_android.cc", + "file_system_watcher_fuchsia.cc", + "file_system_watcher_linux.cc", + "file_system_watcher_macos.cc", + "file_system_watcher_unsupported.cc", + "file_system_watcher_win.cc", + "filter.cc", + "filter.h", + "filter_unsupported.cc", + "io_service.cc", + "io_service.h", + "io_service_no_ssl.cc", + "io_service_no_ssl.h", + "io_service_unsupported.cc", + "platform.cc", + "platform.h", + "platform_android.cc", + "platform_fuchsia.cc", + "platform_linux.cc", + "platform_macos.cc", + "platform_unsupported.cc", + "platform_win.cc", + "process.cc", + "process.h", + "process_android.cc", + "process_fuchsia.cc", + "process_linux.cc", + "process_macos.cc", + "process_unsupported.cc", + "process_win.cc", + "reference_counting.h", + "root_certificates_unsupported.cc", + "secure_socket_filter.cc", + "secure_socket_filter.h", + "secure_socket_unsupported.cc", + "secure_socket_utils.cc", + "secure_socket_utils.h", + "security_context.cc", + "security_context.h", + "security_context_android.cc", + "security_context_fuchsia.cc", + "security_context_linux.cc", + "security_context_macos.cc", + "security_context_win.cc", + "socket.cc", + "socket.h", + "socket_android.cc", + "socket_base.cc", + "socket_base.h", + "socket_base_android.cc", + "socket_base_android.h", + "socket_base_fuchsia.cc", + "socket_base_fuchsia.h", + "socket_base_linux.cc", + "socket_base_linux.h", + "socket_base_macos.cc", + "socket_base_macos.h", + "socket_base_unsupported.cc", + "socket_base_win.cc", + "socket_base_win.h", + "socket_fuchsia.cc", + "socket_linux.cc", + "socket_macos.cc", + "socket_unsupported.cc", + "socket_win.cc", + "stdio.cc", + "stdio.h", + "stdio_android.cc", + "stdio_fuchsia.cc", + "stdio_linux.cc", + "stdio_macos.cc", + "stdio_unsupported.cc", + "stdio_win.cc", + "sync_socket.cc", + "sync_socket.h", + "sync_socket_android.cc", + "sync_socket_fuchsia.cc", + "sync_socket_linux.cc", + "sync_socket_macos.cc", + "sync_socket_unsupported.cc", + "sync_socket_win.cc", +] diff --git a/runtime/bin/io_impl_sources.gypi b/runtime/bin/io_impl_sources.gypi deleted file mode 100644 index d3bce7e8401..00000000000 --- a/runtime/bin/io_impl_sources.gypi +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains some C++ sources for the dart:io library. The other -# implementation files are in builtin_impl_sources.gypi. -{ - 'sources': [ - 'eventhandler.cc', - 'eventhandler.h', - 'eventhandler_android.cc', - 'eventhandler_android.h', - 'eventhandler_fuchsia.cc', - 'eventhandler_fuchsia.h', - 'eventhandler_linux.cc', - 'eventhandler_linux.h', - 'eventhandler_macos.cc', - 'eventhandler_macos.h', - 'eventhandler_unsupported.cc', - 'eventhandler_win.cc', - 'eventhandler_win.h', - 'file_system_watcher.cc', - 'file_system_watcher.h', - 'file_system_watcher_android.cc', - 'file_system_watcher_fuchsia.cc', - 'file_system_watcher_linux.cc', - 'file_system_watcher_macos.cc', - 'file_system_watcher_unsupported.cc', - 'file_system_watcher_win.cc', - 'filter.cc', - 'filter.h', - 'filter_unsupported.cc', - 'io_service.cc', - 'io_service.h', - 'io_service_no_ssl.cc', - 'io_service_no_ssl.h', - 'io_service_unsupported.cc', - 'platform.cc', - 'platform.h', - 'platform_android.cc', - 'platform_fuchsia.cc', - 'platform_linux.cc', - 'platform_macos.cc', - 'platform_unsupported.cc', - 'platform_win.cc', - 'process.cc', - 'process.h', - 'process_android.cc', - 'process_fuchsia.cc', - 'process_linux.cc', - 'process_macos.cc', - 'process_unsupported.cc', - 'process_win.cc', - 'reference_counting.h', - 'root_certificates_unsupported.cc', - 'secure_socket_filter.cc', - 'secure_socket_filter.h', - 'secure_socket_unsupported.cc', - 'secure_socket_utils.cc', - 'secure_socket_utils.h', - 'security_context.cc', - 'security_context.h', - 'security_context_android.cc', - 'security_context_fuchsia.cc', - 'security_context_linux.cc', - 'security_context_macos.cc', - 'security_context_win.cc', - 'socket.cc', - 'socket.h', - 'socket_android.cc', - 'socket_base.cc', - 'socket_base.h', - 'socket_base_android.cc', - 'socket_base_android.h', - 'socket_base_fuchsia.cc', - 'socket_base_fuchsia.h', - 'socket_base_linux.cc', - 'socket_base_linux.h', - 'socket_base_macos.cc', - 'socket_base_macos.h', - 'socket_base_unsupported.cc', - 'socket_base_win.cc', - 'socket_base_win.h', - 'socket_fuchsia.cc', - 'socket_linux.cc', - 'socket_macos.cc', - 'socket_unsupported.cc', - 'socket_win.cc', - 'stdio.cc', - 'stdio.h', - 'stdio_android.cc', - 'stdio_fuchsia.cc', - 'stdio_linux.cc', - 'stdio_macos.cc', - 'stdio_unsupported.cc', - 'stdio_win.cc', - 'sync_socket.cc', - 'sync_socket.h', - 'sync_socket_android.cc', - 'sync_socket_fuchsia.cc', - 'sync_socket_linux.cc', - 'sync_socket_macos.cc', - 'sync_socket_unsupported.cc', - 'sync_socket_win.cc', - ], -} diff --git a/runtime/bin/io_sources.gni b/runtime/bin/io_sources.gni new file mode 100644 index 00000000000..89b24f330dc --- /dev/null +++ b/runtime/bin/io_sources.gni @@ -0,0 +1,20 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources for the dart:io library. +io_runtime_sources = [ + "common_patch.dart", + "directory_patch.dart", + "eventhandler_patch.dart", + "file_patch.dart", + "file_system_entity_patch.dart", + "filter_patch.dart", + "io_service_patch.dart", + "platform_patch.dart", + "process_patch.dart", + "socket_patch.dart", + "stdio_patch.dart", + "secure_socket_patch.dart", + "sync_socket_patch.dart", +] diff --git a/runtime/bin/io_sources.gypi b/runtime/bin/io_sources.gypi deleted file mode 100644 index 24bc72e7c35..00000000000 --- a/runtime/bin/io_sources.gypi +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains all sources for the dart:io library. -{ - 'sources': [ - 'common_patch.dart', - 'directory_patch.dart', - 'eventhandler_patch.dart', - 'file_patch.dart', - 'file_system_entity_patch.dart', - 'filter_patch.dart', - 'io_service_patch.dart', - 'platform_patch.dart', - 'process_patch.dart', - 'socket_patch.dart', - 'stdio_patch.dart', - 'secure_socket_patch.dart', - 'sync_socket_patch.dart', - ], -} diff --git a/runtime/bin/vmservice/vmservice_sources.gypi b/runtime/bin/vmservice/vmservice_sources.gni similarity index 62% rename from runtime/bin/vmservice/vmservice_sources.gypi rename to runtime/bin/vmservice/vmservice_sources.gni index a7d06cd7416..4c5d0c6d112 100644 --- a/runtime/bin/vmservice/vmservice_sources.gypi +++ b/runtime/bin/vmservice/vmservice_sources.gni @@ -1,13 +1,11 @@ -# Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. # This file contains all Dart sources for the dart:io implementation of # the VM Service server. -{ - 'sources': [ - 'loader.dart', - 'server.dart', - 'vmservice_io.dart', - ], -} +vmservice_sources = [ + "loader.dart", + "server.dart", + "vmservice_io.dart", +] diff --git a/runtime/lib/async_sources.gni b/runtime/lib/async_sources.gni new file mode 100644 index 00000000000..1620f740f2d --- /dev/null +++ b/runtime/lib/async_sources.gni @@ -0,0 +1,12 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources for the dart:async library. +async_runtime_sources = [ + "async_patch.dart", + "deferred_load_patch.dart", + "schedule_microtask_patch.dart", + "timer_patch.dart", + "async.cc", +] diff --git a/runtime/lib/async_sources.gypi b/runtime/lib/async_sources.gypi deleted file mode 100644 index 2c41f96195e..00000000000 --- a/runtime/lib/async_sources.gypi +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains all sources for the dart:async library. -{ - 'sources': [ - 'async_patch.dart', - 'deferred_load_patch.dart', - 'schedule_microtask_patch.dart', - 'timer_patch.dart', - 'async.cc', - ], -} diff --git a/runtime/lib/collection_sources.gni b/runtime/lib/collection_sources.gni new file mode 100644 index 00000000000..8ad022ca426 --- /dev/null +++ b/runtime/lib/collection_sources.gni @@ -0,0 +1,11 @@ +# Copyright (c) 2017, 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. + +collection_runtime_sources = [ + # collection_patch.dart needs to be the first dart file because it contains + # imports. + "collection_patch.dart", + "compact_hash.dart", + "linked_hash_map.cc", +] diff --git a/runtime/lib/collection_sources.gypi b/runtime/lib/collection_sources.gypi deleted file mode 100644 index 857698070ae..00000000000 --- a/runtime/lib/collection_sources.gypi +++ /dev/null @@ -1,13 +0,0 @@ - # Copyright (c) 2013, 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. - -{ - 'sources': [ - # collection_patch.dart needs to be the first dart file because it contains - # imports. - 'collection_patch.dart', - 'compact_hash.dart', - 'linked_hash_map.cc', - ], -} diff --git a/runtime/lib/convert_sources.gypi b/runtime/lib/convert_sources.gni similarity index 56% rename from runtime/lib/convert_sources.gypi rename to runtime/lib/convert_sources.gni index 0f3b46b87b2..e37c0172503 100644 --- a/runtime/lib/convert_sources.gypi +++ b/runtime/lib/convert_sources.gni @@ -1,9 +1,5 @@ -# Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. -{ - 'sources': [ - 'convert_patch.dart', - ], -} +convert_runtime_sources = [ "convert_patch.dart" ] diff --git a/runtime/lib/core_sources.gni b/runtime/lib/core_sources.gni new file mode 100644 index 00000000000..221dc03f171 --- /dev/null +++ b/runtime/lib/core_sources.gni @@ -0,0 +1,57 @@ +# Copyright (c) 2017, 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. + +# Sources visible via default library. +core_runtime_sources = [ + "core_patch.dart", + + # The above file needs to be first as it imports required libraries. + "array.cc", + "array.dart", + "array_patch.dart", + "bigint.dart", + "bool.cc", + "bool_patch.dart", + "date.cc", + "date_patch.dart", + "double.cc", + "double.dart", + "double_patch.dart", + "errors.cc", + "errors_patch.dart", + "expando_patch.dart", + "function.cc", + "function.dart", + "function_patch.dart", + "growable_array.cc", + "growable_array.dart", + "identical.cc", + "identical_patch.dart", + "immutable_map.dart", + "integers.cc", + "integers.dart", + "integers_patch.dart", + "invocation_mirror.h", + "invocation_mirror_patch.dart", + "lib_prefix.dart", + "map_patch.dart", + "null_patch.dart", + "object.cc", + "object_patch.dart", + "regexp.cc", + "regexp_patch.dart", + "stacktrace.cc", + "stacktrace.dart", + "stacktrace.h", + "stopwatch.cc", + "stopwatch_patch.dart", + "string.cc", + "string_buffer_patch.dart", + "string_patch.dart", + "type_patch.dart", + "uri.cc", + "uri_patch.dart", + "weak_property.cc", + "weak_property.dart", +] diff --git a/runtime/lib/core_sources.gypi b/runtime/lib/core_sources.gypi deleted file mode 100644 index 585179702a4..00000000000 --- a/runtime/lib/core_sources.gypi +++ /dev/null @@ -1,59 +0,0 @@ -# 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. - -# Sources visible via default library. - -{ - 'sources': [ - 'core_patch.dart', - # The above file needs to be first as it imports required libraries. - 'array.cc', - 'array.dart', - 'array_patch.dart', - 'bigint.dart', - 'bool.cc', - 'bool_patch.dart', - 'date.cc', - 'date_patch.dart', - 'double.cc', - 'double.dart', - 'double_patch.dart', - 'errors.cc', - 'errors_patch.dart', - 'expando_patch.dart', - 'function.cc', - 'function.dart', - 'function_patch.dart', - 'growable_array.cc', - 'growable_array.dart', - 'identical.cc', - 'identical_patch.dart', - 'immutable_map.dart', - 'integers.cc', - 'integers.dart', - 'integers_patch.dart', - 'invocation_mirror.h', - 'invocation_mirror_patch.dart', - 'lib_prefix.dart', - 'map_patch.dart', - 'null_patch.dart', - 'object.cc', - 'object_patch.dart', - 'regexp.cc', - 'regexp_patch.dart', - 'stacktrace.cc', - 'stacktrace.dart', - 'stacktrace.h', - 'stopwatch.cc', - 'stopwatch_patch.dart', - 'string.cc', - 'string_buffer_patch.dart', - 'string_patch.dart', - 'type_patch.dart', - 'uri.cc', - 'uri_patch.dart', - 'weak_property.cc', - 'weak_property.dart', - ], -} diff --git a/runtime/lib/developer_sources.gni b/runtime/lib/developer_sources.gni new file mode 100644 index 00000000000..c6f3c292cef --- /dev/null +++ b/runtime/lib/developer_sources.gni @@ -0,0 +1,16 @@ +# Copyright (c) 2017, 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. + +# Sources visible via dart:developer library. +developer_runtime_sources = [ + "developer.cc", + + # developer.dart needs to be the first dart file because it contains + # imports. + "developer.dart", + "profiler.cc", + "profiler.dart", + "timeline.cc", + "timeline.dart", +] diff --git a/runtime/lib/developer_sources.gypi b/runtime/lib/developer_sources.gypi deleted file mode 100644 index 896f2e1ab5f..00000000000 --- a/runtime/lib/developer_sources.gypi +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 2015, 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. - -# Sources visible via dart:developer library. - -{ - 'sources': [ - 'developer.cc', - # developer.dart needs to be the first dart file because it contains - # imports. - 'developer.dart', - 'profiler.cc', - 'profiler.dart', - 'timeline.cc', - 'timeline.dart', - ], -} - diff --git a/runtime/lib/internal_sources.gni b/runtime/lib/internal_sources.gni new file mode 100644 index 00000000000..61c4e154375 --- /dev/null +++ b/runtime/lib/internal_sources.gni @@ -0,0 +1,14 @@ +# Copyright (c) 2017, 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. + +# Sources that patch the library "dart:_internal". +internal_runtime_sources = [ + "internal_patch.dart", + + # The above file needs to be first as it imports required libraries. + "class_id.dart", + "class_id.cc", + "print_patch.dart", + "symbol_patch.dart", +] diff --git a/runtime/lib/internal_sources.gypi b/runtime/lib/internal_sources.gypi deleted file mode 100644 index 08d9bb73132..00000000000 --- a/runtime/lib/internal_sources.gypi +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -# Sources that patch the library "dart:_internal". - -{ - 'sources': [ - 'internal_patch.dart', - # The above file needs to be first as it imports required libraries. - 'class_id.dart', - 'class_id.cc', - 'print_patch.dart', - 'symbol_patch.dart', - ], -} diff --git a/runtime/lib/isolate_sources.gypi b/runtime/lib/isolate_sources.gni similarity index 57% rename from runtime/lib/isolate_sources.gypi rename to runtime/lib/isolate_sources.gni index d54fadfb52e..d01a351b72e 100644 --- a/runtime/lib/isolate_sources.gypi +++ b/runtime/lib/isolate_sources.gni @@ -1,12 +1,10 @@ -# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. # This file contains all sources for the dart:isolate library. -{ - 'sources': [ - 'isolate_patch.dart', - 'isolate.cc', - 'timer_impl.dart', - ], -} +isolate_runtime_sources = [ + "isolate_patch.dart", + "isolate.cc", + "timer_impl.dart", +] diff --git a/runtime/lib/math_sources.gypi b/runtime/lib/math_sources.gni similarity index 54% rename from runtime/lib/math_sources.gypi rename to runtime/lib/math_sources.gni index 2a181738ad5..65a07ca5a8e 100644 --- a/runtime/lib/math_sources.gypi +++ b/runtime/lib/math_sources.gni @@ -1,10 +1,8 @@ -# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. -{ - 'sources': [ - 'math.cc', - 'math_patch.dart', - ], -} +math_runtime_sources = [ + "math.cc", + "math_patch.dart", +] diff --git a/runtime/lib/mirrors_sources.gni b/runtime/lib/mirrors_sources.gni new file mode 100644 index 00000000000..c3e500ccafd --- /dev/null +++ b/runtime/lib/mirrors_sources.gni @@ -0,0 +1,15 @@ +# Copyright (c) 2017, 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. + +# Implementation sources. +mirrors_runtime_sources = [ + "mirrors.cc", + "mirrors.h", + + # mirrors_patch.dart needs to be the first dart file because it contains + # imports. + "mirrors_patch.dart", + "mirrors_impl.dart", + "mirror_reference.dart", +] diff --git a/runtime/lib/mirrors_sources.gypi b/runtime/lib/mirrors_sources.gypi deleted file mode 100644 index 46da0828d8a..00000000000 --- a/runtime/lib/mirrors_sources.gypi +++ /dev/null @@ -1,17 +0,0 @@ -# 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. - -# Implementation sources. - -{ - 'sources': [ - 'mirrors.cc', - 'mirrors.h', - # mirrors_patch.dart needs to be the first dart file because it contains - # imports. - 'mirrors_patch.dart', - 'mirrors_impl.dart', - 'mirror_reference.dart', - ], -} diff --git a/runtime/lib/profiler_sources.gypi b/runtime/lib/profiler_sources.gni similarity index 65% rename from runtime/lib/profiler_sources.gypi rename to runtime/lib/profiler_sources.gni index 9175427107a..b27bc883842 100644 --- a/runtime/lib/profiler_sources.gypi +++ b/runtime/lib/profiler_sources.gni @@ -1,12 +1,6 @@ -# Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. # Sources list to keep vm/BUILD.gn generate_core_libraries happy. - -{ - 'sources': [ - 'empty_source.dart' - ], -} - +profiler_runtime_sources = [ "empty_source.dart" ] diff --git a/runtime/lib/typed_data_sources.gypi b/runtime/lib/typed_data_sources.gni similarity index 55% rename from runtime/lib/typed_data_sources.gypi rename to runtime/lib/typed_data_sources.gni index d68daed967d..4fdebb62366 100644 --- a/runtime/lib/typed_data_sources.gypi +++ b/runtime/lib/typed_data_sources.gni @@ -1,13 +1,10 @@ -# Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. # Sources visible via dart:typed_data library. - -{ - 'sources': [ - 'typed_data.cc', - 'typed_data_patch.dart', - 'simd128.cc', - ], -} +typed_data_runtime_sources = [ + "typed_data.cc", + "typed_data_patch.dart", + "simd128.cc", +] diff --git a/runtime/lib/vmservice_sources.gypi b/runtime/lib/vmservice_sources.gni similarity index 64% rename from runtime/lib/vmservice_sources.gypi rename to runtime/lib/vmservice_sources.gni index 55d70fa6a21..a5e1131fbf7 100644 --- a/runtime/lib/vmservice_sources.gypi +++ b/runtime/lib/vmservice_sources.gni @@ -1,11 +1,6 @@ -# Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file +# Copyright (c) 2017, 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. # Sources that patch the library "dart:_vmservice". - -{ - 'sources': [ - 'vmservice.cc', - ], -} +vmservice_runtime_sources = [ "vmservice.cc" ] diff --git a/runtime/observatory/BUILD.gn b/runtime/observatory/BUILD.gn index 229a92381da..71fa8f7615b 100644 --- a/runtime/observatory/BUILD.gn +++ b/runtime/observatory/BUILD.gn @@ -5,6 +5,7 @@ import("../../build/executable_suffix.gni") import("../../build/prebuilt_dart_sdk.gni") import("../../build/dart_host_toolchain.gni") +import("observatory_sources.gni") # Construct arguments to the observatory tool for finding pub. pub_build_deps = [] @@ -28,14 +29,8 @@ if (!prebuilt_dart_exe_works) { current_dir = rebase_path(".", "//") # Helper build rules for packaging the Dart observatory resources. -observatory_sources_gypi = - exec_script("../../tools/gypi_to_gn.py", - [ rebase_path("../observatory/observatory_sources.gypi") ], - "scope", - [ "../observatory/observatory_sources.gypi" ]) - copy("copy_observatory") { - sources = rebase_path(observatory_sources_gypi.sources, "", ".") + sources = rebase_path(observatory_sources, "", ".") outputs = [ "$root_gen_dir/observatory_copy/{{source_root_relative_dir}}/{{source_file_part}}", ] @@ -97,7 +92,7 @@ action("pub_build_observatory") { ":copy_observatory_deps", ] + pub_build_deps - sources = rebase_path(observatory_sources_gypi.sources, + sources = rebase_path(observatory_sources, "", "$root_gen_dir/observatory_copy/$current_dir") diff --git a/runtime/observatory/observatory_sources.gni b/runtime/observatory/observatory_sources.gni new file mode 100644 index 00000000000..f58f817062a --- /dev/null +++ b/runtime/observatory/observatory_sources.gni @@ -0,0 +1,284 @@ +# Copyright (c) 2017, 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. + +# DO NOT EDIT. This file is generated by update_sources.py in this directory. + +# This file contains all dart, css, and html sources for Observatory. +observatory_sources = [ + "lib/allocation_profile.dart", + "lib/app.dart", + "lib/cli.dart", + "lib/debugger.dart", + "lib/elements.dart", + "lib/event.dart", + "lib/heap_snapshot.dart", + "lib/models.dart", + "lib/object_graph.dart", + "lib/repositories.dart", + "lib/sample_profile.dart", + "lib/service.dart", + "lib/service_common.dart", + "lib/service_html.dart", + "lib/service_io.dart", + "lib/src/allocation_profile/allocation_profile.dart", + "lib/src/app/analytics.dart", + "lib/src/app/application.dart", + "lib/src/app/location_manager.dart", + "lib/src/app/notification.dart", + "lib/src/app/page.dart", + "lib/src/app/settings.dart", + "lib/src/app/view_model.dart", + "lib/src/cli/command.dart", + "lib/src/debugger/debugger.dart", + "lib/src/debugger/debugger_location.dart", + "lib/src/elements/allocation_profile.dart", + "lib/src/elements/class_allocation_profile.dart", + "lib/src/elements/class_instances.dart", + "lib/src/elements/class_ref.dart", + "lib/src/elements/class_tree.dart", + "lib/src/elements/class_view.dart", + "lib/src/elements/code_ref.dart", + "lib/src/elements/code_view.dart", + "lib/src/elements/containers/virtual_collection.dart", + "lib/src/elements/containers/virtual_tree.dart", + "lib/src/elements/context_ref.dart", + "lib/src/elements/context_view.dart", + "lib/src/elements/cpu_profile.dart", + "lib/src/elements/cpu_profile/virtual_tree.dart", + "lib/src/elements/cpu_profile_table.dart", + "lib/src/elements/css/shared.css", + "lib/src/elements/curly_block.dart", + "lib/src/elements/debugger.dart", + "lib/src/elements/error_ref.dart", + "lib/src/elements/error_view.dart", + "lib/src/elements/eval_box.dart", + "lib/src/elements/field_ref.dart", + "lib/src/elements/field_view.dart", + "lib/src/elements/flag_list.dart", + "lib/src/elements/function_ref.dart", + "lib/src/elements/function_view.dart", + "lib/src/elements/general_error.dart", + "lib/src/elements/heap_map.dart", + "lib/src/elements/heap_snapshot.dart", + "lib/src/elements/helpers/any_ref.dart", + "lib/src/elements/helpers/nav_bar.dart", + "lib/src/elements/helpers/nav_menu.dart", + "lib/src/elements/helpers/rendering_queue.dart", + "lib/src/elements/helpers/rendering_scheduler.dart", + "lib/src/elements/helpers/tag.dart", + "lib/src/elements/helpers/uris.dart", + "lib/src/elements/icdata_ref.dart", + "lib/src/elements/icdata_view.dart", + "lib/src/elements/img/chromium_icon.png", + "lib/src/elements/img/dart_icon.png", + "lib/src/elements/img/isolate_icon.png", + "lib/src/elements/inbound_references.dart", + "lib/src/elements/instance_ref.dart", + "lib/src/elements/instance_view.dart", + "lib/src/elements/isolate/counter_chart.dart", + "lib/src/elements/isolate/location.dart", + "lib/src/elements/isolate/run_state.dart", + "lib/src/elements/isolate/shared_summary.dart", + "lib/src/elements/isolate/summary.dart", + "lib/src/elements/isolate_reconnect.dart", + "lib/src/elements/isolate_ref.dart", + "lib/src/elements/isolate_view.dart", + "lib/src/elements/json_view.dart", + "lib/src/elements/library_ref.dart", + "lib/src/elements/library_view.dart", + "lib/src/elements/local_var_descriptors_ref.dart", + "lib/src/elements/logging.dart", + "lib/src/elements/logging_list.dart", + "lib/src/elements/megamorphiccache_ref.dart", + "lib/src/elements/megamorphiccache_view.dart", + "lib/src/elements/memory/dashboard.dart", + "lib/src/elements/memory/graph.dart", + "lib/src/elements/memory/profile.dart", + "lib/src/elements/metric/details.dart", + "lib/src/elements/metric/graph.dart", + "lib/src/elements/metrics.dart", + "lib/src/elements/native_memory_profiler.dart", + "lib/src/elements/nav/class_menu.dart", + "lib/src/elements/nav/isolate_menu.dart", + "lib/src/elements/nav/library_menu.dart", + "lib/src/elements/nav/menu_item.dart", + "lib/src/elements/nav/notify.dart", + "lib/src/elements/nav/notify_event.dart", + "lib/src/elements/nav/notify_exception.dart", + "lib/src/elements/nav/refresh.dart", + "lib/src/elements/nav/reload.dart", + "lib/src/elements/nav/top_menu.dart", + "lib/src/elements/nav/vm_menu.dart", + "lib/src/elements/object_common.dart", + "lib/src/elements/object_view.dart", + "lib/src/elements/objectpool_ref.dart", + "lib/src/elements/objectpool_view.dart", + "lib/src/elements/objectstore_view.dart", + "lib/src/elements/observatory_application.dart", + "lib/src/elements/pc_descriptors_ref.dart", + "lib/src/elements/persistent_handles.dart", + "lib/src/elements/ports.dart", + "lib/src/elements/retaining_path.dart", + "lib/src/elements/sample_buffer_control.dart", + "lib/src/elements/script_inset.dart", + "lib/src/elements/script_ref.dart", + "lib/src/elements/script_view.dart", + "lib/src/elements/sentinel_value.dart", + "lib/src/elements/sentinel_view.dart", + "lib/src/elements/singletargetcache_ref.dart", + "lib/src/elements/singletargetcache_view.dart", + "lib/src/elements/source_inset.dart", + "lib/src/elements/source_link.dart", + "lib/src/elements/stack_trace_tree_config.dart", + "lib/src/elements/strongly_reachable_instances.dart", + "lib/src/elements/subtypetestcache_ref.dart", + "lib/src/elements/subtypetestcache_view.dart", + "lib/src/elements/timeline_page.dart", + "lib/src/elements/token_stream_ref.dart", + "lib/src/elements/top_retaining_instances.dart", + "lib/src/elements/type_arguments_ref.dart", + "lib/src/elements/unknown_ref.dart", + "lib/src/elements/unlinkedcall_ref.dart", + "lib/src/elements/unlinkedcall_view.dart", + "lib/src/elements/view_footer.dart", + "lib/src/elements/vm_connect.dart", + "lib/src/elements/vm_connect_target.dart", + "lib/src/elements/vm_view.dart", + "lib/src/heap_snapshot/heap_snapshot.dart", + "lib/src/models/exceptions.dart", + "lib/src/models/objects/allocation_profile.dart", + "lib/src/models/objects/breakpoint.dart", + "lib/src/models/objects/class.dart", + "lib/src/models/objects/code.dart", + "lib/src/models/objects/context.dart", + "lib/src/models/objects/error.dart", + "lib/src/models/objects/event.dart", + "lib/src/models/objects/extension_data.dart", + "lib/src/models/objects/field.dart", + "lib/src/models/objects/flag.dart", + "lib/src/models/objects/frame.dart", + "lib/src/models/objects/function.dart", + "lib/src/models/objects/guarded.dart", + "lib/src/models/objects/heap_snapshot.dart", + "lib/src/models/objects/heap_space.dart", + "lib/src/models/objects/icdata.dart", + "lib/src/models/objects/inbound_references.dart", + "lib/src/models/objects/instance.dart", + "lib/src/models/objects/isolate.dart", + "lib/src/models/objects/library.dart", + "lib/src/models/objects/local_var_descriptors.dart", + "lib/src/models/objects/map_association.dart", + "lib/src/models/objects/megamorphiccache.dart", + "lib/src/models/objects/metric.dart", + "lib/src/models/objects/notification.dart", + "lib/src/models/objects/object.dart", + "lib/src/models/objects/objectpool.dart", + "lib/src/models/objects/objectstore.dart", + "lib/src/models/objects/pc_descriptors.dart", + "lib/src/models/objects/persistent_handles.dart", + "lib/src/models/objects/ports.dart", + "lib/src/models/objects/retaining_path.dart", + "lib/src/models/objects/sample_profile.dart", + "lib/src/models/objects/script.dart", + "lib/src/models/objects/sentinel.dart", + "lib/src/models/objects/service.dart", + "lib/src/models/objects/single_target_cache.dart", + "lib/src/models/objects/source_location.dart", + "lib/src/models/objects/subtype_test_cache.dart", + "lib/src/models/objects/target.dart", + "lib/src/models/objects/thread.dart", + "lib/src/models/objects/timeline_event.dart", + "lib/src/models/objects/token_stream.dart", + "lib/src/models/objects/type_arguments.dart", + "lib/src/models/objects/unknown.dart", + "lib/src/models/objects/unlinked_call.dart", + "lib/src/models/objects/vm.dart", + "lib/src/models/objects/zone.dart", + "lib/src/models/repositories/allocation_profile.dart", + "lib/src/models/repositories/breakpoint.dart", + "lib/src/models/repositories/class.dart", + "lib/src/models/repositories/context.dart", + "lib/src/models/repositories/editor.dart", + "lib/src/models/repositories/eval.dart", + "lib/src/models/repositories/event.dart", + "lib/src/models/repositories/field.dart", + "lib/src/models/repositories/flag.dart", + "lib/src/models/repositories/function.dart", + "lib/src/models/repositories/heap_snapshot.dart", + "lib/src/models/repositories/icdata.dart", + "lib/src/models/repositories/inbound_references.dart", + "lib/src/models/repositories/instance.dart", + "lib/src/models/repositories/isolate.dart", + "lib/src/models/repositories/library.dart", + "lib/src/models/repositories/megamorphiccache.dart", + "lib/src/models/repositories/metric.dart", + "lib/src/models/repositories/notification.dart", + "lib/src/models/repositories/object.dart", + "lib/src/models/repositories/objectpool.dart", + "lib/src/models/repositories/objectstore.dart", + "lib/src/models/repositories/persistent_handles.dart", + "lib/src/models/repositories/ports.dart", + "lib/src/models/repositories/reachable_size.dart", + "lib/src/models/repositories/retained_size.dart", + "lib/src/models/repositories/retaining_path.dart", + "lib/src/models/repositories/sample_profile.dart", + "lib/src/models/repositories/script.dart", + "lib/src/models/repositories/single_target_cache.dart", + "lib/src/models/repositories/strongly_reachable_instances.dart", + "lib/src/models/repositories/subtype_test_cache.dart", + "lib/src/models/repositories/target.dart", + "lib/src/models/repositories/top_retaining_instances.dart", + "lib/src/models/repositories/type_arguments.dart", + "lib/src/models/repositories/unlinked_call.dart", + "lib/src/models/repositories/vm.dart", + "lib/src/repositories/allocation_profile.dart", + "lib/src/repositories/breakpoint.dart", + "lib/src/repositories/class.dart", + "lib/src/repositories/context.dart", + "lib/src/repositories/editor.dart", + "lib/src/repositories/eval.dart", + "lib/src/repositories/event.dart", + "lib/src/repositories/field.dart", + "lib/src/repositories/flag.dart", + "lib/src/repositories/function.dart", + "lib/src/repositories/heap_snapshot.dart", + "lib/src/repositories/icdata.dart", + "lib/src/repositories/inbound_references.dart", + "lib/src/repositories/instance.dart", + "lib/src/repositories/isolate.dart", + "lib/src/repositories/library.dart", + "lib/src/repositories/megamorphiccache.dart", + "lib/src/repositories/metric.dart", + "lib/src/repositories/notification.dart", + "lib/src/repositories/object.dart", + "lib/src/repositories/objectpool.dart", + "lib/src/repositories/objectstore.dart", + "lib/src/repositories/persistent_handles.dart", + "lib/src/repositories/ports.dart", + "lib/src/repositories/reachable_size.dart", + "lib/src/repositories/retained_size.dart", + "lib/src/repositories/retaining_path.dart", + "lib/src/repositories/sample_profile.dart", + "lib/src/repositories/script.dart", + "lib/src/repositories/settings.dart", + "lib/src/repositories/single_target_cache.dart", + "lib/src/repositories/strongly_reachable_instances.dart", + "lib/src/repositories/subtype_test_cache.dart", + "lib/src/repositories/target.dart", + "lib/src/repositories/top_retaining_instances.dart", + "lib/src/repositories/type_arguments.dart", + "lib/src/repositories/unlinked_call.dart", + "lib/src/repositories/vm.dart", + "lib/src/sample_profile/sample_profile.dart", + "lib/src/service/object.dart", + "lib/tracer.dart", + "lib/utils.dart", + "web/favicon.ico", + "web/index.html", + "web/main.dart", + "web/third_party/trace_viewer_full.html", + "web/timeline.html", + "web/timeline.js", + "web/timeline_message_handler.js", +] diff --git a/runtime/observatory/observatory_sources.gypi b/runtime/observatory/observatory_sources.gypi deleted file mode 100644 index 4569ed36d6c..00000000000 --- a/runtime/observatory/observatory_sources.gypi +++ /dev/null @@ -1,284 +0,0 @@ -# Copyright (c) 2017, 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. - -# This file contains all dart, css, and html sources for Observatory. -{ - 'sources': [ - 'lib/allocation_profile.dart', - 'lib/app.dart', - 'lib/cli.dart', - 'lib/debugger.dart', - 'lib/elements.dart', - 'lib/event.dart', - 'lib/heap_snapshot.dart', - 'lib/models.dart', - 'lib/object_graph.dart', - 'lib/repositories.dart', - 'lib/sample_profile.dart', - 'lib/service.dart', - 'lib/service_common.dart', - 'lib/service_html.dart', - 'lib/service_io.dart', - 'lib/src/allocation_profile/allocation_profile.dart', - 'lib/src/app/analytics.dart', - 'lib/src/app/application.dart', - 'lib/src/app/location_manager.dart', - 'lib/src/app/notification.dart', - 'lib/src/app/page.dart', - 'lib/src/app/settings.dart', - 'lib/src/app/view_model.dart', - 'lib/src/cli/command.dart', - 'lib/src/debugger/debugger.dart', - 'lib/src/debugger/debugger_location.dart', - 'lib/src/elements/allocation_profile.dart', - 'lib/src/elements/class_allocation_profile.dart', - 'lib/src/elements/class_instances.dart', - 'lib/src/elements/class_ref.dart', - 'lib/src/elements/class_tree.dart', - 'lib/src/elements/class_view.dart', - 'lib/src/elements/code_ref.dart', - 'lib/src/elements/code_view.dart', - 'lib/src/elements/containers/virtual_collection.dart', - 'lib/src/elements/containers/virtual_tree.dart', - 'lib/src/elements/context_ref.dart', - 'lib/src/elements/context_view.dart', - 'lib/src/elements/cpu_profile.dart', - 'lib/src/elements/cpu_profile/virtual_tree.dart', - 'lib/src/elements/cpu_profile_table.dart', - 'lib/src/elements/css/shared.css', - 'lib/src/elements/curly_block.dart', - 'lib/src/elements/debugger.dart', - 'lib/src/elements/error_ref.dart', - 'lib/src/elements/error_view.dart', - 'lib/src/elements/eval_box.dart', - 'lib/src/elements/field_ref.dart', - 'lib/src/elements/field_view.dart', - 'lib/src/elements/flag_list.dart', - 'lib/src/elements/function_ref.dart', - 'lib/src/elements/function_view.dart', - 'lib/src/elements/general_error.dart', - 'lib/src/elements/heap_map.dart', - 'lib/src/elements/heap_snapshot.dart', - 'lib/src/elements/helpers/any_ref.dart', - 'lib/src/elements/helpers/nav_bar.dart', - 'lib/src/elements/helpers/nav_menu.dart', - 'lib/src/elements/helpers/rendering_queue.dart', - 'lib/src/elements/helpers/rendering_scheduler.dart', - 'lib/src/elements/helpers/tag.dart', - 'lib/src/elements/helpers/uris.dart', - 'lib/src/elements/icdata_ref.dart', - 'lib/src/elements/icdata_view.dart', - 'lib/src/elements/img/chromium_icon.png', - 'lib/src/elements/img/dart_icon.png', - 'lib/src/elements/img/isolate_icon.png', - 'lib/src/elements/inbound_references.dart', - 'lib/src/elements/instance_ref.dart', - 'lib/src/elements/instance_view.dart', - 'lib/src/elements/isolate/counter_chart.dart', - 'lib/src/elements/isolate/location.dart', - 'lib/src/elements/isolate/run_state.dart', - 'lib/src/elements/isolate/shared_summary.dart', - 'lib/src/elements/isolate/summary.dart', - 'lib/src/elements/isolate_reconnect.dart', - 'lib/src/elements/isolate_ref.dart', - 'lib/src/elements/isolate_view.dart', - 'lib/src/elements/json_view.dart', - 'lib/src/elements/library_ref.dart', - 'lib/src/elements/library_view.dart', - 'lib/src/elements/local_var_descriptors_ref.dart', - 'lib/src/elements/logging.dart', - 'lib/src/elements/logging_list.dart', - 'lib/src/elements/megamorphiccache_ref.dart', - 'lib/src/elements/megamorphiccache_view.dart', - 'lib/src/elements/memory/dashboard.dart', - 'lib/src/elements/memory/graph.dart', - 'lib/src/elements/memory/profile.dart', - 'lib/src/elements/metric/details.dart', - 'lib/src/elements/metric/graph.dart', - 'lib/src/elements/metrics.dart', - 'lib/src/elements/native_memory_profiler.dart', - 'lib/src/elements/nav/class_menu.dart', - 'lib/src/elements/nav/isolate_menu.dart', - 'lib/src/elements/nav/library_menu.dart', - 'lib/src/elements/nav/menu_item.dart', - 'lib/src/elements/nav/notify.dart', - 'lib/src/elements/nav/notify_event.dart', - 'lib/src/elements/nav/notify_exception.dart', - 'lib/src/elements/nav/refresh.dart', - 'lib/src/elements/nav/reload.dart', - 'lib/src/elements/nav/top_menu.dart', - 'lib/src/elements/nav/vm_menu.dart', - 'lib/src/elements/object_common.dart', - 'lib/src/elements/object_view.dart', - 'lib/src/elements/objectpool_ref.dart', - 'lib/src/elements/objectpool_view.dart', - 'lib/src/elements/objectstore_view.dart', - 'lib/src/elements/observatory_application.dart', - 'lib/src/elements/pc_descriptors_ref.dart', - 'lib/src/elements/persistent_handles.dart', - 'lib/src/elements/ports.dart', - 'lib/src/elements/retaining_path.dart', - 'lib/src/elements/sample_buffer_control.dart', - 'lib/src/elements/script_inset.dart', - 'lib/src/elements/script_ref.dart', - 'lib/src/elements/script_view.dart', - 'lib/src/elements/sentinel_value.dart', - 'lib/src/elements/sentinel_view.dart', - 'lib/src/elements/singletargetcache_ref.dart', - 'lib/src/elements/singletargetcache_view.dart', - 'lib/src/elements/source_inset.dart', - 'lib/src/elements/source_link.dart', - 'lib/src/elements/stack_trace_tree_config.dart', - 'lib/src/elements/strongly_reachable_instances.dart', - 'lib/src/elements/subtypetestcache_ref.dart', - 'lib/src/elements/subtypetestcache_view.dart', - 'lib/src/elements/timeline_page.dart', - 'lib/src/elements/token_stream_ref.dart', - 'lib/src/elements/top_retaining_instances.dart', - 'lib/src/elements/type_arguments_ref.dart', - 'lib/src/elements/unknown_ref.dart', - 'lib/src/elements/unlinkedcall_ref.dart', - 'lib/src/elements/unlinkedcall_view.dart', - 'lib/src/elements/view_footer.dart', - 'lib/src/elements/vm_connect.dart', - 'lib/src/elements/vm_connect_target.dart', - 'lib/src/elements/vm_view.dart', - 'lib/src/heap_snapshot/heap_snapshot.dart', - 'lib/src/models/exceptions.dart', - 'lib/src/models/objects/allocation_profile.dart', - 'lib/src/models/objects/breakpoint.dart', - 'lib/src/models/objects/class.dart', - 'lib/src/models/objects/code.dart', - 'lib/src/models/objects/context.dart', - 'lib/src/models/objects/error.dart', - 'lib/src/models/objects/event.dart', - 'lib/src/models/objects/extension_data.dart', - 'lib/src/models/objects/field.dart', - 'lib/src/models/objects/flag.dart', - 'lib/src/models/objects/frame.dart', - 'lib/src/models/objects/function.dart', - 'lib/src/models/objects/guarded.dart', - 'lib/src/models/objects/heap_snapshot.dart', - 'lib/src/models/objects/heap_space.dart', - 'lib/src/models/objects/icdata.dart', - 'lib/src/models/objects/inbound_references.dart', - 'lib/src/models/objects/instance.dart', - 'lib/src/models/objects/isolate.dart', - 'lib/src/models/objects/library.dart', - 'lib/src/models/objects/local_var_descriptors.dart', - 'lib/src/models/objects/map_association.dart', - 'lib/src/models/objects/megamorphiccache.dart', - 'lib/src/models/objects/metric.dart', - 'lib/src/models/objects/notification.dart', - 'lib/src/models/objects/object.dart', - 'lib/src/models/objects/objectpool.dart', - 'lib/src/models/objects/objectstore.dart', - 'lib/src/models/objects/pc_descriptors.dart', - 'lib/src/models/objects/persistent_handles.dart', - 'lib/src/models/objects/ports.dart', - 'lib/src/models/objects/retaining_path.dart', - 'lib/src/models/objects/sample_profile.dart', - 'lib/src/models/objects/script.dart', - 'lib/src/models/objects/sentinel.dart', - 'lib/src/models/objects/service.dart', - 'lib/src/models/objects/single_target_cache.dart', - 'lib/src/models/objects/source_location.dart', - 'lib/src/models/objects/subtype_test_cache.dart', - 'lib/src/models/objects/target.dart', - 'lib/src/models/objects/thread.dart', - 'lib/src/models/objects/timeline_event.dart', - 'lib/src/models/objects/token_stream.dart', - 'lib/src/models/objects/type_arguments.dart', - 'lib/src/models/objects/unknown.dart', - 'lib/src/models/objects/unlinked_call.dart', - 'lib/src/models/objects/vm.dart', - 'lib/src/models/objects/zone.dart', - 'lib/src/models/repositories/allocation_profile.dart', - 'lib/src/models/repositories/breakpoint.dart', - 'lib/src/models/repositories/class.dart', - 'lib/src/models/repositories/context.dart', - 'lib/src/models/repositories/editor.dart', - 'lib/src/models/repositories/eval.dart', - 'lib/src/models/repositories/event.dart', - 'lib/src/models/repositories/field.dart', - 'lib/src/models/repositories/flag.dart', - 'lib/src/models/repositories/function.dart', - 'lib/src/models/repositories/heap_snapshot.dart', - 'lib/src/models/repositories/icdata.dart', - 'lib/src/models/repositories/inbound_references.dart', - 'lib/src/models/repositories/instance.dart', - 'lib/src/models/repositories/isolate.dart', - 'lib/src/models/repositories/library.dart', - 'lib/src/models/repositories/megamorphiccache.dart', - 'lib/src/models/repositories/metric.dart', - 'lib/src/models/repositories/notification.dart', - 'lib/src/models/repositories/object.dart', - 'lib/src/models/repositories/objectpool.dart', - 'lib/src/models/repositories/objectstore.dart', - 'lib/src/models/repositories/persistent_handles.dart', - 'lib/src/models/repositories/ports.dart', - 'lib/src/models/repositories/reachable_size.dart', - 'lib/src/models/repositories/retained_size.dart', - 'lib/src/models/repositories/retaining_path.dart', - 'lib/src/models/repositories/sample_profile.dart', - 'lib/src/models/repositories/script.dart', - 'lib/src/models/repositories/single_target_cache.dart', - 'lib/src/models/repositories/strongly_reachable_instances.dart', - 'lib/src/models/repositories/subtype_test_cache.dart', - 'lib/src/models/repositories/target.dart', - 'lib/src/models/repositories/top_retaining_instances.dart', - 'lib/src/models/repositories/type_arguments.dart', - 'lib/src/models/repositories/unlinked_call.dart', - 'lib/src/models/repositories/vm.dart', - 'lib/src/repositories/allocation_profile.dart', - 'lib/src/repositories/breakpoint.dart', - 'lib/src/repositories/class.dart', - 'lib/src/repositories/context.dart', - 'lib/src/repositories/editor.dart', - 'lib/src/repositories/eval.dart', - 'lib/src/repositories/event.dart', - 'lib/src/repositories/field.dart', - 'lib/src/repositories/flag.dart', - 'lib/src/repositories/function.dart', - 'lib/src/repositories/heap_snapshot.dart', - 'lib/src/repositories/icdata.dart', - 'lib/src/repositories/inbound_references.dart', - 'lib/src/repositories/instance.dart', - 'lib/src/repositories/isolate.dart', - 'lib/src/repositories/library.dart', - 'lib/src/repositories/megamorphiccache.dart', - 'lib/src/repositories/metric.dart', - 'lib/src/repositories/notification.dart', - 'lib/src/repositories/object.dart', - 'lib/src/repositories/objectpool.dart', - 'lib/src/repositories/objectstore.dart', - 'lib/src/repositories/persistent_handles.dart', - 'lib/src/repositories/ports.dart', - 'lib/src/repositories/reachable_size.dart', - 'lib/src/repositories/retained_size.dart', - 'lib/src/repositories/retaining_path.dart', - 'lib/src/repositories/sample_profile.dart', - 'lib/src/repositories/script.dart', - 'lib/src/repositories/settings.dart', - 'lib/src/repositories/single_target_cache.dart', - 'lib/src/repositories/strongly_reachable_instances.dart', - 'lib/src/repositories/subtype_test_cache.dart', - 'lib/src/repositories/target.dart', - 'lib/src/repositories/top_retaining_instances.dart', - 'lib/src/repositories/type_arguments.dart', - 'lib/src/repositories/unlinked_call.dart', - 'lib/src/sample_profile/sample_profile.dart', - 'lib/src/repositories/vm.dart', - 'lib/src/service/object.dart', - 'lib/tracer.dart', - 'lib/utils.dart', - 'web/favicon.ico', - 'web/index.html', - 'web/main.dart', - 'web/third_party/trace_viewer_full.html', - 'web/timeline.html', - 'web/timeline.js', - 'web/timeline_message_handler.js', - ] -} diff --git a/runtime/observatory/update_sources.py b/runtime/observatory/update_sources.py index 92752e9bb24..cc6eb169cfd 100755 --- a/runtime/observatory/update_sources.py +++ b/runtime/observatory/update_sources.py @@ -11,33 +11,35 @@ import sys from datetime import date def getDir(rootdir, target): - sources = [] - for root, subdirs, files in os.walk(rootdir): - subdirs.sort() - files.sort() - for f in files: - sources.append(root + '/' + f) - return sources + sources = [] + for root, subdirs, files in os.walk(rootdir): + subdirs.sort() + files.sort() + for f in files: + sources.append(root + '/' + f) + return sources + +HEADER = """# Copyright (c) 2017, 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. + +# DO NOT EDIT. This file is generated by update_sources.py in this directory. + +# This file contains all dart, css, and html sources for Observatory. +""" def main(): - target = open('observatory_sources.gypi', 'w') - target.write('# Copyright (c) ') - target.write(str(date.today().year)) - target.write(', the Dart project authors. Please see the AUTHORS file\n'); - target.write('# for details. All rights reserved. Use of this source code is governed by a\n'); - target.write('# BSD-style license that can be found in the LICENSE file.\n'); - target.write('\n'); - target.write('# This file contains all dart, css, and html sources for Observatory.\n'); - target.write('{\n \'sources\': [\n') + with open('observatory_sources.gni', 'w') as target: + target.write(HEADER) + target.write('observatory_sources = [\n') sources = [] for rootdir in ['lib', 'web']: - sources.extend(getDir(rootdir, target)) + sources.extend(getDir(rootdir, target)) sources.sort() for s in sources: - if (s[-9:] != 'README.md'): - target.write(' \'' + s + '\',\n') - target.write(' ]\n}\n') - target.close() + if (s[-9:] != 'README.md'): + target.write(' "' + s + '",\n') + target.write(']\n') if __name__ == "__main__": main() diff --git a/runtime/platform/BUILD.gn b/runtime/platform/BUILD.gn new file mode 100644 index 00000000000..901b0ad27d5 --- /dev/null +++ b/runtime/platform/BUILD.gn @@ -0,0 +1,34 @@ +# Copyright (c) 2017, 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. + +import("platform_sources.gni") + +template("build_libdart_platform") { + extra_configs = [] + if (defined(invoker.extra_configs)) { + extra_configs += invoker.extra_configs + } + static_library(target_name) { + configs += [ "..:dart_config" ] + extra_configs + if (is_fuchsia) { + configs -= [ "//build/config:symbol_visibility_hidden" ] + deps = [ + "//apps/tracing/lib/trace", + ] + } + public_configs = [ "../vm:libdart_vm_config" ] + + sources = platform_sources + + include_dirs = [ ".." ] + } +} + +build_libdart_platform("libdart_platform") { + extra_configs = [ "..:dart_maybe_product_config" ] +} + +build_libdart_platform("libdart_platform_product") { + extra_configs = [ "..:dart_product_config" ] +} diff --git a/runtime/platform/platform_headers.gypi b/runtime/platform/platform_headers.gypi deleted file mode 100644 index 2d473379852..00000000000 --- a/runtime/platform/platform_headers.gypi +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains headers shared between the vm and bin components. -{ - 'sources': [ - 'address_sanitizer.h', - 'allocation.h', - 'assert.h', - 'c99_support_win.h', - 'floating_point.h', - 'floating_point_win.h', - 'globals.h', - 'growable_array.h', - 'hashmap.h', - 'inttypes_support_win.h', - 'memory_sanitizer.h', - 'text_buffer.h', - 'utils.h', - ], -} diff --git a/runtime/platform/platform_sources.gni b/runtime/platform/platform_sources.gni new file mode 100644 index 00000000000..b17d96715c1 --- /dev/null +++ b/runtime/platform/platform_sources.gni @@ -0,0 +1,27 @@ +# Copyright (c) 2017, 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. + +# This file contains headers and sources shared between the vm and bin +# components. +platform_sources = [ + "address_sanitizer.h", + "allocation.h", + "assert.cc", + "assert.h", + "c99_support_win.h", + "floating_point.h", + "floating_point_win.cc", + "floating_point_win.h", + "globals.h", + "growable_array.h", + "hashmap.cc", + "hashmap.h", + "inttypes_support_win.h", + "memory_sanitizer.h", + "signal_blocker.h", + "text_buffer.cc", + "text_buffer.h", + "utils.cc", + "utils.h", +] diff --git a/runtime/platform/platform_sources.gypi b/runtime/platform/platform_sources.gypi deleted file mode 100644 index 7327ad35e50..00000000000 --- a/runtime/platform/platform_sources.gypi +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains sources shared between the vm and bin components. -{ - 'sources': [ - 'assert.cc', - 'hashmap.cc', - 'floating_point_win.cc', - 'signal_blocker.h', - 'text_buffer.cc', - 'utils.cc', - ], -} diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn index f8369093bf9..5baea6e76f4 100644 --- a/runtime/vm/BUILD.gn +++ b/runtime/vm/BUILD.gn @@ -4,9 +4,34 @@ import("../../build/executable_suffix.gni") import("../../build/prebuilt_dart_sdk.gni") +import("../../sdk/lib/async/async_sources.gni") +import("../../sdk/lib/collection/collection_sources.gni") +import("../../sdk/lib/convert/convert_sources.gni") +import("../../sdk/lib/core/core_sources.gni") +import("../../sdk/lib/developer/developer_sources.gni") +import("../../sdk/lib/internal/internal_sources.gni") +import("../../sdk/lib/isolate/isolate_sources.gni") +import("../../sdk/lib/math/math_sources.gni") +import("../../sdk/lib/mirrors/mirrors_sources.gni") +import("../../sdk/lib/profiler/profiler_sources.gni") +import("../../sdk/lib/typed_data/typed_data_sources.gni") +import("../../sdk/lib/vmservice/vmservice_sources.gni") import("../../utils/generate_patch_sdk.gni") -import("gypi_contents.gni") +import("../bin/io_sources.gni") +import("../lib/async_sources.gni") +import("../lib/collection_sources.gni") +import("../lib/convert_sources.gni") +import("../lib/core_sources.gni") +import("../lib/developer_sources.gni") +import("../lib/internal_sources.gni") +import("../lib/isolate_sources.gni") +import("../lib/math_sources.gni") +import("../lib/mirrors_sources.gni") +import("../lib/profiler_sources.gni") +import("../lib/typed_data_sources.gni") +import("../lib/vmservice_sources.gni") import("../runtime_args.gni") +import("vm_sources.gni") config("libdart_vm_config") { if (is_fuchsia) { @@ -28,37 +53,6 @@ config("libdart_vm_config") { } } -template("build_libdart_platform") { - extra_configs = [] - if (defined(invoker.extra_configs)) { - extra_configs += invoker.extra_configs - } - static_library(target_name) { - configs += [ "..:dart_config" ] + extra_configs - if (is_fuchsia) { - configs -= [ "//build/config:symbol_visibility_hidden" ] - deps = [ - "//apps/tracing/lib/trace", - ] - } - public_configs = [ ":libdart_vm_config" ] - - sources = rebase_path(processed_gypis.platform_sources, ".", "../platform") - - include_dirs = [ ".." ] - } -} - -build_libdart_platform("libdart_platform") { - extra_configs = [ "..:dart_maybe_product_config" ] -} - -build_libdart_platform("libdart_platform_product") { - extra_configs = [ "..:dart_product_config" ] -} - -vm_sources_list = processed_gypis.vm_sources - template("build_libdart_vm") { extra_configs = [] if (defined(invoker.extra_configs)) { @@ -77,7 +71,7 @@ template("build_libdart_vm") { "*_test.cc", "*_test.h", ]) - sources = vm_sources_list + sources = vm_sources include_dirs = [ ".." ] } } @@ -327,112 +321,117 @@ generate_core_libraries("core_libraries") { sources = [ [ "async", - processed_gypis.async_sdk_sources, + async_sdk_sources, "../../sdk/lib/async", "async", true, - processed_gypis.async_runtime_sources, - "../lib", - ], - [ - "core", - processed_gypis.core_sdk_sources, - "../../sdk/lib/core", - "core", - true, - processed_gypis.core_runtime_sources, + async_runtime_sources, "../lib", ], [ "collection", - processed_gypis.collection_sdk_sources, + collection_sdk_sources, "../../sdk/lib/collection", "collection", true, - processed_gypis.collection_runtime_sources, + collection_runtime_sources, "../lib", ], [ "convert", - processed_gypis.convert_sdk_sources, + convert_sdk_sources, "../../sdk/lib/convert", "convert", true, - processed_gypis.convert_runtime_sources, + convert_runtime_sources, + "../lib", + ], + [ + "core", + core_sdk_sources, + "../../sdk/lib/core", + "core", + true, + core_runtime_sources, "../lib", ], [ "developer", - processed_gypis.developer_sdk_sources, + developer_sdk_sources, "../../sdk/lib/developer", "developer", true, - processed_gypis.developer_runtime_sources, + developer_runtime_sources, "../lib", ], [ "_internal", - processed_gypis.internal_sdk_sources, + internal_sdk_sources, "../../sdk/lib/internal", "internal", true, - processed_gypis.internal_runtime_sources, + internal_runtime_sources, "../lib", ], [ "isolate", - processed_gypis.isolate_sdk_sources, + isolate_sdk_sources, "../../sdk/lib/isolate", "isolate", true, - processed_gypis.isolate_runtime_sources, + isolate_runtime_sources, "../lib", ], [ "math", - processed_gypis.math_sdk_sources, + math_sdk_sources, "../../sdk/lib/math", "math", true, - processed_gypis.math_runtime_sources, + math_runtime_sources, "../lib", ], [ "mirrors", - processed_gypis.mirrors_sdk_sources, + mirrors_sdk_sources, "../../sdk/lib/mirrors", "mirrors", true, - processed_gypis.mirrors_runtime_sources, + mirrors_runtime_sources, "../lib", ], [ "profiler", - processed_gypis.profiler_sdk_sources, + profiler_sdk_sources, "../../sdk/lib/profiler", "profiler", false, ], [ "typed_data", - processed_gypis.typed_data_sdk_sources, + typed_data_sdk_sources, "../../sdk/lib/typed_data", "typed_data", true, - processed_gypis.typed_data_runtime_sources, + typed_data_runtime_sources, "../lib", ], [ "_vmservice", - processed_gypis.vmservice_sdk_sources, + vmservice_sdk_sources, "../../sdk/lib/vmservice", "vmservice", true, - processed_gypis.vmservice_runtime_sources, + vmservice_runtime_sources, "../lib", ], ] - allsources = processed_gypis.allsources + allsources = async_runtime_sources + collection_runtime_sources + + convert_runtime_sources + core_runtime_sources + + developer_runtime_sources + internal_runtime_sources + + isolate_runtime_sources + math_runtime_sources + + mirrors_runtime_sources + profiler_runtime_sources + + typed_data_runtime_sources + vmservice_runtime_sources } template("concatenate_patch") { @@ -482,67 +481,67 @@ generate_vm_patched_sdk("patched_sdk") { libraries = [ [ "async", - processed_gypis.async_runtime_sources, + async_runtime_sources, "../lib", ], [ "collection", - processed_gypis.collection_runtime_sources, + collection_runtime_sources, "../lib", ], [ "convert", - processed_gypis.convert_runtime_sources, + convert_runtime_sources, "../lib", ], [ "core", - processed_gypis.core_runtime_sources, + core_runtime_sources, "../lib", ], [ "developer", - processed_gypis.developer_runtime_sources, + developer_runtime_sources, "../lib", ], [ "internal", - processed_gypis.internal_runtime_sources, + internal_runtime_sources, "../lib", ], [ "isolate", - processed_gypis.isolate_runtime_sources, + isolate_runtime_sources, "../lib", ], [ "math", - processed_gypis.math_runtime_sources, + math_runtime_sources, "../lib", ], [ "mirrors", - processed_gypis.mirrors_runtime_sources, + mirrors_runtime_sources, "../lib", ], [ "profiler", - processed_gypis.profiler_runtime_sources, + profiler_runtime_sources, "../lib", ], [ "typed_data", - processed_gypis.typed_data_runtime_sources, + typed_data_runtime_sources, "../lib", ], [ "vmservice", - processed_gypis.vmservice_runtime_sources, + vmservice_runtime_sources, "../lib", ], [ "io", - processed_gypis.bin_io_sources, + io_runtime_sources, "../bin", ], ] diff --git a/runtime/vm/gypi_contents.gni b/runtime/vm/gypi_contents.gni deleted file mode 100644 index 4ba651e5f25..00000000000 --- a/runtime/vm/gypi_contents.gni +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (c) 2016, 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. - -_core_library_names = [ - "async", - "core", - "collection", - "convert", - "developer", - "internal", - "isolate", - "math", - "mirrors", - "profiler", - "typed_data", - "vmservice", -] - -_core_library_gypis = [ - "../platform/platform_headers.gypi", - "../platform/platform_sources.gypi", - "../vm/vm_sources.gypi", - "../lib/async_sources.gypi", - "../lib/core_sources.gypi", - "../lib/collection_sources.gypi", - "../lib/convert_sources.gypi", - "../lib/developer_sources.gypi", - "../lib/internal_sources.gypi", - "../lib/isolate_sources.gypi", - "../lib/math_sources.gypi", - "../lib/mirrors_sources.gypi", - "../lib/typed_data_sources.gypi", - "../lib/vmservice_sources.gypi", - "../../sdk/lib/async/async_sources.gypi", - "../../sdk/lib/collection/collection_sources.gypi", - "../../sdk/lib/convert/convert_sources.gypi", - "../../sdk/lib/core/core_sources.gypi", - "../../sdk/lib/developer/developer_sources.gypi", - "../../sdk/lib/internal/internal_sources.gypi", - "../../sdk/lib/isolate/isolate_sources.gypi", - "../../sdk/lib/math/math_sources.gypi", - "../../sdk/lib/mirrors/mirrors_sources.gypi", - "../../sdk/lib/profiler/profiler_sources.gypi", - "../../sdk/lib/typed_data/typed_data_sources.gypi", - "../../sdk/lib/vmservice/vmservice_sources.gypi", - "../bin/io_sources.gypi", -] - -processed_gypis = exec_script("../../tools/process_gypis.py", - _core_library_names, - "scope", - _core_library_gypis) diff --git a/runtime/vm/service_sources.gypi b/runtime/vm/service_sources.gypi deleted file mode 100644 index a0de7e9d880..00000000000 --- a/runtime/vm/service_sources.gypi +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2014, 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. - -{ - 'sources': [ - 'service/client.dart', - 'service/constants.dart', - 'service/message.dart', - 'service/message_router.dart', - 'service/running_isolate.dart', - 'service/running_isolates.dart', - 'service/vmservice.dart', - ] -} \ No newline at end of file diff --git a/runtime/vm/vm_sources.gni b/runtime/vm/vm_sources.gni new file mode 100644 index 00000000000..f8231c38c19 --- /dev/null +++ b/runtime/vm/vm_sources.gni @@ -0,0 +1,561 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources (vm and tests) for the dart virtual machine. +# Unit test files need to have a "_test" suffix appended to the name. +vm_sources = [ + "allocation.cc", + "allocation.h", + "aot_optimizer.cc", + "aot_optimizer.h", + "assembler.cc", + "assembler.h", + "assembler_arm.cc", + "assembler_arm.h", + "assembler_arm64.cc", + "assembler_arm64.h", + "assembler_dbc.cc", + "assembler_dbc.h", + "assembler_ia32.cc", + "assembler_ia32.h", + "assembler_x64.cc", + "assembler_x64.h", + "ast.cc", + "ast.h", + "ast_printer.cc", + "ast_printer.h", + "ast_transformer.cc", + "ast_transformer.h", + "atomic.h", + "atomic_android.h", + "atomic_fuchsia.h", + "atomic_linux.h", + "atomic_macos.h", + "atomic_win.h", + "base_isolate.h", + "become.h", + "become.cc", + "bit_vector.cc", + "bit_vector.h", + "bitfield.h", + "bitmap.cc", + "bitmap.h", + "block_scheduler.cc", + "block_scheduler.h", + "boolfield.h", + "bootstrap.h", + "bootstrap_natives.cc", + "bootstrap_natives.h", + "branch_optimizer.cc", + "branch_optimizer.h", + "cha.cc", + "cha.h", + "class_finalizer.cc", + "class_finalizer.h", + "class_table.cc", + "class_table.h", + "clustered_snapshot.cc", + "clustered_snapshot.h", + "code_descriptors.cc", + "code_descriptors.h", + "code_observers.cc", + "code_observers.h", + "code_patcher.cc", + "code_patcher.h", + "code_patcher_arm.cc", + "code_patcher_arm64.cc", + "code_patcher_dbc.cc", + "code_patcher_ia32.cc", + "code_patcher_x64.cc", + "compilation_trace.cc", + "compilation_trace.h", + "compiler.cc", + "compiler.h", + "compiler_stats.cc", + "compiler_stats.h", + "constant_propagator.h", + "constant_propagator.cc", + "constants_arm.h", + "constants_arm64.h", + "constants_ia32.h", + "constants_x64.h", + "cpu.h", + "cpu_arm.cc", + "cpu_arm64.cc", + "cpu_dbc.cc", + "cpu_ia32.cc", + "cpu_x64.cc", + "cpuid.h", + "cpuid.cc", + "cpuinfo.h", + "cpuinfo_android.cc", + "cpuinfo_fuchsia.cc", + "cpuinfo_linux.cc", + "cpuinfo_macos.cc", + "cpuinfo_win.cc", + "dart.cc", + "dart.h", + "dart_api_impl.h", + "dart_api_message.cc", + "dart_api_message.h", + "dart_api_state.cc", + "dart_api_state.h", + "dart_entry.cc", + "dart_entry.h", + "datastream.h", + "debugger.cc", + "debugger.h", + "debugger_arm.cc", + "debugger_arm64.cc", + "debugger_dbc.cc", + "debugger_ia32.cc", + "debugger_x64.cc", + "deferred_objects.cc", + "deferred_objects.h", + "deopt_instructions.cc", + "deopt_instructions.h", + "disassembler.cc", + "disassembler.h", + "disassembler_arm.cc", + "disassembler_arm64.cc", + "disassembler_dbc.cc", + "disassembler_ia32.cc", + "disassembler_x64.cc", + "double_conversion.cc", + "double_conversion.h", + "double_internals.h", + "dwarf.cc", + "dwarf.h", + "exceptions.cc", + "exceptions.h", + "fixed_cache.h", + "flag_list.h", + "flags.cc", + "flags.h", + "flow_graph.cc", + "flow_graph.h", + "flow_graph_allocator.cc", + "flow_graph_allocator.h", + "flow_graph_builder.cc", + "flow_graph_builder.h", + "flow_graph_compiler.cc", + "flow_graph_compiler.h", + "flow_graph_compiler_arm.cc", + "flow_graph_compiler_arm64.cc", + "flow_graph_compiler_dbc.cc", + "flow_graph_compiler_ia32.cc", + "flow_graph_compiler_x64.cc", + "flow_graph_inliner.cc", + "flow_graph_inliner.h", + "flow_graph_range_analysis.cc", + "flow_graph_range_analysis.h", + "flow_graph_type_propagator.cc", + "flow_graph_type_propagator.h", + "freelist.cc", + "freelist.h", + "gc_marker.cc", + "gc_marker.h", + "gc_sweeper.cc", + "gc_sweeper.h", + "gdb_helpers.cc", + "globals.h", + "growable_array.h", + "handles.cc", + "handles.h", + "handles_impl.h", + "hash_map.h", + "hash_table.h", + "heap.cc", + "heap.h", + "il_printer.cc", + "il_printer.h", + "instructions.h", + "instructions_arm.cc", + "instructions_arm.h", + "instructions_arm64.cc", + "instructions_arm64.h", + "instructions_dbc.cc", + "instructions_dbc.h", + "instructions_ia32.cc", + "instructions_ia32.h", + "instructions_x64.cc", + "instructions_x64.h", + "intermediate_language.cc", + "intermediate_language.h", + "intermediate_language_arm.cc", + "intermediate_language_arm64.cc", + "intermediate_language_dbc.cc", + "intermediate_language_ia32.cc", + "intermediate_language_x64.cc", + "intrinsifier.cc", + "intrinsifier.h", + "intrinsifier_arm.cc", + "intrinsifier_arm64.cc", + "intrinsifier_dbc.cc", + "intrinsifier_ia32.cc", + "intrinsifier_x64.cc", + "isolate.cc", + "isolate.h", + "isolate_reload.cc", + "isolate_reload.h", + "jit_optimizer.cc", + "jit_optimizer.h", + "json_parser.h", + "json_stream.h", + "json_stream.cc", + "kernel_isolate.cc", + "kernel_isolate.h", + "locations.cc", + "locations.h", + "lockers.cc", + "lockers.h", + "log.cc", + "log.h", + "longjump.cc", + "longjump.h", + "malloc_hooks_jemalloc.cc", + "malloc_hooks_tcmalloc.cc", + "malloc_hooks_arm.cc", + "malloc_hooks_arm64.cc", + "malloc_hooks_ia32.cc", + "malloc_hooks_x64.cc", + "malloc_hooks.h", + "malloc_hooks_unsupported.cc", + "megamorphic_cache_table.cc", + "megamorphic_cache_table.h", + "memory_region.cc", + "memory_region.h", + "message.cc", + "message.h", + "message_handler.cc", + "message_handler.h", + "method_recognizer.cc", + "method_recognizer.h", + "metrics.cc", + "metrics.h", + "native_arguments.h", + "native_entry.cc", + "native_entry.h", + "native_message_handler.cc", + "native_message_handler.h", + "native_symbol.h", + "native_symbol_android.cc", + "native_symbol_fuchsia.cc", + "native_symbol_linux.cc", + "native_symbol_macos.cc", + "native_symbol_win.cc", + "object.cc", + "object.h", + "object_graph.cc", + "object_graph.h", + "object_id_ring.cc", + "object_id_ring.h", + "object_reload.cc", + "object_service.cc", + "object_set.h", + "object_store.cc", + "object_store.h", + "optimizer.cc", + "optimizer.h", + "os.h", + "os_android.cc", + "os_fuchsia.cc", + "os_linux.cc", + "os_macos.cc", + "os_thread.cc", + "os_thread.h", + "os_thread_android.cc", + "os_thread_android.h", + "os_thread_fuchsia.cc", + "os_thread_fuchsia.h", + "os_thread_linux.cc", + "os_thread_linux.h", + "os_thread_macos.cc", + "os_thread_macos.h", + "os_thread_win.cc", + "os_thread_win.h", + "os_win.cc", + "pages.cc", + "pages.h", + "parser.cc", + "parser.h", + "port.cc", + "port.h", + "precompiler.cc", + "precompiler.h", + "program_visitor.cc", + "program_visitor.h", + "kernel.h", + "kernel.cc", + "kernel_binary.cc", + "kernel_binary.h", + "kernel_binary_flowgraph.cc", + "kernel_binary_flowgraph.h", + "kernel_to_il.cc", + "kernel_to_il.h", + "kernel_reader.h", + "kernel_reader.cc", + "proccpuinfo.cc", + "proccpuinfo.h", + "profiler_service.cc", + "profiler_service.h", + "profiler.cc", + "profiler.h", + "random.cc", + "random.h", + "raw_object.cc", + "raw_object.h", + "raw_object_snapshot.cc", + "redundancy_elimination.cc", + "redundancy_elimination.h", + "regexp.cc", + "regexp.h", + "regexp_assembler.cc", + "regexp_assembler.h", + "regexp_assembler_bytecode.cc", + "regexp_assembler_bytecode.h", + "regexp_assembler_bytecode_inl.h", + "regexp_assembler_ir.cc", + "regexp_assembler_ir.h", + "regexp_ast.cc", + "regexp_ast.h", + "regexp_bytecodes.h", + "regexp_interpreter.cc", + "regexp_interpreter.h", + "regexp_parser.cc", + "regexp_parser.h", + "report.cc", + "report.h", + "resolver.cc", + "resolver.h", + "reusable_handles.h", + "ring_buffer.h", + "runtime_entry.h", + "runtime_entry_list.h", + "runtime_entry_arm.cc", + "runtime_entry_arm64.cc", + "runtime_entry_dbc.cc", + "runtime_entry_ia32.cc", + "runtime_entry.cc", + "runtime_entry_x64.cc", + "safepoint.cc", + "safepoint.h", + "scanner.cc", + "scanner.h", + "scavenger.cc", + "scavenger.h", + "scope_timer.h", + "scopes.cc", + "scopes.h", + "service.cc", + "service.h", + "service_event.cc", + "service_event.h", + "service_isolate.cc", + "service_isolate.h", + "signal_handler_android.cc", + "signal_handler_fuchsia.cc", + "signal_handler_linux.cc", + "signal_handler_macos.cc", + "signal_handler_win.cc", + "signal_handler.h", + "simulator.h", + "simulator_arm.cc", + "simulator_arm.h", + "simulator_arm64.cc", + "simulator_arm64.h", + "simulator_dbc.cc", + "simulator_dbc.h", + "snapshot.cc", + "snapshot.h", + "snapshot_ids.h", + "source_report.cc", + "source_report.h", + "spaces.h", + "stack_frame.cc", + "stack_frame.h", + "stack_frame_arm.h", + "stack_frame_arm64.h", + "stack_frame_ia32.h", + "stack_frame_x64.h", + "stack_trace.cc", + "stack_trace.h", + "store_buffer.cc", + "store_buffer.h", + "stub_code.cc", + "stub_code.h", + "stub_code_arm.cc", + "stub_code_arm64.cc", + "stub_code_dbc.cc", + "stub_code_ia32.cc", + "stub_code_x64.cc", + "symbols.cc", + "symbols.h", + "tags.cc", + "tags.h", + "thread.cc", + "thread.h", + "thread_barrier.h", + "thread_interrupter.cc", + "thread_interrupter.h", + "thread_interrupter_android.cc", + "thread_interrupter_fuchsia.cc", + "thread_interrupter_linux.cc", + "thread_interrupter_macos.cc", + "thread_interrupter_win.cc", + "thread_pool.cc", + "thread_pool.h", + "thread_registry.cc", + "thread_registry.h", + "timeline.cc", + "timeline.h", + "timeline_analysis.cc", + "timeline_analysis.h", + "timeline_android.cc", + "timeline_fuchsia.cc", + "timeline_linux.cc", + "timeline_macos.cc", + "timeline_win.cc", + "timer.cc", + "timer.h", + "token.cc", + "token.h", + "token_position.cc", + "token_position.h", + "type_table.h", + "unibrow.cc", + "unibrow.h", + "unibrow-inl.h", + "unicode.cc", + "unicode.h", + "unicode_data.cc", + "uri.cc", + "uri.h", + "verifier.cc", + "verifier.h", + "virtual_memory.cc", + "virtual_memory.h", + "virtual_memory_android.cc", + "virtual_memory_fuchsia.cc", + "virtual_memory_linux.cc", + "virtual_memory_macos.cc", + "virtual_memory_win.cc", + "visitor.h", + "weak_code.cc", + "weak_code.h", + "weak_table.cc", + "weak_table.h", + "zone.cc", + "zone.h", + "zone_text_buffer.cc", + "zone_text_buffer.h", +] + +vm_sources_tests = [ + "allocation_test.cc", + "assembler_arm_test.cc", + "assembler_arm64_test.cc", + "assembler_dbc_test.cc", + "assembler_ia32_test.cc", + "assembler_test.cc", + "assembler_x64_test.cc", + "assert_test.cc", + "ast_printer_test.cc", + "ast_test.cc", + "atomic_test.cc", + "benchmark_test.cc", + "benchmark_test.h", + "bigint_test.cc", + "bit_set_test.cc", + "bit_vector_test.cc", + "bitfield_test.cc", + "bitmap_test.cc", + "boolfield_test.cc", + "cha_test.cc", + "class_finalizer_test.cc", + "code_descriptors_test.cc", + "code_generator_test.cc", + "code_patcher_arm_test.cc", + "code_patcher_arm64_test.cc", + "code_patcher_ia32_test.cc", + "code_patcher_x64_test.cc", + "compiler_test.cc", + "cpu_test.cc", + "cpuinfo_test.cc", + "custom_isolate_test.cc", + "dart_api_impl_test.cc", + "dart_entry_test.cc", + "debugger_test.cc", + "debugger_api_impl_test.cc", + "disassembler_test.cc", + "exceptions_test.cc", + "find_code_object_test.cc", + "fixed_cache_test.cc", + "flags_test.cc", + "flow_graph_builder_test.cc", + "flow_graph_range_analysis_test.cc", + "freelist_test.cc", + "growable_array_test.cc", + "guard_field_test.cc", + "handles_test.cc", + "hash_map_test.cc", + "hash_table_test.cc", + "heap_test.cc", + "instructions_arm_test.cc", + "instructions_arm64_test.cc", + "instructions_ia32_test.cc", + "instructions_x64_test.cc", + "intermediate_language_test.cc", + "isolate_reload_test.cc", + "isolate_test.cc", + "json_test.cc", + "log_test.cc", + "longjump_test.cc", + "malloc_hooks_test.cc", + "memory_region_test.cc", + "message_handler_test.cc", + "message_test.cc", + "metrics_test.cc", + "native_entry_test.cc", + "native_entry_test.h", + "object_arm_test.cc", + "object_arm64_test.cc", + "object_dbc_test.cc", + "object_graph_test.cc", + "object_ia32_test.cc", + "object_id_ring_test.cc", + "object_store_test.cc", + "object_test.cc", + "object_x64_test.cc", + "os_test.cc", + "pages_test.cc", + "parser_test.cc", + "port_test.cc", + "profiler_test.cc", + "regexp_test.cc", + "resolver_test.cc", + "ring_buffer_test.cc", + "scanner_test.cc", + "scavenger_test.cc", + "scopes_test.cc", + "service_test.cc", + "snapshot_test.cc", + "source_report_test.cc", + "stack_frame_test.cc", + "stub_code_arm_test.cc", + "stub_code_arm64_test.cc", + "stub_code_ia32_test.cc", + "stub_code_x64_test.cc", + "thread_barrier_test.cc", + "thread_pool_test.cc", + "thread_test.cc", + "timeline_test.cc", + "unicode_test.cc", + "unit_test.cc", + "unit_test.h", + "uri_test.cc", + "utils_test.cc", + "virtual_memory_test.cc", + "zone_test.cc", +] diff --git a/runtime/vm/vm_sources.gypi b/runtime/vm/vm_sources.gypi deleted file mode 100644 index 153c0b65937..00000000000 --- a/runtime/vm/vm_sources.gypi +++ /dev/null @@ -1,560 +0,0 @@ -# Copyright (c) 2013, 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. - -# This file contains all sources (vm and tests) for the dart virtual machine. -# Unit test files need to have a '_test' suffix appended to the name. -{ - 'sources': [ - 'allocation.cc', - 'allocation.h', - 'allocation_test.cc', - 'aot_optimizer.cc', - 'aot_optimizer.h', - 'assembler.cc', - 'assembler.h', - 'assembler_arm.cc', - 'assembler_arm.h', - 'assembler_arm_test.cc', - 'assembler_arm64.cc', - 'assembler_arm64.h', - 'assembler_arm64_test.cc', - 'assembler_dbc.cc', - 'assembler_dbc.h', - 'assembler_dbc_test.cc', - 'assembler_ia32.cc', - 'assembler_ia32.h', - 'assembler_ia32_test.cc', - 'assembler_test.cc', - 'assembler_x64.cc', - 'assembler_x64.h', - 'assembler_x64_test.cc', - 'assert_test.cc', - 'ast.cc', - 'ast.h', - 'ast_printer.cc', - 'ast_printer.h', - 'ast_printer_test.cc', - 'ast_test.cc', - 'ast_transformer.cc', - 'ast_transformer.h', - 'atomic.h', - 'atomic_android.h', - 'atomic_fuchsia.h', - 'atomic_linux.h', - 'atomic_macos.h', - 'atomic_test.cc', - 'atomic_win.h', - 'base_isolate.h', - 'become.h', - 'become.cc', - 'benchmark_test.cc', - 'benchmark_test.h', - 'bigint_test.cc', - 'bit_set_test.cc', - 'bit_vector.cc', - 'bit_vector.h', - 'bit_vector_test.cc', - 'bitfield.h', - 'bitfield_test.cc', - 'bitmap.cc', - 'bitmap.h', - 'bitmap_test.cc', - 'block_scheduler.cc', - 'block_scheduler.h', - 'boolfield.h', - 'boolfield_test.cc', - 'bootstrap.h', - 'bootstrap_natives.cc', - 'bootstrap_natives.h', - 'branch_optimizer.cc', - 'branch_optimizer.h', - 'cha.cc', - 'cha.h', - 'cha_test.cc', - 'class_finalizer.cc', - 'class_finalizer.h', - 'class_finalizer_test.cc', - 'class_table.cc', - 'class_table.h', - 'clustered_snapshot.cc', - 'clustered_snapshot.h', - 'code_descriptors.cc', - 'code_descriptors.h', - 'code_descriptors_test.cc', - 'code_generator_test.cc', - 'code_observers.cc', - 'code_observers.h', - 'code_patcher.cc', - 'code_patcher.h', - 'code_patcher_arm.cc', - 'code_patcher_arm_test.cc', - 'code_patcher_arm64.cc', - 'code_patcher_arm64_test.cc', - 'code_patcher_dbc.cc', - 'code_patcher_ia32.cc', - 'code_patcher_ia32_test.cc', - 'code_patcher_x64.cc', - 'code_patcher_x64_test.cc', - 'compilation_trace.cc', - 'compilation_trace.h', - 'compiler.cc', - 'compiler.h', - 'compiler_stats.cc', - 'compiler_stats.h', - 'compiler_test.cc', - 'constant_propagator.h', - 'constant_propagator.cc', - 'constants_arm.h', - 'constants_arm64.h', - 'constants_ia32.h', - 'constants_x64.h', - 'cpu.h', - 'cpu_arm.cc', - 'cpu_arm64.cc', - 'cpu_dbc.cc', - 'cpu_ia32.cc', - 'cpu_test.cc', - 'cpu_x64.cc', - 'cpuid.h', - 'cpuid.cc', - 'cpuinfo.h', - 'cpuinfo_android.cc', - 'cpuinfo_fuchsia.cc', - 'cpuinfo_linux.cc', - 'cpuinfo_macos.cc', - 'cpuinfo_test.cc', - 'cpuinfo_win.cc', - 'custom_isolate_test.cc', - 'dart.cc', - 'dart.h', - 'dart_api_impl.h', - 'dart_api_impl_test.cc', - 'dart_api_message.cc', - 'dart_api_message.h', - 'dart_api_state.cc', - 'dart_api_state.h', - 'dart_entry.cc', - 'dart_entry.h', - 'dart_entry_test.cc', - 'datastream.h', - 'debugger.cc', - 'debugger_test.cc', - 'debugger.h', - 'debugger_api_impl_test.cc', - 'debugger_arm.cc', - 'debugger_arm64.cc', - 'debugger_dbc.cc', - 'debugger_ia32.cc', - 'debugger_x64.cc', - 'deferred_objects.cc', - 'deferred_objects.h', - 'deopt_instructions.cc', - 'deopt_instructions.h', - 'disassembler.cc', - 'disassembler.h', - 'disassembler_arm.cc', - 'disassembler_arm64.cc', - 'disassembler_dbc.cc', - 'disassembler_ia32.cc', - 'disassembler_test.cc', - 'disassembler_x64.cc', - 'double_conversion.cc', - 'double_conversion.h', - 'double_internals.h', - 'dwarf.cc', - 'dwarf.h', - 'exceptions.cc', - 'exceptions.h', - 'exceptions_test.cc', - 'find_code_object_test.cc', - 'fixed_cache.h', - 'fixed_cache_test.cc', - 'flag_list.h', - 'flags.cc', - 'flags.h', - 'flags_test.cc', - 'flow_graph.cc', - 'flow_graph.h', - 'flow_graph_allocator.cc', - 'flow_graph_allocator.h', - 'flow_graph_builder.cc', - 'flow_graph_builder.h', - 'flow_graph_builder_test.cc', - 'flow_graph_compiler.cc', - 'flow_graph_compiler.h', - 'flow_graph_compiler_arm.cc', - 'flow_graph_compiler_arm64.cc', - 'flow_graph_compiler_dbc.cc', - 'flow_graph_compiler_ia32.cc', - 'flow_graph_compiler_x64.cc', - 'flow_graph_inliner.cc', - 'flow_graph_inliner.h', - 'flow_graph_range_analysis.cc', - 'flow_graph_range_analysis.h', - 'flow_graph_range_analysis_test.cc', - 'flow_graph_type_propagator.cc', - 'flow_graph_type_propagator.h', - 'freelist.cc', - 'freelist.h', - 'freelist_test.cc', - 'gc_marker.cc', - 'gc_marker.h', - 'gc_sweeper.cc', - 'gc_sweeper.h', - 'gdb_helpers.cc', - 'globals.h', - 'growable_array.h', - 'growable_array_test.cc', - 'guard_field_test.cc', - 'handles.cc', - 'handles.h', - 'handles_impl.h', - 'handles_test.cc', - 'hash_map.h', - 'hash_map_test.cc', - 'hash_table.h', - 'hash_table_test.cc', - 'heap.cc', - 'heap.h', - 'heap_test.cc', - 'il_printer.cc', - 'il_printer.h', - 'instructions.h', - 'instructions_arm.cc', - 'instructions_arm.h', - 'instructions_arm_test.cc', - 'instructions_arm64.cc', - 'instructions_arm64.h', - 'instructions_arm64_test.cc', - 'instructions_dbc.cc', - 'instructions_dbc.h', - 'instructions_ia32.cc', - 'instructions_ia32.h', - 'instructions_ia32_test.cc', - 'instructions_x64.cc', - 'instructions_x64.h', - 'instructions_x64_test.cc', - 'intermediate_language.cc', - 'intermediate_language.h', - 'intermediate_language_arm.cc', - 'intermediate_language_arm64.cc', - 'intermediate_language_dbc.cc', - 'intermediate_language_ia32.cc', - 'intermediate_language_test.cc', - 'intermediate_language_x64.cc', - 'intrinsifier.cc', - 'intrinsifier.h', - 'intrinsifier_arm.cc', - 'intrinsifier_arm64.cc', - 'intrinsifier_dbc.cc', - 'intrinsifier_ia32.cc', - 'intrinsifier_x64.cc', - 'isolate.cc', - 'isolate.h', - 'isolate_reload.cc', - 'isolate_reload.h', - 'isolate_reload_test.cc', - 'isolate_test.cc', - 'jit_optimizer.cc', - 'jit_optimizer.h', - 'json_parser.h', - 'json_stream.h', - 'json_stream.cc', - 'json_test.cc', - 'kernel_isolate.cc', - 'kernel_isolate.h', - 'locations.cc', - 'locations.h', - 'lockers.cc', - 'lockers.h', - 'log_test.cc', - 'log.cc', - 'log.h', - 'longjump.cc', - 'longjump.h', - 'longjump_test.cc', - 'malloc_hooks_jemalloc.cc', - 'malloc_hooks_tcmalloc.cc', - 'malloc_hooks_arm.cc', - 'malloc_hooks_arm64.cc', - 'malloc_hooks_ia32.cc', - 'malloc_hooks_x64.cc', - 'malloc_hooks.h', - 'malloc_hooks_test.cc', - 'malloc_hooks_unsupported.cc', - 'megamorphic_cache_table.cc', - 'megamorphic_cache_table.h', - 'memory_region.cc', - 'memory_region.h', - 'memory_region_test.cc', - 'message.cc', - 'message.h', - 'message_handler.cc', - 'message_handler.h', - 'message_handler_test.cc', - 'message_test.cc', - 'method_recognizer.cc', - 'method_recognizer.h', - 'metrics.cc', - 'metrics.h', - 'metrics_test.cc', - 'native_arguments.h', - 'native_entry.cc', - 'native_entry.h', - 'native_entry_test.cc', - 'native_entry_test.h', - 'native_message_handler.cc', - 'native_message_handler.h', - 'native_symbol.h', - 'native_symbol_android.cc', - 'native_symbol_fuchsia.cc', - 'native_symbol_linux.cc', - 'native_symbol_macos.cc', - 'native_symbol_win.cc', - 'object.cc', - 'object.h', - 'object_arm_test.cc', - 'object_arm64_test.cc', - 'object_dbc_test.cc', - 'object_graph.cc', - 'object_graph.h', - 'object_graph_test.cc', - 'object_ia32_test.cc', - 'object_id_ring.cc', - 'object_id_ring.h', - 'object_id_ring_test.cc', - 'object_reload.cc', - 'object_service.cc', - 'object_set.h', - 'object_store.cc', - 'object_store.h', - 'object_store_test.cc', - 'object_test.cc', - 'object_x64_test.cc', - 'optimizer.cc', - 'optimizer.h', - 'os.h', - 'os_android.cc', - 'os_fuchsia.cc', - 'os_linux.cc', - 'os_macos.cc', - 'os_test.cc', - 'os_thread.cc', - 'os_thread.h', - 'os_thread_android.cc', - 'os_thread_android.h', - 'os_thread_fuchsia.cc', - 'os_thread_fuchsia.h', - 'os_thread_linux.cc', - 'os_thread_linux.h', - 'os_thread_macos.cc', - 'os_thread_macos.h', - 'os_thread_win.cc', - 'os_thread_win.h', - 'os_win.cc', - 'pages.cc', - 'pages.h', - 'pages_test.cc', - 'parser.cc', - 'parser.h', - 'parser_test.cc', - 'port.cc', - 'port.h', - 'port_test.cc', - 'precompiler.cc', - 'precompiler.h', - 'program_visitor.cc', - 'program_visitor.h', - 'kernel.h', - 'kernel.cc', - 'kernel_binary.cc', - 'kernel_binary.h', - 'kernel_binary_flowgraph.cc', - 'kernel_binary_flowgraph.h', - 'kernel_to_il.cc', - 'kernel_to_il.h', - 'kernel_reader.h', - 'kernel_reader.cc', - 'proccpuinfo.cc', - 'proccpuinfo.h', - 'profiler_service.cc', - 'profiler_service.h', - 'profiler_test.cc', - 'profiler.cc', - 'profiler.h', - 'random.cc', - 'random.h', - 'raw_object.cc', - 'raw_object.h', - 'raw_object_snapshot.cc', - 'redundancy_elimination.cc', - 'redundancy_elimination.h', - 'regexp.cc', - 'regexp.h', - 'regexp_assembler.cc', - 'regexp_assembler.h', - 'regexp_assembler_bytecode.cc', - 'regexp_assembler_bytecode.h', - 'regexp_assembler_bytecode_inl.h', - 'regexp_assembler_ir.cc', - 'regexp_assembler_ir.h', - 'regexp_ast.cc', - 'regexp_ast.h', - 'regexp_bytecodes.h', - 'regexp_interpreter.cc', - 'regexp_interpreter.h', - 'regexp_parser.cc', - 'regexp_parser.h', - 'regexp_test.cc', - 'report.cc', - 'report.h', - 'resolver.cc', - 'resolver.h', - 'resolver_test.cc', - 'reusable_handles.h', - 'ring_buffer.h', - 'ring_buffer_test.cc', - 'runtime_entry.h', - 'runtime_entry_list.h', - 'runtime_entry_arm.cc', - 'runtime_entry_arm64.cc', - 'runtime_entry_dbc.cc', - 'runtime_entry_ia32.cc', - 'runtime_entry.cc', - 'runtime_entry_x64.cc', - 'safepoint.cc', - 'safepoint.h', - 'scanner.cc', - 'scanner.h', - 'scanner_test.cc', - 'scavenger.cc', - 'scavenger.h', - 'scavenger_test.cc', - 'scope_timer.h', - 'scopes.cc', - 'scopes.h', - 'scopes_test.cc', - 'service.cc', - 'service.h', - 'service_event.cc', - 'service_event.h', - 'service_isolate.cc', - 'service_isolate.h', - 'service_test.cc', - 'signal_handler_android.cc', - 'signal_handler_fuchsia.cc', - 'signal_handler_linux.cc', - 'signal_handler_macos.cc', - 'signal_handler_win.cc', - 'signal_handler.h', - 'simulator.h', - 'simulator_arm.cc', - 'simulator_arm.h', - 'simulator_arm64.cc', - 'simulator_arm64.h', - 'simulator_dbc.cc', - 'simulator_dbc.h', - 'snapshot.cc', - 'snapshot.h', - 'snapshot_ids.h', - 'snapshot_test.cc', - 'source_report.cc', - 'source_report.h', - 'source_report_test.cc', - 'spaces.h', - 'stack_frame.cc', - 'stack_frame.h', - 'stack_frame_arm.h', - 'stack_frame_arm64.h', - 'stack_frame_ia32.h', - 'stack_frame_test.cc', - 'stack_frame_x64.h', - 'stack_trace.cc', - 'stack_trace.h', - 'store_buffer.cc', - 'store_buffer.h', - 'stub_code.cc', - 'stub_code.h', - 'stub_code_arm.cc', - 'stub_code_arm_test.cc', - 'stub_code_arm64.cc', - 'stub_code_arm64_test.cc', - 'stub_code_dbc.cc', - 'stub_code_ia32.cc', - 'stub_code_ia32_test.cc', - 'stub_code_x64.cc', - 'stub_code_x64_test.cc', - 'symbols.cc', - 'symbols.h', - 'tags.cc', - 'tags.h', - 'thread.cc', - 'thread.h', - 'thread_barrier.h', - 'thread_barrier_test.cc', - 'thread_interrupter.cc', - 'thread_interrupter.h', - 'thread_interrupter_android.cc', - 'thread_interrupter_fuchsia.cc', - 'thread_interrupter_linux.cc', - 'thread_interrupter_macos.cc', - 'thread_interrupter_win.cc', - 'thread_pool.cc', - 'thread_pool.h', - 'thread_pool_test.cc', - 'thread_registry.cc', - 'thread_registry.h', - 'thread_test.cc', - 'timeline.cc', - 'timeline.h', - 'timeline_analysis.cc', - 'timeline_analysis.h', - 'timeline_android.cc', - 'timeline_fuchsia.cc', - 'timeline_linux.cc', - 'timeline_macos.cc', - 'timeline_test.cc', - 'timeline_win.cc', - 'timer.cc', - 'timer.h', - 'token.cc', - 'token.h', - 'token_position.cc', - 'token_position.h', - 'type_table.h', - 'unibrow.cc', - 'unibrow.h', - 'unibrow-inl.h', - 'unicode.cc', - 'unicode.h', - 'unicode_data.cc', - 'unicode_test.cc', - 'unit_test.cc', - 'unit_test.h', - 'uri.cc', - 'uri.h', - 'uri_test.cc', - 'utils_test.cc', - 'verifier.cc', - 'verifier.h', - 'virtual_memory.cc', - 'virtual_memory.h', - 'virtual_memory_android.cc', - 'virtual_memory_fuchsia.cc', - 'virtual_memory_linux.cc', - 'virtual_memory_macos.cc', - 'virtual_memory_test.cc', - 'virtual_memory_win.cc', - 'visitor.h', - 'weak_code.cc', - 'weak_code.h', - 'weak_table.cc', - 'weak_table.h', - 'zone.cc', - 'zone.h', - 'zone_test.cc', - 'zone_text_buffer.cc', - 'zone_text_buffer.h', - ], -} diff --git a/sdk/lib/async/async_sources.gni b/sdk/lib/async/async_sources.gni new file mode 100644 index 00000000000..3299cd40500 --- /dev/null +++ b/sdk/lib/async/async_sources.gni @@ -0,0 +1,23 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources for the dart:async library. +async_sdk_sources = [ + "async.dart", + + # The above file needs to be first as it lists the parts below. + "async_error.dart", + "broadcast_stream_controller.dart", + "deferred_load.dart", + "future.dart", + "future_impl.dart", + "schedule_microtask.dart", + "stream.dart", + "stream_controller.dart", + "stream_impl.dart", + "stream_pipe.dart", + "stream_transformers.dart", + "timer.dart", + "zone.dart", +] diff --git a/sdk/lib/async/async_sources.gypi b/sdk/lib/async/async_sources.gypi deleted file mode 100644 index 59904c96b80..00000000000 --- a/sdk/lib/async/async_sources.gypi +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains all sources for the dart:async library. -{ - 'sources': [ - 'async.dart', - # The above file needs to be first as it lists the parts below. - 'async_error.dart', - 'broadcast_stream_controller.dart', - 'deferred_load.dart', - 'future.dart', - 'future_impl.dart', - 'schedule_microtask.dart', - 'stream.dart', - 'stream_controller.dart', - 'stream_impl.dart', - 'stream_pipe.dart', - 'stream_transformers.dart', - 'timer.dart', - 'zone.dart', - ], -} diff --git a/sdk/lib/collection/collection_sources.gni b/sdk/lib/collection/collection_sources.gni new file mode 100644 index 00000000000..3f2f19ec5a9 --- /dev/null +++ b/sdk/lib/collection/collection_sources.gni @@ -0,0 +1,23 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources for the dart:collection library. +collection_sdk_sources = [ + "collection.dart", + + # The above file needs to be first as it lists the parts below. + "collections.dart", + "hash_map.dart", + "hash_set.dart", + "iterable.dart", + "iterator.dart", + "linked_hash_map.dart", + "linked_hash_set.dart", + "linked_list.dart", + "list.dart", + "maps.dart", + "queue.dart", + "set.dart", + "splay_tree.dart", +] diff --git a/sdk/lib/collection/collection_sources.gypi b/sdk/lib/collection/collection_sources.gypi deleted file mode 100644 index 36568953579..00000000000 --- a/sdk/lib/collection/collection_sources.gypi +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains all sources for the dart:collection library. -{ - 'sources': [ - 'collection.dart', - # The above file needs to be first as it lists the parts below. - 'collections.dart', - 'hash_map.dart', - 'hash_set.dart', - 'iterable.dart', - 'iterator.dart', - 'linked_hash_map.dart', - 'linked_hash_set.dart', - 'linked_list.dart', - 'list.dart', - 'maps.dart', - 'queue.dart', - 'set.dart', - 'splay_tree.dart', - ], -} diff --git a/sdk/lib/convert/convert_sources.gni b/sdk/lib/convert/convert_sources.gni new file mode 100644 index 00000000000..ad7964978e6 --- /dev/null +++ b/sdk/lib/convert/convert_sources.gni @@ -0,0 +1,23 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources for the dart:convert library. +convert_sdk_sources = [ + "convert.dart", + + # The above file needs to be first as it lists the parts below. + "ascii.dart", + "base64.dart", + "byte_conversion.dart", + "chunked_conversion.dart", + "codec.dart", + "converter.dart", + "encoding.dart", + "html_escape.dart", + "json.dart", + "latin1.dart", + "line_splitter.dart", + "string_conversion.dart", + "utf.dart", +] diff --git a/sdk/lib/convert/convert_sources.gypi b/sdk/lib/convert/convert_sources.gypi deleted file mode 100644 index d8d40cb68a4..00000000000 --- a/sdk/lib/convert/convert_sources.gypi +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 2013, 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. - -# This file contains all sources for the dart:convert library. -{ - 'sources': [ - 'convert.dart', - # The above file needs to be first as it lists the parts below. - 'ascii.dart', - 'base64.dart', - 'byte_conversion.dart', - 'chunked_conversion.dart', - 'codec.dart', - 'converter.dart', - 'encoding.dart', - 'html_escape.dart', - 'json.dart', - 'latin1.dart', - 'line_splitter.dart', - 'string_conversion.dart', - 'utf.dart', - ], -} diff --git a/sdk/lib/core/core_sources.gni b/sdk/lib/core/core_sources.gni new file mode 100644 index 00000000000..ad8e40dd967 --- /dev/null +++ b/sdk/lib/core/core_sources.gni @@ -0,0 +1,42 @@ +# Copyright (c) 2017, 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. + +core_sdk_sources = [ + "core.dart", + + # The above file needs to be first as it lists the parts below. + "annotations.dart", + "bool.dart", + "comparable.dart", + "date_time.dart", + "double.dart", + "duration.dart", + "errors.dart", + "exceptions.dart", + "expando.dart", + "function.dart", + "identical.dart", + "int.dart", + "invocation.dart", + "iterable.dart", + "iterator.dart", + "list.dart", + "map.dart", + "null.dart", + "num.dart", + "object.dart", + "pattern.dart", + "print.dart", + "regexp.dart", + "set.dart", + "sink.dart", + "stacktrace.dart", + "stopwatch.dart", + "string.dart", + "string_buffer.dart", + "string_sink.dart", + "symbol.dart", + "type.dart", + "uri.dart", +] diff --git a/sdk/lib/core/core_sources.gypi b/sdk/lib/core/core_sources.gypi deleted file mode 100644 index 2c127622e2c..00000000000 --- a/sdk/lib/core/core_sources.gypi +++ /dev/null @@ -1,43 +0,0 @@ -# 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. - -{ - 'sources': [ - 'core.dart', - # The above file needs to be first as it lists the parts below. - 'annotations.dart', - 'bool.dart', - 'comparable.dart', - 'date_time.dart', - 'double.dart', - 'duration.dart', - 'errors.dart', - 'exceptions.dart', - 'expando.dart', - 'function.dart', - 'identical.dart', - 'int.dart', - 'invocation.dart', - 'iterable.dart', - 'iterator.dart', - 'list.dart', - 'map.dart', - 'null.dart', - 'num.dart', - 'object.dart', - 'pattern.dart', - 'print.dart', - 'regexp.dart', - 'set.dart', - 'sink.dart', - 'stacktrace.dart', - 'stopwatch.dart', - 'string.dart', - 'string_buffer.dart', - 'string_sink.dart', - 'symbol.dart', - 'type.dart', - 'uri.dart', - ], -} diff --git a/sdk/lib/developer/developer_sources.gni b/sdk/lib/developer/developer_sources.gni new file mode 100644 index 00000000000..df0dbc2e4db --- /dev/null +++ b/sdk/lib/developer/developer_sources.gni @@ -0,0 +1,13 @@ +# Copyright (c) 2017, 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. + +developer_sdk_sources = [ + "developer.dart", + + # The above file needs to be first if additional parts are added to the lib. + "extension.dart", + "profiler.dart", + "service.dart", + "timeline.dart", +] diff --git a/sdk/lib/developer/developer_sources.gypi b/sdk/lib/developer/developer_sources.gypi deleted file mode 100644 index 91596a3796a..00000000000 --- a/sdk/lib/developer/developer_sources.gypi +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2015, 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. - -{ - 'sources': [ - 'developer.dart', - # The above file needs to be first if additional parts are added to the lib. - 'extension.dart', - 'profiler.dart', - 'service.dart', - 'timeline.dart', - ], -} diff --git a/sdk/lib/internal/internal_sources.gni b/sdk/lib/internal/internal_sources.gni new file mode 100644 index 00000000000..9f7db6b509b --- /dev/null +++ b/sdk/lib/internal/internal_sources.gni @@ -0,0 +1,16 @@ +# Copyright (c) 2017, 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. + +# This file contains all sources for the dart:_internal library. +internal_sdk_sources = [ + "internal.dart", + + # The above file needs to be first as it lists the parts below. + "iterable.dart", + "list.dart", + "linked_list.dart", + "print.dart", + "sort.dart", + "symbol.dart", +] diff --git a/sdk/lib/internal/internal_sources.gypi b/sdk/lib/internal/internal_sources.gypi deleted file mode 100644 index f655856fef3..00000000000 --- a/sdk/lib/internal/internal_sources.gypi +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2012, 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. - -# This file contains all sources for the dart:_internal library. -{ - 'sources': [ - 'internal.dart', - # The above file needs to be first as it lists the parts below. - 'iterable.dart', - 'list.dart', - 'linked_list.dart', - 'print.dart', - 'sort.dart', - 'symbol.dart', - ], -} diff --git a/sdk/lib/io/io_sources.gni b/sdk/lib/io/io_sources.gni new file mode 100644 index 00000000000..1e17be19e04 --- /dev/null +++ b/sdk/lib/io/io_sources.gni @@ -0,0 +1,42 @@ +# Copyright (c) 2017, 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. + +io_sdk_sources = [ + "io.dart", + + # The above file needs to be first if additional parts are added to the lib. + "bytes_builder.dart", + "common.dart", + "crypto.dart", + "data_transformer.dart", + "directory.dart", + "directory_impl.dart", + "eventhandler.dart", + "file.dart", + "file_impl.dart", + "file_system_entity.dart", + "http.dart", + "http_date.dart", + "http_headers.dart", + "http_impl.dart", + "http_parser.dart", + "http_session.dart", + "io_resource_info.dart", + "io_sink.dart", + "io_service.dart", + "link.dart", + "platform.dart", + "platform_impl.dart", + "process.dart", + "service_object.dart", + "secure_server_socket.dart", + "secure_socket.dart", + "security_context.dart", + "socket.dart", + "stdio.dart", + "string_transformer.dart", + "sync_socket.dart", + "websocket.dart", + "websocket_impl.dart", +] diff --git a/sdk/lib/io/io_sources.gypi b/sdk/lib/io/io_sources.gypi deleted file mode 100644 index c49b9237075..00000000000 --- a/sdk/lib/io/io_sources.gypi +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2012, 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. - -{ - 'sources': [ - 'io.dart', - # The above file needs to be first if additional parts are added to the lib. - 'bytes_builder.dart', - 'common.dart', - 'crypto.dart', - 'data_transformer.dart', - 'directory.dart', - 'directory_impl.dart', - 'eventhandler.dart', - 'file.dart', - 'file_impl.dart', - 'file_system_entity.dart', - 'http.dart', - 'http_date.dart', - 'http_headers.dart', - 'http_impl.dart', - 'http_parser.dart', - 'http_session.dart', - 'io_resource_info.dart', - 'io_sink.dart', - 'io_service.dart', - 'link.dart', - 'platform.dart', - 'platform_impl.dart', - 'process.dart', - 'service_object.dart', - 'secure_server_socket.dart', - 'secure_socket.dart', - 'security_context.dart', - 'socket.dart', - 'stdio.dart', - 'string_transformer.dart', - 'sync_socket.dart', - 'websocket.dart', - 'websocket_impl.dart', - ], -} diff --git a/sdk/lib/isolate/isolate_sources.gni b/sdk/lib/isolate/isolate_sources.gni new file mode 100644 index 00000000000..8af8ba1e553 --- /dev/null +++ b/sdk/lib/isolate/isolate_sources.gni @@ -0,0 +1,10 @@ +# Copyright (c) 2017, 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. + +isolate_sdk_sources = [ + "isolate.dart", + + # The above file needs to be first as it lists the parts below. + "capability.dart", +] diff --git a/sdk/lib/isolate/isolate_sources.gypi b/sdk/lib/isolate/isolate_sources.gypi deleted file mode 100644 index 8d3ff849673..00000000000 --- a/sdk/lib/isolate/isolate_sources.gypi +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2012, 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. - -{ - 'sources': [ - 'isolate.dart', - # The above file needs to be first as it lists the parts below. - 'capability.dart', - ], -} diff --git a/sdk/lib/math/math_sources.gni b/sdk/lib/math/math_sources.gni new file mode 100644 index 00000000000..ff8f3fad45b --- /dev/null +++ b/sdk/lib/math/math_sources.gni @@ -0,0 +1,13 @@ +# Copyright (c) 2017, 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. + +math_sdk_sources = [ + "math.dart", + + # The above file needs to be first as it lists the parts below. + "jenkins_smi_hash.dart", + "point.dart", + "random.dart", + "rectangle.dart", +] diff --git a/sdk/lib/math/math_sources.gypi b/sdk/lib/math/math_sources.gypi deleted file mode 100644 index c26d41cbc15..00000000000 --- a/sdk/lib/math/math_sources.gypi +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2012, 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. - -{ - 'sources': [ - 'math.dart', - # The above file needs to be first as it lists the parts below. - 'jenkins_smi_hash.dart', - 'point.dart', - 'random.dart', - 'rectangle.dart', - ], -} diff --git a/sdk/lib/mirrors/mirrors_sources.gni b/sdk/lib/mirrors/mirrors_sources.gni new file mode 100644 index 00000000000..e019c3485b1 --- /dev/null +++ b/sdk/lib/mirrors/mirrors_sources.gni @@ -0,0 +1,8 @@ +# Copyright (c) 2017, 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. + +mirrors_sdk_sources = [ + "mirrors.dart", + # The above file needs to be first if additional parts are added to the lib. +] diff --git a/sdk/lib/mirrors/mirrors_sources.gypi b/sdk/lib/mirrors/mirrors_sources.gypi deleted file mode 100644 index 8c97af59cd5..00000000000 --- a/sdk/lib/mirrors/mirrors_sources.gypi +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2012, 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. - -{ - 'sources': [ - 'mirrors.dart', - # The above file needs to be first if additional parts are added to the lib. - ], -} diff --git a/sdk/lib/profiler/profiler_sources.gni b/sdk/lib/profiler/profiler_sources.gni new file mode 100644 index 00000000000..adbf4474b12 --- /dev/null +++ b/sdk/lib/profiler/profiler_sources.gni @@ -0,0 +1,8 @@ +# Copyright (c) 2017, 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. + +profiler_sdk_sources = [ + "profiler.dart", + # The above file needs to be first if additional parts are added to the lib. +] diff --git a/sdk/lib/profiler/profiler_sources.gypi b/sdk/lib/profiler/profiler_sources.gypi deleted file mode 100644 index 910d79891bb..00000000000 --- a/sdk/lib/profiler/profiler_sources.gypi +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2013, 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. - -{ - 'sources': [ - 'profiler.dart', - # The above file needs to be first if additional parts are added to the lib. - ], -} diff --git a/sdk/lib/rules.gni b/sdk/lib/rules.gni deleted file mode 100644 index fe51bbbbbbd..00000000000 --- a/sdk/lib/rules.gni +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 2016, 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. - -default_dart_root = rebase_path("../..") - -# This build rule will copy the source for one Dart SDK library. -# -# Required arguments: -# sdk_lib_name -# The name of a Dart SDK library. -# -# Optional arguments: -# destination -# Base path to copy sources. Default value is "$root_gen_dir/dart_sdk". -# -# dart_root -# Path to the Dart SDK source root. Default value is "../..". -# -# The sources will be copied into $root_gen_dir/dart_sdk/$sdk_lib_name/. -# -template("dart_sdk_lib_copy") { - assert(defined(invoker.sdk_lib_name)) - if (defined(invoker.dart_root)) { - dart_root = rebase_path(invoker.dart_root) - } else { - dart_root = default_dart_root - } - if (defined(invoker.destination)) { - destination = invoker.destination - } else { - destination = "$root_gen_dir/dart_sdk" - } - dart_sdk_sdk_lib_path = rebase_path("sdk/lib", "", dart_root) - dart_sdk_tools_gypi_to_gn_path = - rebase_path("tools/gypi_to_gn.py", "", dart_root) - - # The name of the SDK library being copied. - lib_name = invoker.sdk_lib_name - - # The path to the libraries source directory. - lib_path = rebase_path(lib_name, "", dart_sdk_sdk_lib_path) - - # The path to the sources gypi. - lib_sources_gypi = lib_name + "_sources.gypi" - - # Get the contents of the gypi file. - sdk_lib_sources_gypi = - exec_script(dart_sdk_tools_gypi_to_gn_path, - [ rebase_path(lib_sources_gypi, "", lib_path) ], - "scope", - [ rebase_path(lib_sources_gypi, "", lib_path) ]) - copy(target_name) { - sources = rebase_path(sdk_lib_sources_gypi.sources, "", lib_path) - outputs = [ - "$destination/$lib_name/{{source_file_part}}", - ] - } -} diff --git a/sdk/lib/typed_data/typed_data_sources.gni b/sdk/lib/typed_data/typed_data_sources.gni new file mode 100644 index 00000000000..daa50aa1088 --- /dev/null +++ b/sdk/lib/typed_data/typed_data_sources.gni @@ -0,0 +1,8 @@ +# Copyright (c) 2017, 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. + +typed_data_sdk_sources = [ + "typed_data.dart", + # The above file needs to be first if additional parts are added to the lib. +] diff --git a/sdk/lib/typed_data/typed_data_sources.gypi b/sdk/lib/typed_data/typed_data_sources.gypi deleted file mode 100644 index 3cad00d0e0e..00000000000 --- a/sdk/lib/typed_data/typed_data_sources.gypi +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2013, 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. - -{ - 'sources': [ - 'typed_data.dart', - # The above file needs to be first if additional parts are added to the lib. - ], -} diff --git a/sdk/lib/vmservice/vmservice_sources.gni b/sdk/lib/vmservice/vmservice_sources.gni new file mode 100644 index 00000000000..b8cf5bf1eda --- /dev/null +++ b/sdk/lib/vmservice/vmservice_sources.gni @@ -0,0 +1,19 @@ +# Copyright (c) 2017, 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. + +# Sources that make up the library "dart:_vmservice". +vmservice_sdk_sources = [ + "vmservice.dart", + + # The above file needs to be first as it imports required libraries. + "asset.dart", + "client.dart", + "constants.dart", + "devfs.dart", + "running_isolate.dart", + "running_isolates.dart", + "message.dart", + "message_router.dart", + "named_lookup.dart", +] diff --git a/sdk/lib/vmservice/vmservice_sources.gypi b/sdk/lib/vmservice/vmservice_sources.gypi deleted file mode 100644 index 41f33f60c5a..00000000000 --- a/sdk/lib/vmservice/vmservice_sources.gypi +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2015, 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. - -# Sources that make up the library "dart:_vmservice". - -{ - 'sources': [ - 'vmservice.dart', - # The above file needs to be first as it imports required libraries. - 'asset.dart', - 'client.dart', - 'constants.dart', - 'devfs.dart', - 'running_isolate.dart', - 'running_isolates.dart', - 'message.dart', - 'message_router.dart', - 'named_lookup.dart', - ], -} diff --git a/third_party/tcmalloc/BUILD.gn b/third_party/tcmalloc/BUILD.gn index c1b9f102ed4..42073e29e23 100644 --- a/third_party/tcmalloc/BUILD.gn +++ b/third_party/tcmalloc/BUILD.gn @@ -2,6 +2,8 @@ # 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. +import("tcmalloc_sources.gni") + config("internal_config") { visibility = [ ":*" ] # Only targets in this file can depend on this. cflags = [ @@ -62,11 +64,6 @@ source_set("dynamic_annotations") { ] } -tcmalloc_sources_list = exec_script("../../tools/gypi_to_gn.py", - [ rebase_path("tcmalloc_sources.gypi") ], - "scope", - [ "tcmalloc_sources.gypi" ]) - source_set("tcmalloc") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ ":internal_config" ] @@ -128,5 +125,5 @@ source_set("tcmalloc") { "gperftools/src/profiler.cc", ]) - sources = tcmalloc_sources_list.sources + sources = tcmalloc_sources } diff --git a/third_party/tcmalloc/tcmalloc_sources.gni b/third_party/tcmalloc/tcmalloc_sources.gni new file mode 100644 index 00000000000..cb5992ae509 --- /dev/null +++ b/third_party/tcmalloc/tcmalloc_sources.gni @@ -0,0 +1,155 @@ +# Copyright (c) 2017, 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. + +tcmalloc_sources = [ + # gperftools/src/ + "gperftools/src/addressmap-inl.h", + "gperftools/src/central_freelist.cc", + "gperftools/src/central_freelist.h", + "gperftools/src/common.cc", + "gperftools/src/common.h", + "gperftools/src/config_for_unittests.h", + "gperftools/src/debugallocation.cc", + "gperftools/src/emergency_malloc.cc", + "gperftools/src/emergency_malloc_for_stacktrace.cc", + "gperftools/src/emergency_malloc.h", + "gperftools/src/fake_stacktrace_scope.cc", + "gperftools/src/getenv_safe.h", + "gperftools/src/getpc.h", + "gperftools/src/heap-checker-bcad.cc", + "gperftools/src/heap-checker.cc", + "gperftools/src/heap-profiler.cc", + "gperftools/src/heap-profile-stats.h", + "gperftools/src/heap-profile-table.cc", + "gperftools/src/heap-profile-table.h", + "gperftools/src/internal_logging.cc", + "gperftools/src/internal_logging.h", + "gperftools/src/libc_override_gcc_and_weak.h", + "gperftools/src/libc_override_glibc.h", + "gperftools/src/libc_override.h", + "gperftools/src/libc_override_osx.h", + "gperftools/src/libc_override_redefine.h", + "gperftools/src/linked_list.h", + "gperftools/src/malloc_extension.cc", + "gperftools/src/malloc_hook.cc", + "gperftools/src/malloc_hook-inl.h", + "gperftools/src/malloc_hook_mmap_freebsd.h", + "gperftools/src/malloc_hook_mmap_linux.h", + "gperftools/src/maybe_emergency_malloc.h", + "gperftools/src/maybe_threads.cc", + "gperftools/src/maybe_threads.h", + "gperftools/src/memfs_malloc.cc", + "gperftools/src/memory_region_map.cc", + "gperftools/src/memory_region_map.h", + "gperftools/src/packed-cache-inl.h", + "gperftools/src/page_heap_allocator.h", + "gperftools/src/page_heap.cc", + "gperftools/src/page_heap.h", + "gperftools/src/pagemap.h", + "gperftools/src/profiledata.cc", + "gperftools/src/profiledata.h", + "gperftools/src/profile-handler.cc", + "gperftools/src/profile-handler.h", + "gperftools/src/profiler.cc", + "gperftools/src/raw_printer.cc", + "gperftools/src/raw_printer.h", + "gperftools/src/sampler.cc", + "gperftools/src/sampler.h", + "gperftools/src/span.cc", + "gperftools/src/span.h", + "gperftools/src/stacktrace_arm-inl.h", + "gperftools/src/stacktrace.cc", + "gperftools/src/stacktrace_generic-inl.h", + "gperftools/src/stacktrace_impl_setup-inl.h", + "gperftools/src/stacktrace_instrument-inl.h", + "gperftools/src/stacktrace_libgcc-inl.h", + "gperftools/src/stacktrace_libunwind-inl.h", + "gperftools/src/stacktrace_powerpc-darwin-inl.h", + "gperftools/src/stacktrace_powerpc-inl.h", + "gperftools/src/stacktrace_powerpc-linux-inl.h", + "gperftools/src/stack_trace_table.cc", + "gperftools/src/stack_trace_table.h", + "gperftools/src/stacktrace_win32-inl.h", + "gperftools/src/stacktrace_x86-inl.h", + "gperftools/src/static_vars.cc", + "gperftools/src/static_vars.h", + "gperftools/src/symbolize.cc", + "gperftools/src/symbolize.h", + "gperftools/src/system-alloc.cc", + "gperftools/src/system-alloc.h", + "gperftools/src/tcmalloc.cc", + "gperftools/src/tcmalloc_guard.h", + "gperftools/src/tcmalloc.h", + "gperftools/src/thread_cache.cc", + "gperftools/src/thread_cache.h", + + # gperftools/src/base/ + "gperftools/src/base/arm_instruction_set_select.h", + "gperftools/src/base/atomicops.h", + "gperftools/src/base/atomicops-internals-arm-generic.h", + "gperftools/src/base/atomicops-internals-arm-v6plus.h", + "gperftools/src/base/atomicops-internals-gcc.h", + "gperftools/src/base/atomicops-internals-linuxppc.h", + "gperftools/src/base/atomicops-internals-macosx.h", + "gperftools/src/base/atomicops-internals-mips.h", + "gperftools/src/base/atomicops-internals-windows.h", + "gperftools/src/base/atomicops-internals-x86.cc", + "gperftools/src/base/atomicops-internals-x86.h", + "gperftools/src/base/basictypes.h", + "gperftools/src/base/commandlineflags.h", + # This C files is compiled into a separate target. + # "gperftools/src/base/dynamic_annotations.c", + # "gperftools/src/base/dynamic_annotations.h", + "gperftools/src/base/elfcore.h", + "gperftools/src/base/elf_mem_image.cc", + "gperftools/src/base/elf_mem_image.h", + "gperftools/src/base/googleinit.h", + "gperftools/src/base/linux_syscall_support.h", + "gperftools/src/base/linuxthreads.cc", + "gperftools/src/base/linuxthreads.h", + "gperftools/src/base/logging.cc", + "gperftools/src/base/logging.h", + "gperftools/src/base/low_level_alloc.cc", + "gperftools/src/base/low_level_alloc.h", + "gperftools/src/base/simple_mutex.h", + "gperftools/src/base/spinlock.cc", + "gperftools/src/base/spinlock.h", + "gperftools/src/base/spinlock_internal.cc", + "gperftools/src/base/spinlock_internal.h", + "gperftools/src/base/spinlock_linux-inl.h", + "gperftools/src/base/spinlock_posix-inl.h", + "gperftools/src/base/spinlock_win32-inl.h", + "gperftools/src/base/stl_allocator.h", + "gperftools/src/base/sysinfo.cc", + "gperftools/src/base/sysinfo.h", + "gperftools/src/base/thread_annotations.h", + "gperftools/src/base/thread_lister.c", + "gperftools/src/base/thread_lister.h", + "gperftools/src/base/vdso_support.cc", + "gperftools/src/base/vdso_support.h", + + # gperftools/src/google/ + "gperftools/src/google/heap-checker.h", + "gperftools/src/google/heap-profiler.h", + "gperftools/src/google/malloc_extension_c.h", + "gperftools/src/google/malloc_extension.h", + "gperftools/src/google/malloc_hook_c.h", + "gperftools/src/google/malloc_hook.h", + "gperftools/src/google/profiler.h", + "gperftools/src/google/stacktrace.h", + "gperftools/src/google/tcmalloc.h", + + # gperftools/src/gperftools/ + "gperftools/src/gperftools/heap-checker.h", + "gperftools/src/gperftools/heap-profiler.h", + "gperftools/src/gperftools/malloc_extension_c.h", + "gperftools/src/gperftools/malloc_extension.h", + "gperftools/src/gperftools/malloc_hook_c.h", + "gperftools/src/gperftools/malloc_hook.h", + "gperftools/src/gperftools/profiler.h", + "gperftools/src/gperftools/stacktrace.h", + + # gperftools/src/third_party/ + "gperftools/src/third_party/valgrind.h", +] diff --git a/third_party/tcmalloc/tcmalloc_sources.gypi b/third_party/tcmalloc/tcmalloc_sources.gypi deleted file mode 100644 index d8c4d980359..00000000000 --- a/third_party/tcmalloc/tcmalloc_sources.gypi +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright (c) 2016, 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. - -{ - 'sources': [ - # gperftools/src/ - 'gperftools/src/addressmap-inl.h', - 'gperftools/src/central_freelist.cc', - 'gperftools/src/central_freelist.h', - 'gperftools/src/common.cc', - 'gperftools/src/common.h', - 'gperftools/src/config_for_unittests.h', - 'gperftools/src/debugallocation.cc', - 'gperftools/src/emergency_malloc.cc', - 'gperftools/src/emergency_malloc_for_stacktrace.cc', - 'gperftools/src/emergency_malloc.h', - 'gperftools/src/fake_stacktrace_scope.cc', - 'gperftools/src/getenv_safe.h', - 'gperftools/src/getpc.h', - 'gperftools/src/heap-checker-bcad.cc', - 'gperftools/src/heap-checker.cc', - 'gperftools/src/heap-profiler.cc', - 'gperftools/src/heap-profile-stats.h', - 'gperftools/src/heap-profile-table.cc', - 'gperftools/src/heap-profile-table.h', - 'gperftools/src/internal_logging.cc', - 'gperftools/src/internal_logging.h', - 'gperftools/src/libc_override_gcc_and_weak.h', - 'gperftools/src/libc_override_glibc.h', - 'gperftools/src/libc_override.h', - 'gperftools/src/libc_override_osx.h', - 'gperftools/src/libc_override_redefine.h', - 'gperftools/src/linked_list.h', - 'gperftools/src/malloc_extension.cc', - 'gperftools/src/malloc_hook.cc', - 'gperftools/src/malloc_hook-inl.h', - 'gperftools/src/malloc_hook_mmap_freebsd.h', - 'gperftools/src/malloc_hook_mmap_linux.h', - 'gperftools/src/maybe_emergency_malloc.h', - 'gperftools/src/maybe_threads.cc', - 'gperftools/src/maybe_threads.h', - 'gperftools/src/memfs_malloc.cc', - 'gperftools/src/memory_region_map.cc', - 'gperftools/src/memory_region_map.h', - 'gperftools/src/packed-cache-inl.h', - 'gperftools/src/page_heap_allocator.h', - 'gperftools/src/page_heap.cc', - 'gperftools/src/page_heap.h', - 'gperftools/src/pagemap.h', - 'gperftools/src/profiledata.cc', - 'gperftools/src/profiledata.h', - 'gperftools/src/profile-handler.cc', - 'gperftools/src/profile-handler.h', - 'gperftools/src/profiler.cc', - 'gperftools/src/raw_printer.cc', - 'gperftools/src/raw_printer.h', - 'gperftools/src/sampler.cc', - 'gperftools/src/sampler.h', - 'gperftools/src/span.cc', - 'gperftools/src/span.h', - 'gperftools/src/stacktrace_arm-inl.h', - 'gperftools/src/stacktrace.cc', - 'gperftools/src/stacktrace_generic-inl.h', - 'gperftools/src/stacktrace_impl_setup-inl.h', - 'gperftools/src/stacktrace_instrument-inl.h', - 'gperftools/src/stacktrace_libgcc-inl.h', - 'gperftools/src/stacktrace_libunwind-inl.h', - 'gperftools/src/stacktrace_powerpc-darwin-inl.h', - 'gperftools/src/stacktrace_powerpc-inl.h', - 'gperftools/src/stacktrace_powerpc-linux-inl.h', - 'gperftools/src/stack_trace_table.cc', - 'gperftools/src/stack_trace_table.h', - 'gperftools/src/stacktrace_win32-inl.h', - 'gperftools/src/stacktrace_x86-inl.h', - 'gperftools/src/static_vars.cc', - 'gperftools/src/static_vars.h', - 'gperftools/src/symbolize.cc', - 'gperftools/src/symbolize.h', - 'gperftools/src/system-alloc.cc', - 'gperftools/src/system-alloc.h', - 'gperftools/src/tcmalloc.cc', - 'gperftools/src/tcmalloc_guard.h', - 'gperftools/src/tcmalloc.h', - 'gperftools/src/thread_cache.cc', - 'gperftools/src/thread_cache.h', - - # gperftools/src/base/ - 'gperftools/src/base/arm_instruction_set_select.h', - 'gperftools/src/base/atomicops.h', - 'gperftools/src/base/atomicops-internals-arm-generic.h', - 'gperftools/src/base/atomicops-internals-arm-v6plus.h', - 'gperftools/src/base/atomicops-internals-gcc.h', - 'gperftools/src/base/atomicops-internals-linuxppc.h', - 'gperftools/src/base/atomicops-internals-macosx.h', - 'gperftools/src/base/atomicops-internals-mips.h', - 'gperftools/src/base/atomicops-internals-windows.h', - 'gperftools/src/base/atomicops-internals-x86.cc', - 'gperftools/src/base/atomicops-internals-x86.h', - 'gperftools/src/base/basictypes.h', - 'gperftools/src/base/commandlineflags.h', - # This C files is compiled into a separate target. - # 'gperftools/src/base/dynamic_annotations.c', - # 'gperftools/src/base/dynamic_annotations.h', - 'gperftools/src/base/elfcore.h', - 'gperftools/src/base/elf_mem_image.cc', - 'gperftools/src/base/elf_mem_image.h', - 'gperftools/src/base/googleinit.h', - 'gperftools/src/base/linux_syscall_support.h', - 'gperftools/src/base/linuxthreads.cc', - 'gperftools/src/base/linuxthreads.h', - 'gperftools/src/base/logging.cc', - 'gperftools/src/base/logging.h', - 'gperftools/src/base/low_level_alloc.cc', - 'gperftools/src/base/low_level_alloc.h', - 'gperftools/src/base/simple_mutex.h', - 'gperftools/src/base/spinlock.cc', - 'gperftools/src/base/spinlock.h', - 'gperftools/src/base/spinlock_internal.cc', - 'gperftools/src/base/spinlock_internal.h', - 'gperftools/src/base/spinlock_linux-inl.h', - 'gperftools/src/base/spinlock_posix-inl.h', - 'gperftools/src/base/spinlock_win32-inl.h', - 'gperftools/src/base/stl_allocator.h', - 'gperftools/src/base/sysinfo.cc', - 'gperftools/src/base/sysinfo.h', - 'gperftools/src/base/thread_annotations.h', - 'gperftools/src/base/thread_lister.c', - 'gperftools/src/base/thread_lister.h', - 'gperftools/src/base/vdso_support.cc', - 'gperftools/src/base/vdso_support.h', - - # gperftools/src/google/ - 'gperftools/src/google/heap-checker.h', - 'gperftools/src/google/heap-profiler.h', - 'gperftools/src/google/malloc_extension_c.h', - 'gperftools/src/google/malloc_extension.h', - 'gperftools/src/google/malloc_hook_c.h', - 'gperftools/src/google/malloc_hook.h', - 'gperftools/src/google/profiler.h', - 'gperftools/src/google/stacktrace.h', - 'gperftools/src/google/tcmalloc.h', - - # gperftools/src/gperftools/ - 'gperftools/src/gperftools/heap-checker.h', - 'gperftools/src/gperftools/heap-profiler.h', - 'gperftools/src/gperftools/malloc_extension_c.h', - 'gperftools/src/gperftools/malloc_extension.h', - 'gperftools/src/gperftools/malloc_hook_c.h', - 'gperftools/src/gperftools/malloc_hook.h', - 'gperftools/src/gperftools/profiler.h', - 'gperftools/src/gperftools/stacktrace.h', - - # gperftools/src/third_party/ - 'gperftools/src/third_party/valgrind.h', - ], -} diff --git a/tools/android_link.py b/tools/android_link.py deleted file mode 100755 index 5de6d45a044..00000000000 --- a/tools/android_link.py +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2012 The Dart Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -""" -This script performs the final link step for Android NDK executables. -Usage: -./android_link {arm,arm64,ia32} {executable,library,shared_library} - {host,target} [linker args] -""" - -import os -import subprocess -import sys - -# Figure out where we are. -SCRIPT_DIR = os.path.dirname(sys.argv[0]) -DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..')) -THIRD_PARTY_ROOT = os.path.join(DART_ROOT, 'third_party') - - -def CheckDirExists(path, docstring): - if not os.path.isdir(path): - raise Exception('Could not find %s directory %s' - % (docstring, path)) - - -def execute(args): - process = subprocess.Popen(args) - process.wait() - return process.returncode - - -def main(): - if len(sys.argv) < 5: - raise Exception(sys.argv[0] + " failed: not enough arguments") - - # gyp puts -shared first in a shared_library link. Remove it. - if sys.argv[1] == '-shared': - sys.argv.remove('-shared') - - # Grab the command line arguments. - target_arch = sys.argv[1] - link_type = sys.argv[2] - link_target = sys.argv[3] - link_args = sys.argv[4:] - - # Check arguments. - if target_arch not in ['arm', 'arm64', 'ia32', 'x64', 'simdbc', 'simdbc64']: - raise Exception(sys.argv[0] + - " first argument must be 'arm', 'arm64', 'ia32', 'x64', " - "'simdbc', or 'simdbc64'") - if link_type not in ['executable', 'library', 'shared_library']: - raise Exception(sys.argv[0] + - " second argument must be 'executable' or 'library'") - if link_target not in ['host', 'target']: - raise Exception(sys.argv[0] + " third argument must be 'host' or 'target'") - - # TODO(zra): Figure out how to link a shared library with the NDK - # cross-compilers. For now, we disable it by generating empty files - # for the results. We disable it here to avoid inspecting the OS type in - # the gyp files. - if link_type == 'shared_library': - print "NOT linking shared library for Android." - o_index = link_args.index('-o') - output = os.path.join(DART_ROOT, link_args[o_index + 1]) - open(output, 'a').close() - sys.exit(0) - - # Set up path to the Android NDK. - CheckDirExists(THIRD_PARTY_ROOT, 'third party tools') - android_tools = os.path.join(THIRD_PARTY_ROOT, 'android_tools') - CheckDirExists(android_tools, 'Android tools') - android_ndk_root = os.path.join(android_tools, 'ndk') - CheckDirExists(android_ndk_root, 'Android NDK') - - # Set up the directory of the Android NDK cross-compiler toolchain. - toolchain_arch = 'arm-linux-androideabi-4.9' - if target_arch == 'arm64' or target_arch == "simdbc64": - toolchain_arch = 'aarch64-linux-android-4.9' - if target_arch == 'ia32': - toolchain_arch = 'x86-4.9' - if target_arch == 'x64': - toolchain_arch = 'x86_64-4.9' - toolchain_dir = 'linux-x86_64' - android_toolchain = os.path.join(android_ndk_root, - 'toolchains', toolchain_arch, - 'prebuilt', toolchain_dir, 'bin') - CheckDirExists(android_toolchain, 'Android toolchain') - - # Set up the path to the linker executable. - android_linker = os.path.join(android_toolchain, 'arm-linux-androideabi-g++') - if target_arch == 'arm64' or target_arch == "simdbc64": - android_linker = os.path.join( - android_toolchain, 'aarch64-linux-android-c++') - if target_arch == 'ia32': - android_linker = os.path.join(android_toolchain, 'i686-linux-android-g++') - if target_arch == 'x64': - android_linker = os.path.join(android_toolchain, 'x86_64-linux-android-g++') - - # Grab the path to libgcc.a, which we must explicitly add to the link, - # by invoking the cross-compiler with the -print-libgcc-file-name flag. - android_gcc = os.path.join(android_toolchain, 'arm-linux-androideabi-gcc') - if target_arch == 'arm64' or target_arch == "simdbc64": - android_gcc = os.path.join(android_toolchain, 'aarch64-linux-android-gcc') - if target_arch == 'ia32': - android_gcc = os.path.join(android_toolchain, 'i686-linux-android-gcc') - if target_arch == 'x64': - android_gcc = os.path.join(android_toolchain, 'x86_64-linux-android-gcc') - android_libgcc = subprocess.check_output( - [android_gcc, '-print-libgcc-file-name']).strip() - - # Set up the path to the system root directory, which is where we'll find the - # Android specific system includes and libraries. - android_ndk_sysroot = os.path.join(android_ndk_root, - 'platforms', 'android-14', 'arch-arm') - libdir = 'lib' - if target_arch == 'arm64' or target_arch == "simdbc64": - android_ndk_sysroot = os.path.join(android_ndk_root, - 'platforms', 'android-21', 'arch-arm64') - if target_arch == 'ia32': - android_ndk_sysroot = os.path.join(android_ndk_root, - 'platforms', 'android-14', 'arch-x86') - if target_arch == 'x64': - android_ndk_sysroot = os.path.join(android_ndk_root, - 'platforms', 'android-21', 'arch-x86_64') - libdir = 'lib64' - CheckDirExists(android_ndk_sysroot, 'Android sysroot') - android_ndk_lib = os.path.join(android_ndk_sysroot, 'usr', libdir) - crtend_android = os.path.join(android_ndk_lib, 'crtend_android.o') - - if link_target == 'target': - # We meddle with the android link command line here because gyp does not - # allow configurations to modify link_settings, or set variables. - - # Add and remove libraries as listed in configurations_android.gypi - libs_to_rm = ['-lrt', '-lpthread',] - libs_to_add = ['-lstlport_static', android_libgcc, '-lc', '-ldl', - '-lstdc++', '-lm',] - - # Add crtend_android to end if we are linking an executable. - if link_type == 'executable': - libs_to_add.extend(['-llog', '-lz', crtend_android]) - - # Filter out -l libs and add the right Android ones. - link_args = [i for i in link_args if i not in libs_to_rm] - link_args.extend(libs_to_add) - - # Filter out tcmalloc. - link_args = [i for i in link_args if "tcmalloc" not in i] - - link_args.insert(0, android_linker) - else: - link_args.extend(['-ldl', '-lrt']) - link_args.insert(0, 'g++') - - sys.exit(execute(link_args)) - -if __name__ == '__main__': - main() diff --git a/tools/build.py b/tools/build.py index 0c780f37076..df5c045ba18 100755 --- a/tools/build.py +++ b/tools/build.py @@ -3,614 +3,12 @@ # Copyright (c) 2012, 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. -# -import optparse -import os -import re -import shutil -import subprocess +# This script simply forwards to tools/ninja.py. It is retained simply to avoid +# breaking various workflows. + +import ninja import sys -import time -import utils - -HOST_OS = utils.GuessOS() -HOST_ARCH = utils.GuessArchitecture() -HOST_CPUS = utils.GuessCpus() -SCRIPT_DIR = os.path.dirname(sys.argv[0]) -DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..')) -THIRD_PARTY_ROOT = os.path.join(DART_ROOT, 'third_party') - -arm_cc_error = """ -Couldn't find the arm cross compiler. -To make sure that you have the arm cross compilation tools installed, run: - -$ wget http://src.chromium.org/chrome/trunk/src/build/install-build-deps.sh -OR -$ svn co http://src.chromium.org/chrome/trunk/src/build; cd build -Then, -$ chmod u+x install-build-deps.sh -$ ./install-build-deps.sh --arm --no-chromeos-fonts -""" -DEFAULT_ARM_CROSS_COMPILER_PATH = '/usr/bin' - -usage = """\ -usage: %%prog [options] [targets] - -This script runs 'make' in the *current* directory. So, run it from -the Dart repo root, - - %s , - -unless you really intend to use a non-default Makefile.""" % DART_ROOT - -DART_USE_GYP = "DART_USE_GYP" - - -def use_gyp(): - return DART_USE_GYP in os.environ - - -def BuildOptions(): - result = optparse.OptionParser(usage=usage) - result.add_option("-m", "--mode", - help='Build variants (comma-separated).', - metavar='[all,debug,release,product]', - default='debug') - result.add_option("-v", "--verbose", - help='Verbose output.', - default=False, action="store_true") - result.add_option("-a", "--arch", - help='Target architectures (comma-separated).', - metavar='[all,ia32,x64,simarm,arm,simarmv6,armv6,simarmv5te,armv5te,' - 'simarm64,arm64,simdbc,armsimdbc]', - default=utils.GuessArchitecture()) - result.add_option("--os", - help='Target OSs (comma-separated).', - metavar='[all,host,android]', - default='host') - result.add_option("-t", "--toolchain", - help='Cross-compiler toolchain path', - default=None) - result.add_option("-j", - help='The number of parallel jobs to run.', - metavar=HOST_CPUS, - default=str(HOST_CPUS)) - (vs_directory, vs_executable) = utils.GuessVisualStudioPath() - result.add_option("--devenv", - help='Path containing devenv.com on Windows', - default=vs_directory) - result.add_option("--executable", - help='Name of the devenv.com/msbuild executable on Windows (varies for ' - 'different versions of Visual Studio)', - default=vs_executable) - result.add_option("--gyp", - help='Build with gyp.', - default=use_gyp(), - action='store_true') - return result - - -def ProcessOsOption(os_name): - if os_name == 'host': - return HOST_OS - return os_name - - -def ProcessOptions(options, args): - if options.arch == 'all': - options.arch = 'ia32,x64,simarm,simarm64,simdbc64' - if options.mode == 'all': - options.mode = 'debug,release,product' - if options.os == 'all': - options.os = 'host,android' - options.mode = options.mode.split(',') - options.arch = options.arch.split(',') - options.os = options.os.split(',') - if not options.gyp and options.toolchain != None: - print "The --toolchain flag is only supported by the gyp build." - print "When using the GN build, set the toolchain and sysroot using gn.py." - return False - for mode in options.mode: - if not mode in ['debug', 'release', 'product']: - print "Unknown mode %s" % mode - return False - for arch in options.arch: - archs = ['ia32', 'x64', 'simarm', 'arm', 'simarmv6', 'armv6', - 'simarmv5te', 'armv5te', 'simarm64', 'arm64', - 'simdbc', 'simdbc64', 'armsimdbc', 'armsimdbc64'] - if not arch in archs: - print "Unknown arch %s" % arch - return False - options.os = [ProcessOsOption(os_name) for os_name in options.os] - for os_name in options.os: - if not os_name in ['android', 'freebsd', 'linux', 'macos', 'win32']: - print "Unknown os %s" % os_name - return False - if os_name != HOST_OS: - if os_name != 'android': - print "Unsupported target os %s" % os_name - return False - if not HOST_OS in ['linux', 'macos']: - print ("Cross-compilation to %s is not supported on host os %s." - % (os_name, HOST_OS)) - return False - if not arch in ['ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', - 'simdbc', 'simdbc64']: - print ("Cross-compilation to %s is not supported for architecture %s." - % (os_name, arch)) - return False - # We have not yet tweaked the v8 dart build to work with the Android - # NDK/SDK, so don't try to build it. - if not args: - print "For android builds you must specify a target, such as 'runtime'." - return False - return True - - -def GetToolchainPrefix(target_os, arch, options): - if options.toolchain != None: - return options.toolchain - - if target_os == 'android': - android_toolchain = GetAndroidToolchainDir(HOST_OS, arch) - if arch == 'arm' or arch == 'simdbc': - return os.path.join(android_toolchain, 'arm-linux-androideabi') - if arch == 'arm64' or arch == 'simdbc64': - return os.path.join(android_toolchain, 'aarch64-linux-android') - if arch == 'ia32': - return os.path.join(android_toolchain, 'i686-linux-android') - if arch == 'x64': - return os.path.join(android_toolchain, 'x86_64-linux-android') - - # If no cross compiler is specified, only try to figure one out on Linux. - if not HOST_OS in ['linux']: - raise Exception('Unless --toolchain is used cross-building is only ' - 'supported on Linux.') - - # For ARM Linux, by default use the Linux distribution's cross-compiler. - if arch == 'arm' or arch == 'armsimdbc': - # To use a non-hf compiler, specify on the command line with --toolchain. - return (DEFAULT_ARM_CROSS_COMPILER_PATH + "/arm-linux-gnueabihf") - if arch == 'arm64': - return (DEFAULT_ARM_CROSS_COMPILER_PATH + "/aarch64-linux-gnu") - - return None - - -def SetTools(arch, target_os, options): - toolsOverride = None - - toolchainprefix = GetToolchainPrefix(target_os, arch, options) - - # Override the Android toolchain's linker to handle some complexity in the - # linker arguments that gyp has trouble with. - linker = "" - if target_os == 'android': - linker = os.path.join(DART_ROOT, 'tools', 'android_link.py') - elif toolchainprefix: - linker = toolchainprefix + "-g++" - - if toolchainprefix: - toolsOverride = { - "CC.target" : toolchainprefix + "-gcc", - "CXX.target" : toolchainprefix + "-g++", - "AR.target" : toolchainprefix + "-ar", - "LINK.target": linker, - "NM.target" : toolchainprefix + "-nm", - } - return toolsOverride - - -def CheckDirExists(path, docstring): - if not os.path.isdir(path): - raise Exception('Could not find %s directory %s' - % (docstring, path)) - - -def GetAndroidToolchainDir(host_os, target_arch): - global THIRD_PARTY_ROOT - if host_os not in ['linux']: - raise Exception('Unsupported host os %s' % host_os) - if target_arch not in ['ia32', 'x64', 'arm', 'arm64', 'simdbc', 'simdbc64']: - raise Exception('Unsupported target architecture %s' % target_arch) - - # Set up path to the Android NDK. - CheckDirExists(THIRD_PARTY_ROOT, 'third party tools') - android_tools = os.path.join(THIRD_PARTY_ROOT, 'android_tools') - CheckDirExists(android_tools, 'Android tools') - android_ndk_root = os.path.join(android_tools, 'ndk') - CheckDirExists(android_ndk_root, 'Android NDK') - - # Set up the directory of the Android NDK cross-compiler toolchain. - toolchain_arch = 'arm-linux-androideabi-4.9' - if target_arch == 'arm64' or target_arch == 'simdbc64': - toolchain_arch = 'aarch64-linux-android-4.9' - if target_arch == 'ia32': - toolchain_arch = 'x86-4.9' - if target_arch == 'x64': - toolchain_arch = 'x86_64-4.9' - toolchain_dir = 'linux-x86_64' - android_toolchain = os.path.join(android_ndk_root, - 'toolchains', toolchain_arch, - 'prebuilt', toolchain_dir, 'bin') - CheckDirExists(android_toolchain, 'Android toolchain') - - return android_toolchain - - -def Execute(args): - process = subprocess.Popen(args) - process.wait() - if process.returncode != 0: - raise Exception(args[0] + " failed") - - -def CurrentDirectoryBaseName(): - """Returns the name of the current directory""" - return os.path.relpath(os.curdir, start=os.pardir) - - -def FilterEmptyXcodebuildSections(process): - """ - Filter output from xcodebuild so empty sections are less verbose. - - The output from xcodebuild looks like this: - -Build settings from command line: - SYMROOT = .../xcodebuild - -=== BUILD TARGET samples OF PROJECT dart WITH CONFIGURATION ... - -Check dependencies - -=== BUILD AGGREGATE TARGET upload_sdk OF PROJECT dart WITH CONFIGURATION ... - -Check dependencies - -PhaseScriptExecution "Action \"upload_sdk_py\"" xcodebuild/dart.build/... - cd ... - /bin/sh -c .../xcodebuild/dart.build/ReleaseIA32/upload_sdk.build/... - - -** BUILD SUCCEEDED ** - - """ - - def is_empty_chunk(input): - empty_chunk = ['', 'Check dependencies', ''] - return not input or (len(input) == 4 and input[1:] == empty_chunk) - - def unbuffered(callable): - # Use iter to disable buffering in for-in. - return iter(callable, '') - - section = None - chunk = [] - # Is stdout a terminal which supports colors? - is_fancy_tty = False - clr_eol = None - if sys.stdout.isatty(): - term = os.getenv('TERM', 'dumb') - # The capability "clr_eol" means clear the line from cursor to end - # of line. See man pages for tput and terminfo. - try: - with open('/dev/null', 'a') as dev_null: - clr_eol = subprocess.check_output(['tput', '-T' + term, 'el'], - stderr=dev_null) - if clr_eol: - is_fancy_tty = True - except subprocess.CalledProcessError: - is_fancy_tty = False - except AttributeError: - is_fancy_tty = False - pattern = re.compile(r'=== BUILD.* TARGET (.*) OF PROJECT (.*) WITH ' + - r'CONFIGURATION (.*) ===') - has_interesting_info = False - for line in unbuffered(process.stdout.readline): - line = line.rstrip() - if line.startswith('=== BUILD ') or line.startswith('** BUILD '): - has_interesting_info = False - section = line - if is_fancy_tty: - match = re.match(pattern, section) - if match: - section = '%s/%s/%s' % ( - match.group(3), match.group(2), match.group(1)) - # Truncate to avoid extending beyond 80 columns. - section = section[:80] - # If stdout is a terminal, emit "progress" information. The - # progress information is the first line of the current chunk. - # After printing the line, move the cursor back to the - # beginning of the line. This has two effects: First, if the - # chunk isn't empty, the first line will be overwritten - # (avoiding duplication). Second, the next segment line will - # overwrite it too avoid long scrollback. clr_eol ensures - # that there is no trailing garbage when a shorter line - # overwrites a longer line. - print '%s%s\r' % (clr_eol, section), - chunk = [] - if not section or has_interesting_info: - print line - else: - length = len(chunk) - if length == 2 and line != 'Check dependencies': - has_interesting_info = True - elif (length == 1 or length == 3) and line: - has_interesting_info = True - elif length > 3: - has_interesting_info = True - if has_interesting_info: - print '\n'.join(chunk) - chunk = [] - else: - chunk.append(line) - if not is_empty_chunk(chunk): - print '\n'.join(chunk) - - -def NotifyBuildDone(build_config, success, start): - if not success: - print "BUILD FAILED" - - sys.stdout.flush() - - # Display a notification if build time exceeded DART_BUILD_NOTIFICATION_DELAY. - notification_delay = float( - os.getenv('DART_BUILD_NOTIFICATION_DELAY', sys.float_info.max)) - if (time.time() - start) < notification_delay: - return - - if success: - message = 'Build succeeded.' - else: - message = 'Build failed.' - title = build_config - - command = None - if HOST_OS == 'macos': - # Use AppleScript to display a UI non-modal notification. - script = 'display notification "%s" with title "%s" sound name "Glass"' % ( - message, title) - command = "osascript -e '%s' &" % script - elif HOST_OS == 'linux': - if success: - icon = 'dialog-information' - else: - icon = 'dialog-error' - command = "notify-send -i '%s' '%s' '%s' &" % (icon, message, title) - elif HOST_OS == 'win32': - if success: - icon = 'info' - else: - icon = 'error' - command = ("powershell -command \"" - "[reflection.assembly]::loadwithpartialname('System.Windows.Forms')" - "| Out-Null;" - "[reflection.assembly]::loadwithpartialname('System.Drawing')" - "| Out-Null;" - "$n = new-object system.windows.forms.notifyicon;" - "$n.icon = [system.drawing.systemicons]::information;" - "$n.visible = $true;" - "$n.showballoontip(%d, '%s', '%s', " - "[system.windows.forms.tooltipicon]::%s);\"") % ( - 5000, # Notification stays on for this many milliseconds - message, title, icon) - - if command: - # Ignore return code, if this command fails, it doesn't matter. - os.system(command) - - -def RunGN(target_os, mode, arch): - gn_os = 'host' if target_os == HOST_OS else target_os - gn_command = [ - 'python', - os.path.join(DART_ROOT, 'tools', 'gn.py'), - '-m', mode, - '-a', arch, - '--os', gn_os, - '-v', - ] - process = subprocess.Popen(gn_command) - process.wait() - if process.returncode != 0: - print ("Tried to run GN, but it failed. Try running it manually: \n\t$ " + - ' '.join(gn_command)) - - -def ShouldRunGN(out_dir): - return (not os.path.exists(out_dir) or - not os.path.isfile(os.path.join(out_dir, 'args.gn'))) - - -def UseGoma(out_dir): - args_gn = os.path.join(out_dir, 'args.gn') - return 'use_goma = true' in open(args_gn, 'r').read() - - -# Try to start goma, but don't bail out if we can't. Instead print an error -# message, and let the build fail with its own error messages as well. -def EnsureGomaStarted(out_dir): - args_gn_path = os.path.join(out_dir, 'args.gn') - goma_dir = None - with open(args_gn_path, 'r') as fp: - for line in fp: - if 'goma_dir' in line: - words = line.split() - goma_dir = words[2][1:-1] # goma_dir = "/path/to/goma" - if not goma_dir: - print 'Could not find goma for ' + out_dir - return False - if not os.path.exists(goma_dir) or not os.path.isdir(goma_dir): - print 'Could not find goma at ' + goma_dir - return False - goma_ctl = os.path.join(goma_dir, 'goma_ctl.py') - goma_ctl_command = [ - 'python', - goma_ctl, - 'ensure_start', - ] - process = subprocess.Popen(goma_ctl_command) - process.wait() - if process.returncode != 0: - print ("Tried to run goma_ctl.py, but it failed. Try running it manually: " - + "\n\t" + ' '.join(goma_ctl_command)) - return False - return True - - - -def BuildNinjaCommand(options, target, target_os, mode, arch): - out_dir = utils.GetBuildRoot(HOST_OS, mode, arch, target_os) - if ShouldRunGN(out_dir): - RunGN(target_os, mode, arch) - command = ['ninja', '-C', out_dir] - if options.verbose: - command += ['-v'] - if UseGoma(out_dir): - if EnsureGomaStarted(out_dir): - command += ['-j1000'] - else: - # If we couldn't ensure that goma is started, let the build start, but - # slowly so we can see any helpful error messages that pop out. - command += ['-j1'] - command += [target] - return command - - -filter_xcodebuild_output = False -def BuildOneConfig(options, target, target_os, mode, arch): - global filter_xcodebuild_output - start_time = time.time() - args = [] - build_config = utils.GetBuildConf(mode, arch, target_os) - if not options.gyp: - args = BuildNinjaCommand(options, target, target_os, mode, arch) - else: - os.environ['DART_BUILD_MODE'] = mode - if HOST_OS == 'macos': - filter_xcodebuild_output = True - project_file = 'dart.xcodeproj' - if os.path.exists('dart-%s.gyp' % CurrentDirectoryBaseName()): - project_file = 'dart-%s.xcodeproj' % CurrentDirectoryBaseName() - if target == 'all': - target = 'All' - args = ['xcodebuild', - '-project', - project_file, - '-target', - target, - '-configuration', - build_config, - 'SYMROOT=%s' % os.path.abspath('xcodebuild') - ] - elif HOST_OS == 'win32': - project_file = 'dart.sln' - if os.path.exists('dart-%s.gyp' % CurrentDirectoryBaseName()): - project_file = 'dart-%s.sln' % CurrentDirectoryBaseName() - # Select a platform suffix to pass to devenv. - if arch == 'ia32': - platform_suffix = 'Win32' - elif arch == 'x64': - platform_suffix = 'x64' - else: - print 'Unsupported arch for MSVC build: %s' % arch - return 1 - config_name = '%s|%s' % (build_config, platform_suffix) - if target == 'all': - args = [options.devenv + os.sep + options.executable, - '/build', - config_name, - project_file - ] - else: - args = [options.devenv + os.sep + options.executable, - '/build', - config_name, - '/project', - target, - project_file - ] - else: - make = 'make' - if HOST_OS == 'freebsd': - make = 'gmake' - # work around lack of flock - os.environ['LINK'] = '$(CXX)' - args = [make, - '-j', - options.j, - 'BUILDTYPE=' + build_config, - ] - if target_os != HOST_OS: - args += ['builddir_name=' + utils.GetBuildDir(HOST_OS)] - if options.verbose: - args += ['V=1'] - - args += [target] - - toolsOverride = None - if override_tools: - toolsOverride = SetTools(arch, target_os, options) - if toolsOverride: - for k, v in toolsOverride.iteritems(): - args.append( k + "=" + v) - if options.verbose: - print k + " = " + v - if not os.path.isfile(toolsOverride['CC.target']): - if arch == 'arm': - print arm_cc_error - else: - print "Couldn't find compiler: %s" % toolsOverride['CC.target'] - return 1 - - print ' '.join(args) - process = None - if filter_xcodebuild_output: - process = subprocess.Popen(args, - stdin=None, - bufsize=1, # Line buffered. - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - FilterEmptyXcodebuildSections(process) - else: - process = subprocess.Popen(args, stdin=None) - process.wait() - if process.returncode != 0: - NotifyBuildDone(build_config, success=False, start=start_time) - return 1 - else: - NotifyBuildDone(build_config, success=True, start=start_time) - - return 0 - - -def Main(): - utils.ConfigureJava() - # Parse the options. - parser = BuildOptions() - (options, args) = parser.parse_args() - if not ProcessOptions(options, args): - parser.print_help() - return 1 - # Determine which targets to build. By default we build the "all" target. - if len(args) == 0: - targets = ['all'] - else: - targets = args - - # Build all targets for each requested configuration. - for target in targets: - for target_os in options.os: - for mode in options.mode: - for arch in options.arch: - if BuildOneConfig(options, target, target_os, - mode, arch) != 0: - return 1 - - return 0 - if __name__ == '__main__': - sys.exit(Main()) + sys.exit(ninja.Main()) diff --git a/tools/gypi_to_gn.py b/tools/gypi_to_gn.py deleted file mode 100755 index 7cb1190c19d..00000000000 --- a/tools/gypi_to_gn.py +++ /dev/null @@ -1,171 +0,0 @@ -#!/usr/bin/env python -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Converts given gypi files to a python scope and writes the result to stdout. - -It is assumed that the files contain a toplevel dictionary, and this script -will return that dictionary as a GN "scope" (see example below). This script -does not know anything about GYP and it will not expand variables or execute -conditions. - -It will strip conditions blocks. - -A variables block at the top level will be flattened so that the variables -appear in the root dictionary. This way they can be returned to the GN code. - -Say your_file.gypi looked like this: - { - 'sources': [ 'a.cc', 'b.cc' ], - 'defines': [ 'ENABLE_DOOM_MELON' ], - } - -You would call it like this: - gypi_files = [ "your_file.gypi", "your_other_file.gypi" ] - gypi_values = exec_script("//build/gypi_to_gn.py", - [ rebase_path(gypi_files) ], - "scope", - [ gypi_files ]) - -Notes: - - The rebase_path call converts the gypi file from being relative to the - current build file to being system absolute for calling the script, which - will have a different current directory than this file. - - - The "scope" parameter tells GN to interpret the result as a series of GN - variable assignments. - - - The last file argument to exec_script tells GN that the given file is a - dependency of the build so Ninja can automatically re-run GN if the file - changes. - -Read the values into a target like this: - component("mycomponent") { - sources = gypi_values.your_file_sources - defines = gypi_values.your_file_defines - } - -Sometimes your .gypi file will include paths relative to a different -directory than the current .gn file. In this case, you can rebase them to -be relative to the current directory. - sources = rebase_path(gypi_values.your_files_sources, ".", - "//path/gypi/input/values/are/relative/to") - -This script will tolerate a 'variables' in the toplevel dictionary or not. If -the toplevel dictionary just contains one item called 'variables', it will be -collapsed away and the result will be the contents of that dictinoary. Some -.gypi files are written with or without this, depending on how they expect to -be embedded into a .gyp file. - -This script also has the ability to replace certain substrings in the input. -Generally this is used to emulate GYP variable expansion. If you passed the -argument "--replace=<(foo)=bar" then all instances of "<(foo)" in strings in -the input will be replaced with "bar": - - gypi_values = exec_script("//build/gypi_to_gn.py", - [ rebase_path("your_file.gypi"), - "--replace=<(foo)=bar"], - "scope", - [ "your_file.gypi" ]) - -""" - -import gn_helpers -from optparse import OptionParser -import sys -import os.path - -def LoadPythonDictionary(path): - file_string = open(path).read() - try: - file_data = eval(file_string, {'__builtins__': None}, None) - except SyntaxError, e: - e.filename = path - raise - except Exception, e: - raise Exception("Unexpected error while reading %s: %s" % (path, str(e))) - - assert isinstance(file_data, dict), "%s does not eval to a dictionary" % path - - # Flatten any variables to the top level. - if 'variables' in file_data: - file_data.update(file_data['variables']) - del file_data['variables'] - - # Strip any conditions. - if 'conditions' in file_data: - del file_data['conditions'] - if 'target_conditions' in file_data: - del file_data['target_conditions'] - - # Strip targets in the toplevel, since some files define these and we can't - # slurp them in. - if 'targets' in file_data: - del file_data['targets'] - - return file_data - - -def KeepOnly(values, filters): - """Recursively filters out strings not ending in "f" from "values""" - - if isinstance(values, list): - return [v for v in values if v.endswith(tuple(filters))] - - if isinstance(values, dict): - result = {} - for key, value in values.items(): - new_key = KeepOnly(key, filters) - new_value = KeepOnly(value, filters) - result[new_key] = new_value - return result - - return values - -def main(): - parser = OptionParser() - parser.add_option("-k", "--keep_only", default = [], action="append", - help="Keeps only files ending with the listed strings.") - parser.add_option("--prefix", action="store_true", - help="Prefix variables with base name") - (options, args) = parser.parse_args() - - if len(args) < 1: - raise Exception("Need at least one .gypi file to read.") - - data = {} - - for gypi in args: - gypi_data = LoadPythonDictionary(gypi) - - if options.keep_only != []: - gypi_data = KeepOnly(gypi_data, options.keep_only) - - # Sometimes .gypi files use the GYP syntax with percents at the end of the - # variable name (to indicate not to overwrite a previously-defined value): - # 'foo%': 'bar', - # Convert these to regular variables. - for key in gypi_data: - if len(key) > 1 and key[len(key) - 1] == '%': - gypi_data[key[:-1]] = gypi_data[key] - del gypi_data[key] - gypi_name = os.path.basename(gypi)[:-len(".gypi")] - for key in gypi_data: - if options.prefix: - # Prefix all variables from this gypi file with the name to disambiguate - data[gypi_name + "_" + key] = gypi_data[key] - elif key in data: - for entry in gypi_data[key]: - data[key].append(entry) - else: - data[key] = gypi_data[key] - - print gn_helpers.ToGNString(data) - -if __name__ == '__main__': - try: - main() - except Exception, e: - print str(e) - sys.exit(1) diff --git a/tools/ninja.py b/tools/ninja.py index e334564e41f..a1588914fd7 100755 --- a/tools/ninja.py +++ b/tools/ninja.py @@ -20,12 +20,8 @@ DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..')) usage = """\ usage: %%prog [options] [targets] -This script runs 'make' in the *current* directory. So, run it from -the Dart repo root, - - %s , - -unless you really intend to use a non-default Makefile.""" % DART_ROOT +This script invokes ninja to build Dart. +""" def BuildOptions(): diff --git a/tools/process_gypis.py b/tools/process_gypis.py deleted file mode 100755 index b74ce2c1b18..00000000000 --- a/tools/process_gypis.py +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env python -# Copyright 2016, 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. - -import gn_helpers -import os.path -import sys - -# Given a list of dart package names read in the set of runtime and sdk library -# sources into variables in a gn scope. - - -def LoadPythonDictionary(path): - file_string = open(path).read() - try: - file_data = eval(file_string, {'__builtins__': None}, None) - except SyntaxError, e: - e.filename = path - raise - except Exception, e: - raise Exception('Unexpected error while reading %s: %s' % - (path, str(e))) - - assert isinstance( - file_data, dict), '%s does not eval to a dictionary' % path - return file_data - - -def main(): - dart_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - runtime_dir = os.path.join(dart_root_dir, 'runtime') - runtime_lib_dir = os.path.join(runtime_dir, 'lib') - sdk_lib_dir = os.path.join(dart_root_dir, 'sdk', 'lib') - libs = sys.argv[1:] - data = {} - data['allsources'] = [] - - for lib in libs: - runtime_path = os.path.join(runtime_lib_dir, lib + '_sources.gypi') - sdk_path = os.path.join(sdk_lib_dir, lib, lib + '_sources.gypi') - runtime_dict = LoadPythonDictionary(runtime_path) - for source in runtime_dict['sources']: - data['allsources'].append(source) - data[lib + '_runtime_sources'] = runtime_dict['sources'] - sdk_dict = LoadPythonDictionary(sdk_path) - data[lib + '_sdk_sources'] = sdk_dict['sources'] - - vm_sources_path = os.path.join(runtime_dir, 'vm', 'vm_sources.gypi') - vm_sources_dict = LoadPythonDictionary(vm_sources_path) - data['vm_sources'] = vm_sources_dict['sources'] - - platform_sources_base = os.path.join(runtime_dir, 'platform', 'platform_') - platform_headers_dict = LoadPythonDictionary( - platform_sources_base + 'headers.gypi') - platform_sources_dict = LoadPythonDictionary( - platform_sources_base + 'sources.gypi') - data['platform_sources'] = platform_headers_dict[ - 'sources'] + platform_sources_dict['sources'] - - bin_io_sources_path = os.path.join(runtime_dir, 'bin', 'io_sources.gypi') - bin_io_sources_dict = LoadPythonDictionary(bin_io_sources_path) - data['bin_io_sources'] = bin_io_sources_dict['sources'] - - print gn_helpers.ToGNString(data) - return 0 - -if __name__ == '__main__': - sys.exit(main())