Format GN files and add a presubmit check that GN is properly formatted

R=johnmccutchan@google.com

Review URL: https://codereview.chromium.org/2451613005 .
This commit is contained in:
Zachary Anderson 2016-10-26 08:50:54 -07:00
parent e3f1794ba3
commit c1313a5ec7
20 changed files with 631 additions and 572 deletions

View file

@ -25,33 +25,32 @@ group("runtime") {
deps = [
"runtime/bin:dart",
"runtime/bin:dart_bootstrap($host_toolchain)",
"runtime/bin:run_vm_tests",
"runtime/bin:process_test",
"runtime/bin:test_extension",
"runtime/bin:run_vm_tests",
"runtime/bin:sample_extension",
"runtime/bin:test_extension",
]
}
group("runtime_precompiled") {
deps = [
"runtime/bin:dart_precompiled_runtime",
"runtime/bin:dart_bootstrap($host_toolchain)",
"runtime/bin:dart_precompiled_runtime",
]
}
group("runtime_and_noopt") {
deps = [
"runtime/bin:dart",
"runtime/bin:dart_noopt",
"runtime/bin:dart_bootstrap($host_toolchain)",
"runtime/bin:run_vm_tests",
"runtime/bin:dart_noopt",
"runtime/bin:process_test",
"runtime/bin:test_extension",
"runtime/bin:run_vm_tests",
"runtime/bin:sample_extension",
"runtime/bin:test_extension",
]
}
action("create_sdk") {
deps = [
"runtime/bin:dart",
@ -68,35 +67,43 @@ action("create_sdk") {
]
sdk_lib_files = exec_script("tools/list_dart_files.py",
[rebase_path("sdk/lib")],
"list lines")
[ rebase_path("sdk/lib") ],
"list lines")
preamble_files = exec_script("tools/list_files.py",
["", rebase_path("sdk/lib/_internal/js_runtime/lib/preambles")],
"list lines")
preamble_files =
exec_script("tools/list_files.py",
[
"",
rebase_path("sdk/lib/_internal/js_runtime/lib/preambles"),
],
"list lines")
sdk_bin_files = exec_script("tools/list_files.py",
["", rebase_path("sdk/bin")],
"list lines")
[
"",
rebase_path("sdk/bin"),
],
"list lines")
inputs = rebase_path(sdk_lib_files, "", "sdk/lib") +
rebase_path(preamble_files, "", "sdk/lib") +
rebase_path(sdk_bin_files, "", "sdk/bin") + [
"sdk/lib/dart_client.platform",
"sdk/lib/dart_server.platform",
"sdk/lib/dart_shared.platform",
"$root_gen_dir/dart2js.dart.snapshot",
"$root_gen_dir/utils_wrapper.dart.snapshot",
"$root_gen_dir/pub.dart.snapshot",
"$root_gen_dir/dartanalyzer.dart.snapshot",
"$root_gen_dir/dartdevc.dart.snapshot",
"$root_gen_dir/dartfmt.dart.snapshot",
"$root_gen_dir/analysis_server.dart.snapshot",
"$root_gen_dir/dartdoc.dart.snapshot",
"$root_gen_dir/spec.sum",
"$root_gen_dir/strong.sum",
"tools/VERSION"
]
rebase_path(preamble_files, "", "sdk/lib") +
rebase_path(sdk_bin_files, "", "sdk/bin") +
[
"sdk/lib/dart_client.platform",
"sdk/lib/dart_server.platform",
"sdk/lib/dart_shared.platform",
"$root_gen_dir/dart2js.dart.snapshot",
"$root_gen_dir/utils_wrapper.dart.snapshot",
"$root_gen_dir/pub.dart.snapshot",
"$root_gen_dir/dartanalyzer.dart.snapshot",
"$root_gen_dir/dartdevc.dart.snapshot",
"$root_gen_dir/dartfmt.dart.snapshot",
"$root_gen_dir/analysis_server.dart.snapshot",
"$root_gen_dir/dartdoc.dart.snapshot",
"$root_gen_dir/spec.sum",
"$root_gen_dir/strong.sum",
"tools/VERSION",
]
outputs = [
"$root_out_dir/dart-sdk/README",
@ -111,34 +118,33 @@ action("create_sdk") {
]
}
group("dart2js") {
deps = [
"utils/compiler:dart2js"
"utils/compiler:dart2js",
]
}
group("dartanalyzer") {
deps = [
"utils/dartanalyzer"
"utils/dartanalyzer",
]
}
group("dartdevc") {
deps = [
"utils/dartdevc"
"utils/dartdevc",
]
}
group("dartfmt") {
deps = [
"utils/dartfmt"
"utils/dartfmt",
]
}
group("analysis_server") {
deps = [
"utils/analysis_server"
"utils/analysis_server",
]
}
@ -147,12 +153,12 @@ group("analysis_server") {
# test suites.
group("dart2js_bot") {
deps = [
":create_sdk"
":create_sdk",
]
}
group("samples") {
deps = [
"runtime/bin:sample_extension"
"runtime/bin:sample_extension",
]
}

View file

@ -5,15 +5,11 @@
# Debug/release ----------------------------------------------------------------
config("debug") {
defines = [
"DEBUG",
]
defines = [ "DEBUG" ]
}
config("release") {
defines = [
"NDEBUG"
]
defines = [ "NDEBUG" ]
}
config("product") {

View file

@ -78,7 +78,7 @@ config("compiler") {
cflags_objcc += common_flags
# Linker warnings.
if ((current_cpu != "arm") && !is_mac) {
if (current_cpu != "arm" && !is_mac) {
# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
ldflags += [ "-Wl,--fatal-warnings" ]
}
@ -86,9 +86,7 @@ config("compiler") {
# Common options for AddressSanitizer, LeakSanitizer, ThreadSanitizer and
# MemorySanitizer
if (using_sanitizer) {
cflags += [
"-gline-tables-only",
]
cflags += [ "-gline-tables-only" ]
}
if (is_asan) {
cflags += [ "-fsanitize=address" ]
@ -199,7 +197,6 @@ config("compiler") {
]
}
} else if (current_cpu == "arm") {
cflags += [
"-march=$arm_arch",
"-mfloat-abi=$arm_float_abi",
@ -234,7 +231,7 @@ config("compiler") {
if (is_debug || is_release) {
cflags += [
"-fexceptions",
"-funwind-tables"
"-funwind-tables",
]
}
@ -295,9 +292,7 @@ config("compiler") {
# Linux/Android common flags setup.
# ---------------------------------
if (is_linux || is_android) {
cflags += [
"-fPIC",
]
cflags += [ "-fPIC" ]
ldflags += [
"-fPIC",
@ -511,6 +506,7 @@ if (is_win) {
default_warning_flags += [
# Permanent.
"/wd4091", # typedef warning from dbghelp.h
# Investigate.
"/wd4312", # int to pointer of greater size conversion.
"/wd4838", # Narrowing conversion required.

View file

@ -5,9 +5,7 @@
import("//build/config/sysroot.gni")
config("sdk") {
common_flags = [
"-stdlib=libc++",
]
common_flags = [ "-stdlib=libc++" ]
cflags = common_flags
ldflags = common_flags
@ -20,7 +18,8 @@ config("mac_dynamic_flags") {
"-L.",
# Forces shared libraries to search for undefined symbols.
"-undefined", "dynamic_lookup",
"-undefined",
"dynamic_lookup",
# Path for loading shared libraries for unbundled binaries.
"-Wl,-rpath,@loader_path/.",

View file

@ -54,17 +54,12 @@ action("pkg_files_stamp") {
stamp2_outputs = get_target_outputs(":make_third_party_pkg_files_2_stamp")
stamp3_outputs = get_target_outputs(":make_third_party_pkg_files_3_stamp")
inputs = stamp0_outputs +
stamp1_outputs +
stamp2_outputs +
stamp3_outputs
inputs = stamp0_outputs + stamp1_outputs + stamp2_outputs + stamp3_outputs
outputs = [
"$root_gen_dir/pkg_files.stamp"
"$root_gen_dir/pkg_files.stamp",
]
script = "../tools/create_timestamp_file.py"
args = [
rebase_path("$root_gen_dir/pkg_files.stamp"),
]
args = [ rebase_path("$root_gen_dir/pkg_files.stamp") ]
}

View file

@ -31,18 +31,15 @@ declare_args() {
}
config("dart_public_config") {
include_dirs = [
".",
]
include_dirs = [ "." ]
}
# Adds PRODUCT define if Flutter has specified "release" for dart_runtime_mode
config("dart_maybe_product_config") {
defines = []
if ((dart_runtime_mode != "develop") &&
(dart_runtime_mode != "profile") &&
(dart_runtime_mode != "release")) {
if (dart_runtime_mode != "develop" && dart_runtime_mode != "profile" &&
dart_runtime_mode != "release") {
print("Invalid |dart_runtime_mode|")
assert(false)
}
@ -52,7 +49,7 @@ config("dart_maybe_product_config") {
print("Debug and release mode are mutually exclusive.")
}
assert(!dart_debug)
defines += ["PRODUCT"]
defines += [ "PRODUCT" ]
}
}
@ -61,9 +58,8 @@ config("dart_maybe_product_config") {
config("dart_maybe_precompiled_runtime_config") {
defines = []
if ((dart_runtime_mode != "develop") &&
(dart_runtime_mode != "profile") &&
(dart_runtime_mode != "release")) {
if (dart_runtime_mode != "develop" && dart_runtime_mode != "profile" &&
dart_runtime_mode != "release") {
print("Invalid |dart_runtime_mode|")
assert(false)
}
@ -75,29 +71,29 @@ config("dart_maybe_precompiled_runtime_config") {
assert(!dart_debug)
if (!dart_experimental_interpreter) {
defines += ["DART_PRECOMPILED_RUNTIME"]
defines += [ "DART_PRECOMPILED_RUNTIME" ]
}
} else if (dart_runtime_mode == "profile") {
if (!dart_experimental_interpreter) {
defines += ["DART_PRECOMPILED_RUNTIME"]
defines += [ "DART_PRECOMPILED_RUNTIME" ]
}
}
}
config("dart_precompiled_runtime_config") {
defines = []
defines += ["DART_PRECOMPILED_RUNTIME"]
defines += [ "DART_PRECOMPILED_RUNTIME" ]
}
# Controls DART_PRECOMPILER #define.
config("dart_precompiler_config") {
defines = []
defines += ["DART_PRECOMPILER"]
defines += [ "DART_PRECOMPILER" ]
}
config("dart_no_snapshot_config") {
defines = []
defines += ["DART_NO_SNAPSHOT"]
defines += [ "DART_NO_SNAPSHOT" ]
}
config("dart_config") {
@ -108,56 +104,51 @@ config("dart_config") {
}
if (dart_target_arch != "") {
if ((dart_target_arch == "arm") ||
(dart_target_arch == "simarm")) {
if (dart_target_arch == "arm" || dart_target_arch == "simarm") {
defines += [ "TARGET_ARCH_ARM" ]
if (target_os == "mac" || target_os == "ios") {
defines += [ "TARGET_ABI_IOS" ]
} else {
defines += [ "TARGET_ABI_EABI" ]
}
} else if ((dart_target_arch == "armv6") ||
(dart_target_arch == "simarmv6")) {
} else if (dart_target_arch == "armv6" || dart_target_arch == "simarmv6") {
defines += [ "TARGET_ARCH_ARM" ]
defines += [ "TARGET_ARCH_ARM_6" ]
defines += [ "TARGET_ABI_EABI" ]
} else if ((dart_target_arch == "armv5te") ||
(dart_target_arch == "simarmv5te")) {
} else if (dart_target_arch == "armv5te" ||
dart_target_arch == "simarmv5te") {
defines += [ "TARGET_ARCH_ARM" ]
defines += [ "TARGET_ARCH_ARM_5TE" ]
defines += [ "TARGET_ABI_EABI" ]
} else if ((dart_target_arch == "arm64") ||
(dart_target_arch == "simarm64")) {
} else if (dart_target_arch == "arm64" || dart_target_arch == "simarm64") {
defines += [ "TARGET_ARCH_ARM64" ]
} else if ((dart_target_arch == "mips") ||
(dart_target_arch == "simmips")) {
} else if (dart_target_arch == "mips" || dart_target_arch == "simmips") {
defines += [ "TARGET_ARCH_MIPS" ]
} else if (dart_target_arch == "x64") {
defines += [ "TARGET_ARCH_X64" ]
} else if (dart_target_arch == "ia32") {
defines += [ "TARGET_ARCH_IA32" ]
} else if ((dart_target_arch == "dbc") ||
(dart_target_arch == "simdbc") ||
(dart_target_arch == "simdbc64")) {
} else if (dart_target_arch == "dbc" || dart_target_arch == "simdbc" ||
dart_target_arch == "simdbc64") {
defines += [ "TARGET_ARCH_DBC" ]
defines += [ "USING_SIMULATOR" ]
} else {
} else {
print("Invalid |dart_target_arch|")
assert(false)
}
}
if (dart_debug) {
defines += ["DEBUG"]
defines += [ "DEBUG" ]
} else {
defines += ["NDEBUG"]
defines += [ "NDEBUG" ]
}
if (!is_win) {
cflags = [
"-Werror",
"-Wall",
"-Wextra", # Also known as -W.
"-Wextra", # Also known as -W.
"-Wno-unused-parameter",
"-Wnon-virtual-dtor",
"-Wvla",
@ -170,19 +161,13 @@ config("dart_config") {
]
if (dart_debug) {
cflags += [
"-O1",
]
cflags += [ "-O1" ]
} else {
cflags += [
"-O3",
]
cflags += [ "-O3" ]
}
if (defined(is_asan) && is_asan) {
ldflags = [
"-fsanitize=address",
]
ldflags = [ "-fsanitize=address" ]
}
}
}
@ -198,19 +183,18 @@ template("libdart_library") {
}
static_library(target_name) {
configs += [
":dart_config",
":dart_maybe_product_config"
] + extra_configs
":dart_config",
":dart_maybe_product_config",
] + extra_configs
deps = [
"vm:libdart_platform",
"third_party/double-conversion/src:libdouble_conversion",
":generate_version_cc_file",
] + extra_deps
include_dirs = [
".",
]
public_configs = [":dart_public_config"]
"vm:libdart_platform",
"third_party/double-conversion/src:libdouble_conversion",
":generate_version_cc_file",
] + extra_deps
include_dirs = [ "." ]
public_configs = [ ":dart_public_config" ]
sources = [
"$target_gen_dir/version.cc",
"include/dart_api.h",
"include/dart_mirrors_api.h",
"include/dart_native_api.h",
@ -220,18 +204,13 @@ template("libdart_library") {
"vm/mirrors_api_impl.cc",
"vm/native_api_impl.cc",
"vm/version.h",
"$target_gen_dir/version.cc",
]
defines = [
"DART_SHARED_LIB",
]
defines = [ "DART_SHARED_LIB" ]
}
}
libdart_library("libdart") {
extra_configs = [
":dart_maybe_precompiled_runtime_config"
]
extra_configs = [ ":dart_maybe_precompiled_runtime_config" ]
extra_deps = [
"vm:libdart_lib",
"vm:libdart_vm",
@ -250,9 +229,7 @@ libdart_library("libdart_noopt") {
}
libdart_library("libdart_precompiled_runtime") {
extra_configs = [
":dart_precompiled_runtime_config"
]
extra_configs = [ ":dart_precompiled_runtime_config" ]
extra_deps = [
"vm:libdart_lib_precompiled_runtime",
"vm:libdart_vm_precompiled_runtime",
@ -262,7 +239,7 @@ libdart_library("libdart_precompiled_runtime") {
libdart_library("libdart_nosnapshot") {
extra_configs = [
":dart_no_snapshot_config",
":dart_maybe_precompiled_runtime_config"
":dart_maybe_precompiled_runtime_config",
]
extra_deps = [
"vm:libdart_lib_nosnapshot",
@ -273,7 +250,7 @@ libdart_library("libdart_nosnapshot") {
libdart_library("libdart_nosnapshot_precompiled_runtime") {
extra_configs = [
":dart_no_snapshot_config",
":dart_precompiled_runtime_config"
":dart_precompiled_runtime_config",
]
extra_deps = [
"vm:libdart_lib_nosnapshot_precompiled_runtime",
@ -303,26 +280,31 @@ action("generate_version_cc_file") {
"vm/version_in.cc",
]
output = "$target_gen_dir/version.cc"
outputs = [ output, ]
outputs = [
output,
]
script = "../tools/make_version.py"
args = [
"--quiet",
"--output", rebase_path(output, root_build_dir),
"--input", rebase_path("vm/version_in.cc", root_build_dir),
"--output",
rebase_path(output, root_build_dir),
"--input",
rebase_path("vm/version_in.cc", root_build_dir),
]
}
executable("libdart_dependency_helper") {
configs += [":dart_config",
":dart_maybe_product_config"]
configs += [
":dart_config",
":dart_maybe_product_config",
]
deps = [
"vm:libdart_lib_nosnapshot",
"vm:libdart_lib",
"vm:libdart_vm",
"vm:libdart_platform",
"third_party/double-conversion/src:libdouble_conversion",
"vm:libdart_lib",
"vm:libdart_lib_nosnapshot",
"vm:libdart_platform",
"vm:libdart_vm",
]
sources = [
"vm/libdart_dependency_helper.cc",

View file

@ -44,9 +44,15 @@ def RunLint(input_api, output_api):
return result
def CheckGn(input_api, output_api):
return input_api.canned_checks.CheckGNFormatted(input_api, output_api)
def CheckChangeOnUpload(input_api, output_api):
return RunLint(input_api, output_api)
return (RunLint(input_api, output_api) +
CheckGn(input_api, output_api))
def CheckChangeOnCommit(input_api, output_api):
return RunLint(input_api, output_api)
return (RunLint(input_api, output_api) +
CheckGn(input_api, output_api))

View file

@ -20,31 +20,36 @@ declare_args() {
resources_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("vmservice/vmservice_sources.gypi")],
[ rebase_path("vmservice/vmservice_sources.gypi") ],
"scope",
["vmservice/vmservice_sources.gypi"])
[ "vmservice/vmservice_sources.gypi" ])
# Generate a resources.cc file for the service isolate without Observatory.
action("gen_resources_cc") {
visibility = [ ":*" ] # Only targets in this file can see this.
visibility = [ ":*" ] # Only targets in this file can see this.
script = "../tools/create_resources.py"
inputs = [
"../tools/create_resources.py",
]
# 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.sources,
"",
"../bin/vmservice/")
outputs = [ "$target_gen_dir/resources_gen.cc" ]
sources = rebase_path(resources_sources_gypi.sources, "", "../bin/vmservice/")
outputs = [
"$target_gen_dir/resources_gen.cc",
]
args = [
"--output",
rebase_path("$target_gen_dir/resources_gen.cc", root_build_dir),
"--outer_namespace", "dart",
"--inner_namespace", "bin",
"--table_name", "service_bin",
"--root_prefix", rebase_path(".", root_build_dir) + "/",
] + rebase_path(sources, root_build_dir)
"--output",
rebase_path("$target_gen_dir/resources_gen.cc", root_build_dir),
"--outer_namespace",
"dart",
"--inner_namespace",
"bin",
"--table_name",
"service_bin",
"--root_prefix",
rebase_path(".", root_build_dir) + "/",
] + rebase_path(sources, root_build_dir)
}
template("gen_library_src_path") {
@ -54,10 +59,12 @@ template("gen_library_src_path") {
visibility = [ ":*" ] # Only targets in this file can see this.
script = "../tools/gen_library_src_paths.py"
inputs = [
"../tools/gen_library_src_paths.py",
"builtin_in.cc",
] + invoker.sources
outputs = [ invoker.output, ]
"../tools/gen_library_src_paths.py",
"builtin_in.cc",
] + invoker.sources
outputs = [
invoker.output,
]
name = invoker.name
kind = invoker.kind
library_name = "dart:${name}"
@ -65,20 +72,24 @@ template("gen_library_src_path") {
library_name = invoker.library_name
}
args = [
"--output", rebase_path(invoker.output, root_build_dir),
"--input_cc", rebase_path("builtin_in.cc", root_build_dir),
"--include", "bin/builtin.h",
"--var_name", "dart::bin::Builtin::${name}_${kind}_paths_",
"--library_name", library_name,] +
rebase_path(invoker.sources, root_build_dir)
"--output",
rebase_path(invoker.output, root_build_dir),
"--input_cc",
rebase_path("builtin_in.cc", root_build_dir),
"--include",
"bin/builtin.h",
"--var_name",
"dart::bin::Builtin::${name}_${kind}_paths_",
"--library_name",
library_name,
] + rebase_path(invoker.sources, root_build_dir)
}
}
builtin_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("builtin_sources.gypi")],
"scope",
["builtin_sources.gypi"])
builtin_sources_gypi = exec_script("../../tools/gypi_to_gn.py",
[ rebase_path("builtin_sources.gypi") ],
"scope",
[ "builtin_sources.gypi" ])
gen_library_src_path("generate_builtin_cc_file") {
name = "_builtin"
@ -89,24 +100,23 @@ gen_library_src_path("generate_builtin_cc_file") {
sdk_io_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("../../sdk/lib/io/io_sources.gypi")],
[ rebase_path("../../sdk/lib/io/io_sources.gypi") ],
"scope",
["../../sdk/lib/io/io_sources.gypi"])
[ "../../sdk/lib/io/io_sources.gypi" ])
sdk_io_sources =
rebase_path(sdk_io_sources_gypi.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" ] + sdk_io_sources
output = "$target_gen_dir/io_gen.cc"
}
io_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("io_sources.gypi")],
"scope",
["io_sources.gypi"])
io_sources_gypi = exec_script("../../tools/gypi_to_gn.py",
[ rebase_path("io_sources.gypi") ],
"scope",
[ "io_sources.gypi" ])
gen_library_src_path("generate_io_patch_cc_file") {
name = "io"
@ -118,7 +128,9 @@ gen_library_src_path("generate_io_patch_cc_file") {
gen_library_src_path("generate_html_cc_file") {
name = "html"
kind = "source"
sources = ["../../sdk/lib/html/dartium/html_dartium.dart"]
sources = [
"../../sdk/lib/html/dartium/html_dartium.dart",
]
output = "$target_gen_dir/html_gen.cc"
}
@ -126,13 +138,13 @@ gen_library_src_path("generate_html_common_cc_file") {
name = "html_common"
kind = "source"
sources = [
"../../sdk/lib/html/html_common/html_common.dart",
"../../sdk/lib/html/html_common/conversions.dart",
"../../sdk/lib/html/html_common/conversions_dartium.dart",
"../../sdk/lib/html/html_common/css_class_set.dart",
"../../sdk/lib/html/html_common/device.dart",
"../../sdk/lib/html/html_common/filtered_element_list.dart",
"../../sdk/lib/html/html_common/html_common.dart",
"../../sdk/lib/html/html_common/lists.dart",
"../../sdk/lib/html/html_common/conversions.dart",
"../../sdk/lib/html/html_common/conversions_dartium.dart",
]
output = "$target_gen_dir/html_common_gen.cc"
}
@ -140,28 +152,36 @@ gen_library_src_path("generate_html_common_cc_file") {
gen_library_src_path("generate_js_cc_file") {
name = "js"
kind = "source"
sources = ["../../sdk/lib/js/dartium/js_dartium.dart"]
sources = [
"../../sdk/lib/js/dartium/js_dartium.dart",
]
output = "$target_gen_dir/js_gen.cc"
}
gen_library_src_path("generate_js_util_cc_file") {
name = "js_util"
kind = "source"
sources = ["../../sdk/lib/js_util/dartium/js_util_dartium.dart"]
sources = [
"../../sdk/lib/js_util/dartium/js_util_dartium.dart",
]
output = "$target_gen_dir/js_util_gen.cc"
}
gen_library_src_path("generate_blink_cc_file") {
name = "_blink"
kind = "source"
sources = ["../../sdk/lib/_blink/dartium/_blink_dartium.dart"]
sources = [
"../../sdk/lib/_blink/dartium/_blink_dartium.dart",
]
output = "$target_gen_dir/blink_gen.cc"
}
gen_library_src_path("generate_indexed_db_cc_file") {
name = "indexed_db"
kind = "source"
sources = ["../../sdk/lib/indexed_db/dartium/indexed_db_dartium.dart"]
sources = [
"../../sdk/lib/indexed_db/dartium/indexed_db_dartium.dart",
]
output = "$target_gen_dir/indexed_db_gen.cc"
}
@ -169,14 +189,18 @@ gen_library_src_path("generate_cached_patches_cc_file") {
name = "cached_patches"
library_name = "cached_patches.dart"
kind = "source"
sources = ["../../sdk/lib/js/dartium/cached_patches.dart"]
sources = [
"../../sdk/lib/js/dartium/cached_patches.dart",
]
output = "$target_gen_dir/cached_patches_gen.cc"
}
gen_library_src_path("generate_web_gl_cc_file") {
name = "web_gl"
kind = "source"
sources = ["../../sdk/lib/web_gl/dartium/web_gl_dartium.dart"]
sources = [
"../../sdk/lib/web_gl/dartium/web_gl_dartium.dart",
]
output = "$target_gen_dir/web_gl_gen.cc"
}
@ -184,36 +208,42 @@ gen_library_src_path("generate_metadata_cc_file") {
name = "metadata"
library_name = "metadata.dart"
kind = "source"
sources = ["../../sdk/lib/html/html_common/metadata.dart"]
sources = [
"../../sdk/lib/html/html_common/metadata.dart",
]
output = "$target_gen_dir/metadata_gen.cc"
}
gen_library_src_path("generate_web_sql_cc_file") {
name = "web_sql"
kind = "source"
sources = ["../../sdk/lib/web_sql/dartium/web_sql_dartium.dart"]
sources = [
"../../sdk/lib/web_sql/dartium/web_sql_dartium.dart",
]
output = "$target_gen_dir/web_sql_gen.cc"
}
gen_library_src_path("generate_svg_cc_file") {
name = "svg"
kind = "source"
sources = ["../../sdk/lib/svg/dartium/svg_dartium.dart"]
sources = [
"../../sdk/lib/svg/dartium/svg_dartium.dart",
]
output = "$target_gen_dir/svg_gen.cc"
}
gen_library_src_path("generate_web_audio_cc_file") {
name = "web_audio"
kind = "source"
sources = ["../../sdk/lib/web_audio/dartium/web_audio_dartium.dart"]
sources = [
"../../sdk/lib/web_audio/dartium/web_audio_dartium.dart",
]
output = "$target_gen_dir/web_audio_gen.cc"
}
config("libdart_builtin_config") {
if (!is_win) {
libs = [
"dl",
]
libs = [ "dl" ]
}
if (is_android) {
libs += [
@ -225,54 +255,58 @@ config("libdart_builtin_config") {
builtin_impl_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("builtin_impl_sources.gypi")],
[ rebase_path("builtin_impl_sources.gypi") ],
"scope",
["builtin_impl_sources.gypi"])
[ "builtin_impl_sources.gypi" ])
static_library("libdart_builtin") {
configs += ["..:dart_config",
"..:dart_maybe_product_config"]
public_configs = [":libdart_builtin_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
]
public_configs = [ ":libdart_builtin_config" ]
deps = [
":generate_blink_cc_file",
":generate_builtin_cc_file",
":generate_io_cc_file",
":generate_io_patch_cc_file",
":generate_cached_patches_cc_file",
":generate_html_cc_file",
":generate_html_common_cc_file",
":generate_indexed_db_cc_file",
":generate_io_cc_file",
":generate_io_patch_cc_file",
":generate_js_cc_file",
":generate_js_util_cc_file",
":generate_blink_cc_file",
":generate_indexed_db_cc_file",
":generate_cached_patches_cc_file",
":generate_web_gl_cc_file",
":generate_metadata_cc_file",
":generate_web_sql_cc_file",
":generate_svg_cc_file",
":generate_web_audio_cc_file",
":generate_web_gl_cc_file",
":generate_web_sql_cc_file",
]
include_dirs = [
"..",
]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
include_dirs = [ ".." ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = [
"log_android.cc",
"log_fuchsia.cc",
"log_linux.cc",
"log_macos.cc",
"log_win.cc",
] + builtin_impl_sources_gypi.sources
"log_android.cc",
"log_fuchsia.cc",
"log_linux.cc",
"log_macos.cc",
"log_win.cc",
] + builtin_impl_sources_gypi.sources
}
io_impl_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[ rebase_path("io_impl_sources.gypi") ],
"scope",
[ "io_impl_sources.gypi" ])
io_impl_sources_gypi = exec_script("../../tools/gypi_to_gn.py",
[ rebase_path("io_impl_sources.gypi") ],
"scope",
[ "io_impl_sources.gypi" ])
executable("gen_snapshot") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
]
deps = [
":gen_resources_cc",
":gen_snapshot_dart_io",
@ -284,30 +318,29 @@ executable("gen_snapshot") {
]
sources = [
"address_sanitizer.cc",
"gen_snapshot.cc",
# Very limited native resolver provided.
"builtin_common.cc",
"builtin_gen_snapshot.cc",
"builtin.cc",
"builtin.h",
"vmservice_impl.cc",
"vmservice_impl.h",
# Include generated source files.
"$target_gen_dir/builtin_gen.cc",
"$target_gen_dir/io_gen.cc",
"$target_gen_dir/io_patch_gen.cc",
"$target_gen_dir/resources_gen.cc",
"address_sanitizer.cc",
"builtin.cc",
"builtin.h",
# Very limited native resolver provided.
"builtin_common.cc",
"builtin_gen_snapshot.cc",
"gen_snapshot.cc",
"vmservice_impl.cc",
"vmservice_impl.h",
]
include_dirs = [
"..",
]
include_dirs = [ ".." ]
if (is_mac) {
libs = [
"CoreFoundation.framework",
"CoreServices.framework"
"CoreServices.framework",
]
}
@ -325,9 +358,11 @@ executable("gen_snapshot") {
# A source set for the implementation of 'dart:io' library
# (without secure sockets) suitable for linking with gen_snapshot.
source_set("gen_snapshot_dart_io") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
]
deps = [
"$dart_zlib_path",
@ -359,13 +394,15 @@ source_set("gen_snapshot_dart_io") {
include_dirs = [
"..",
"//third_party"
"//third_party",
]
}
source_set("libdart_embedder_noio") {
configs += ["..:dart_config",
"..:dart_maybe_product_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
]
deps = [
"..:libdart",
]
@ -378,8 +415,10 @@ template("dart_io") {
extra_sources += invoker.extra_sources
}
source_set(target_name) {
configs += ["..:dart_config",
"..:dart_maybe_product_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
]
custom_sources_filter = [
"*_test.cc",
"*_test.h",
@ -403,14 +442,10 @@ template("dart_io") {
]
if (is_mac) {
libs += [
"CoreServices.framework",
]
libs += [ "CoreServices.framework" ]
}
} else if (defined(is_fuchsia) && is_fuchsia) {
defines += [
"DART_IO_SECURE_SOCKET_DISABLED"
]
defines += [ "DART_IO_SECURE_SOCKET_DISABLED" ]
} else {
deps = [
"//third_party/boringssl",
@ -419,29 +454,27 @@ template("dart_io") {
sources = io_impl_sources_gypi.sources + builtin_impl_sources_gypi.sources
sources += [
"builtin_natives.cc",
"io_natives.cc",
"io_natives.h",
"log_android.cc",
"log_linux.cc",
"log_macos.cc",
"log_win.cc",
"log.h",
] + extra_sources
"builtin_natives.cc",
"io_natives.cc",
"io_natives.h",
"log_android.cc",
"log_linux.cc",
"log_macos.cc",
"log_win.cc",
"log.h",
] + extra_sources
if (is_linux || is_win) {
if (dart_use_fallback_root_certificates) {
sources += [ "//third_party/root_certificates/root_certificates.cc"]
sources += [ "//third_party/root_certificates/root_certificates.cc" ]
} else {
defines += [
"DART_IO_ROOT_CERTS_DISABLED",
]
defines += [ "DART_IO_ROOT_CERTS_DISABLED" ]
}
}
include_dirs = [
"..",
"//third_party"
"//third_party",
]
}
}
@ -549,31 +582,29 @@ template("dart_executable") {
}
executable(target_name) {
configs += [
"..:dart_config",
"..:dart_maybe_product_config"
] + extra_configs
"..:dart_config",
"..:dart_maybe_product_config",
] + extra_configs
deps = [
":gen_resources_cc",
":standalone_dart_io",
":libdart_builtin",
"$dart_zlib_path",
] + extra_deps
":gen_resources_cc",
":standalone_dart_io",
":libdart_builtin",
"$dart_zlib_path",
] + extra_deps
if (dart_use_tcmalloc) {
deps += [
"//third_party/tcmalloc",
]
deps += [ "//third_party/tcmalloc" ]
}
defines = extra_defines
sources = [
"main.cc",
"vmservice_impl.cc",
"vmservice_impl.h",
"$target_gen_dir/resources_gen.cc",
] + extra_sources
"main.cc",
"vmservice_impl.cc",
"vmservice_impl.h",
"$target_gen_dir/resources_gen.cc",
] + extra_sources
include_dirs = [
"..",
@ -581,13 +612,9 @@ template("dart_executable") {
]
if (is_win) {
ldflags = [
"/EXPORT:Dart_True"
]
ldflags = [ "/EXPORT:Dart_True" ]
} else {
ldflags = [
"-rdynamic",
]
ldflags = [ "-rdynamic" ]
}
if (is_win) {
@ -609,29 +636,21 @@ if (!defined(is_fuchsia) || !is_fuchsia) {
":dart_snapshot_cc",
"../observatory:standalone_observatory_archive",
]
extra_sources = [
"builtin_nolib.cc",
]
extra_sources = [ "builtin_nolib.cc" ]
}
dart_executable("dart_noopt") {
extra_configs = [
"..:dart_precompiler_config",
]
extra_configs = [ "..:dart_precompiler_config" ]
extra_deps = [
"..:libdart_noopt",
":dart_snapshot_cc",
"../observatory:standalone_observatory_archive",
]
extra_sources = [
"builtin_nolib.cc",
]
extra_sources = [ "builtin_nolib.cc" ]
}
dart_executable("dart_precompiled_runtime") {
extra_configs = [
"..:dart_precompiled_runtime_config"
]
extra_configs = [ "..:dart_precompiled_runtime_config" ]
extra_deps = [
"..:libdart_precompiled_runtime",
"../observatory:standalone_observatory_archive",
@ -666,14 +685,13 @@ dart_executable("dart_bootstrap") {
":generate_web_audio_cc_file",
"..:libdart_nosnapshot_with_precompiler",
]
extra_defines = [
"NO_OBSERVATORY",
]
extra_defines = [ "NO_OBSERVATORY" ]
extra_sources = [
"builtin.cc",
"builtin.h",
"observatory_assets_empty.cc",
"snapshot_empty.cc",
# Include generated source files.
"$target_gen_dir/builtin_gen.cc",
"$target_gen_dir/io_gen.cc",
@ -695,15 +713,19 @@ dart_executable("dart_bootstrap") {
if (defined(is_fuchsia) && is_fuchsia) {
copy("hello_fuchsia") {
sources = [ "../tests/vm/dart/hello_fuchsia_test.dart" ]
outputs = [ "$root_out_dir/hello_fuchsia.dart" ]
sources = [
"../tests/vm/dart/hello_fuchsia_test.dart",
]
outputs = [
"$root_out_dir/hello_fuchsia.dart",
]
}
executable("run_vm_tests_fuchsia") {
testonly = true
configs += ["..:dart_config"]
configs += [ "..:dart_config" ]
sources = [
"run_vm_tests_fuchsia.cc"
"run_vm_tests_fuchsia.cc",
]
libs = [
"launchpad",
@ -722,12 +744,8 @@ dart_executable("dart_no_observatory") {
if (defined(is_fuchsia) && is_fuchsia) {
extra_deps += [ ":hello_fuchsia" ]
}
extra_defines = [
"NO_OBSERVATORY",
]
extra_sources = [
"observatory_assets_empty.cc",
]
extra_defines = [ "NO_OBSERVATORY" ]
extra_sources = [ "observatory_assets_empty.cc" ]
}
executable("process_test") {
@ -765,57 +783,57 @@ action("generate_snapshot_test_dat_file") {
}
executable("run_vm_tests") {
configs += ["..:dart_config",
"..:dart_maybe_product_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
]
deps = [
"..:libdart",
":libdart_builtin",
":standalone_dart_io",
":dart_snapshot_cc",
":generate_snapshot_test_dat_file",
":libdart_builtin",
":standalone_dart_io",
"$dart_zlib_path",
"..:libdart",
]
include_dirs = [
"..",
"$target_gen_dir",
]
defines = [
"TESTING",
]
defines = [ "TESTING" ]
if (dart_use_tcmalloc) {
deps += [
"//third_party/tcmalloc",
]
deps += [ "//third_party/tcmalloc" ]
}
# The VM sources are already included in libdart, so we just want to add in
# the tests here.
vm_tests_list = exec_script("../../tools/gypi_to_gn.py",
[rebase_path("../vm/vm_sources.gypi"),
"--keep_only=_test.cc",
"--keep_only=_test.h",],
"scope",
["../vm/vm_sources.gypi"])
[
rebase_path("../vm/vm_sources.gypi"),
"--keep_only=_test.cc",
"--keep_only=_test.h",
],
"scope",
[ "../vm/vm_sources.gypi" ])
vm_tests = rebase_path(vm_tests_list.sources, ".", "../vm")
builtin_impl_tests_list =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("builtin_impl_sources.gypi"),
"--keep_only=_test.cc",
"--keep_only=_test.h",],
[
rebase_path("builtin_impl_sources.gypi"),
"--keep_only=_test.cc",
"--keep_only=_test.h",
],
"scope",
["builtin_impl_sources.gypi"])
[ "builtin_impl_sources.gypi" ])
sources = [
"builtin_nolib.cc",
"run_vm_tests.cc",
] + builtin_impl_tests_list.sources + vm_tests
"builtin_nolib.cc",
"run_vm_tests.cc",
] + builtin_impl_tests_list.sources + vm_tests
if (!is_win) {
ldflags = [
"-rdynamic",
]
ldflags = [ "-rdynamic" ]
}
if (is_win) {
@ -838,21 +856,15 @@ if (!defined(is_fuchsia) || !is_fuchsia) {
"test_extension.c",
"test_extension_dllmain_win.cc",
]
include_dirs = [
"..",
]
include_dirs = [ ".." ]
defines = [
# The only effect of DART_SHARED_LIB is to export the Dart API.
"DART_SHARED_LIB",
]
if (is_win) {
libs = [
"dart.lib"
]
libs = [ "dart.lib" ]
abs_root_out_dir = rebase_path(root_out_dir)
ldflags = [
"/LIBPATH:$abs_root_out_dir"
]
ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
}
}
@ -864,21 +876,15 @@ if (!defined(is_fuchsia) || !is_fuchsia) {
"../../samples/sample_extension/sample_extension.cc",
"../../samples/sample_extension/sample_extension_dllmain_win.cc",
]
include_dirs = [
"..",
]
include_dirs = [ ".." ]
defines = [
# The only effect of DART_SHARED_LIB is to export the Dart API.
"DART_SHARED_LIB",
]
if (is_win) {
libs = [
"dart.lib"
]
libs = [ "dart.lib" ]
abs_root_out_dir = rebase_path(root_out_dir)
ldflags = [
"/LIBPATH:$abs_root_out_dir"
]
ldflags = [ "/LIBPATH:$abs_root_out_dir" ]
}
}
}

View file

@ -49,8 +49,6 @@ static_library("zlib") {
all_dependent_configs = [ ":zlib_config" ]
if (is_clang) {
cflags = [
"-Wno-shift-negative-value",
]
cflags = [ "-Wno-shift-negative-value" ]
}
}

View file

@ -16,15 +16,12 @@ declare_args() {
# 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") ],
[ 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_gypi.sources, "", ".")
outputs = [
"$root_gen_dir/observatory_copy/{{source_root_relative_dir}}/{{source_file_part}}",
]
@ -51,8 +48,7 @@ action("write_observatory_pubspec_yaml") {
"--command",
"rewrite",
rebase_path("../observatory/pubspec.yaml"),
rebase_path(
"$root_gen_dir/observatory_copy/$current_dir/pubspec.yaml"),
rebase_path("$root_gen_dir/observatory_copy/$current_dir/pubspec.yaml"),
"../../third_party/",
rebase_path("../../third_party/"),
]
@ -94,10 +90,9 @@ action("copy_observatory_deps") {
action("pub_build_observatory") {
current_dir = rebase_path(".", "//")
sources =
rebase_path(observatory_sources_gypi.sources,
"",
"$root_gen_dir/observatory_copy/$current_dir")
sources = rebase_path(observatory_sources_gypi.sources,
"",
"$root_gen_dir/observatory_copy/$current_dir")
deps = [
":copy_observatory",
@ -184,10 +179,14 @@ template("observatory_archive") {
rebase_path("$root_gen_dir/observatory/${output_name}.cc"),
"--tar_output",
rebase_path("$root_gen_dir/observatory/${output_name}.tar"),
"--outer_namespace", outer_namespace,
"--inner_namespace", inner_namespace,
"--name", "observatory_assets_archive",
"--client_root", rebase_path("$root_out_dir/observatory/deployed/web/"),
"--outer_namespace",
outer_namespace,
"--inner_namespace",
inner_namespace,
"--name",
"observatory_assets_archive",
"--client_root",
rebase_path("$root_out_dir/observatory/deployed/web/"),
]
if (enable_compression) {
args += [ "--compress" ]

View file

@ -2,14 +2,13 @@
# 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.
static_library("libdouble_conversion") {
configs += [ "../../..:dart_config", ]
configs += [ "../../..:dart_config" ]
sources = [
"bignum.cc",
"bignum.h",
"bignum-dtoa.cc",
"bignum-dtoa.h",
"bignum.cc",
"bignum.h",
"cached-powers.cc",
"cached-powers.h",
"diy-fp.cc",
@ -25,8 +24,5 @@ static_library("libdouble_conversion") {
"strtod.h",
"utils.h",
]
include_dirs = [
".",
]
include_dirs = [ "." ]
}

View file

@ -4,9 +4,7 @@
config("libdart_vm_config") {
if (defined(is_fuchsia) && is_fuchsia) {
libs = [
"magenta",
]
libs = [ "magenta" ]
} else if (is_win) {
libs = [
"advapi32.lib",
@ -16,7 +14,7 @@ config("libdart_vm_config") {
} else {
libs = [ "dl" ]
if (!is_android) {
libs += [ "pthread"]
libs += [ "pthread" ]
}
if (is_linux) {
libs += [ "rt" ]
@ -24,123 +22,132 @@ config("libdart_vm_config") {
}
}
static_library("libdart_platform") {
configs += ["..:dart_config",
"..:dart_maybe_product_config"]
public_configs = [":libdart_vm_config"]
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
]
public_configs = [ ":libdart_vm_config" ]
platform_headers_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("../platform/platform_headers.gypi")],
[ rebase_path("../platform/platform_headers.gypi") ],
"scope",
["../platform/platform_headers.gypi"])
[ "../platform/platform_headers.gypi" ])
platform_headers =
rebase_path(platform_headers_gypi.sources, ".", "../platform")
platform_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("../platform/platform_sources.gypi")],
[ rebase_path("../platform/platform_sources.gypi") ],
"scope",
["../platform/platform_sources.gypi"])
[ "../platform/platform_sources.gypi" ])
platform_sources =
rebase_path(platform_sources_gypi.sources, ".", "../platform")
sources = platform_headers + platform_sources
include_dirs = [
"..",
]
include_dirs = [ ".." ]
}
vm_sources_list = exec_script("../../tools/gypi_to_gn.py",
[rebase_path("vm_sources.gypi")],
[ rebase_path("vm_sources.gypi") ],
"scope",
["vm_sources.gypi"])
[ "vm_sources.gypi" ])
static_library("libdart_vm") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config"]
public_configs = [":libdart_vm_config"]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
sources = vm_sources_list.sources
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config",
]
public_configs = [ ":libdart_vm_config" ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = vm_sources_list.sources
include_dirs = [ ".." ]
}
static_library("libdart_vm_noopt") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
"..:dart_maybe_precompiled_runtime_config"]
public_configs = [":libdart_vm_config"]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
sources = vm_sources_list.sources
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
"..:dart_maybe_precompiled_runtime_config",
]
public_configs = [ ":libdart_vm_config" ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = vm_sources_list.sources
include_dirs = [ ".." ]
}
static_library("libdart_vm_precompiled_runtime") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config"]
public_configs = [":libdart_vm_config"]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
sources = vm_sources_list.sources
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config",
]
public_configs = [ ":libdart_vm_config" ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = vm_sources_list.sources
include_dirs = [ ".." ]
}
static_library("libdart_vm_nosnapshot") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config",
"..:dart_no_snapshot_config",]
public_configs = [":libdart_vm_config"]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
sources = vm_sources_list.sources
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config",
"..:dart_no_snapshot_config",
]
public_configs = [ ":libdart_vm_config" ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = vm_sources_list.sources
include_dirs = [ ".." ]
}
static_library("libdart_vm_nosnapshot_precompiled_runtime") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config",
"..:dart_no_snapshot_config",]
public_configs = [":libdart_vm_config"]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
sources = vm_sources_list.sources
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config",
"..:dart_no_snapshot_config",
]
public_configs = [ ":libdart_vm_config" ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = vm_sources_list.sources
include_dirs = [ ".." ]
}
static_library("libdart_vm_nosnapshot_with_precompiler") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
"..:dart_no_snapshot_config",]
public_configs = [":libdart_vm_config"]
set_sources_assignment_filter(["*_test.cc", "*_test.h"])
sources = vm_sources_list.sources
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
"..:dart_no_snapshot_config",
]
public_configs = [ ":libdart_vm_config" ]
set_sources_assignment_filter([
"*_test.cc",
"*_test.h",
])
sources = vm_sources_list.sources
include_dirs = [ ".." ]
}
template("generate_library_source") {
assert(defined(invoker.libname), "Need libname in $target_name")
assert(defined(invoker.filename), "Need a filename in $target_name")
@ -156,11 +163,10 @@ template("generate_library_source") {
lib_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("${path}/${filename}_sources.gypi")],
[ rebase_path("${path}/${filename}_sources.gypi") ],
"scope",
["${path}/${filename}_sources.gypi"])
lib_sources =
rebase_path(lib_sources_gypi.sources, ".", path)
[ "${path}/${filename}_sources.gypi" ])
lib_sources = rebase_path(lib_sources_gypi.sources, ".", path)
script = "../tools/gen_library_src_paths.py"
inputs = [
@ -168,18 +174,24 @@ template("generate_library_source") {
"../lib/libgen_in.cc",
]
inputs += lib_sources
outputs = [ invoker.output, ]
outputs = [
invoker.output,
]
args = [
"--output", rebase_path(invoker.output, root_build_dir),
"--input_cc", rebase_path("../lib/libgen_in.cc", root_build_dir),
"--include", "vm/bootstrap.h",
"--var_name", "dart::Bootstrap::${libname}_${kind}_paths_",
"--library_name", "dart:${libname}",] +
rebase_path(lib_sources, root_build_dir)
"--output",
rebase_path(invoker.output, root_build_dir),
"--input_cc",
rebase_path("../lib/libgen_in.cc", root_build_dir),
"--include",
"vm/bootstrap.h",
"--var_name",
"dart::Bootstrap::${libname}_${kind}_paths_",
"--library_name",
"dart:${libname}",
] + rebase_path(lib_sources, root_build_dir)
}
}
# This templates expects invoker.sources to be a list of pairs of strings.
# The pairs of strings mean the following.
# library name, file name
@ -217,85 +229,155 @@ template("generate_core_libraries") {
output = "$target_gen_dir/${filename}_patch_gen.cc"
}
}
lib_sources_gypi = {}
lib_sources_gypi = {
}
lib_sources_gypi =
exec_script("../../tools/gypi_to_gn.py",
[rebase_path("../lib/${filename}_sources.gypi")],
[ rebase_path("../lib/${filename}_sources.gypi") ],
"scope",
["../lib/${filename}_sources.gypi"])
[ "../lib/${filename}_sources.gypi" ])
libsources += rebase_path(lib_sources_gypi.sources, ".", "../lib")
liboutputs += ["$target_gen_dir/${filename}_gen.cc"]
libdeps += [":generate_${filename}_cc_file"]
liboutputs += [ "$target_gen_dir/${filename}_gen.cc" ]
libdeps += [ ":generate_${filename}_cc_file" ]
if (do_patch) {
liboutputs += ["$target_gen_dir/${filename}_patch_gen.cc"]
libdeps += [":generate_${filename}_patch_cc_file"]
liboutputs += [ "$target_gen_dir/${filename}_patch_gen.cc" ]
libdeps += [ ":generate_${filename}_patch_cc_file" ]
}
}
static_library("libdart_lib_nosnapshot") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config"]
deps = libdeps
sources = libsources + ["bootstrap.cc"] + liboutputs
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config",
]
deps = libdeps
sources = libsources + [ "bootstrap.cc" ] + liboutputs
include_dirs = [ ".." ]
}
static_library("libdart_lib_nosnapshot_precompiled_runtime") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config"]
deps = libdeps
sources = libsources + ["bootstrap.cc"] + liboutputs
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config",
]
deps = libdeps
sources = libsources + [ "bootstrap.cc" ] + liboutputs
include_dirs = [ ".." ]
}
static_library("libdart_lib_nosnapshot_with_precompiler") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config" ]
deps = libdeps
sources = libsources + [ "bootstrap.cc"] + liboutputs
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiler_config",
]
deps = libdeps
sources = libsources + [ "bootstrap.cc" ] + liboutputs
include_dirs = [ ".." ]
}
static_library("libdart_lib") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config"]
sources = libsources + [ "bootstrap_nocore.cc"]
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_maybe_precompiled_runtime_config",
]
sources = libsources + [ "bootstrap_nocore.cc" ]
include_dirs = [ ".." ]
}
static_library("libdart_lib_precompiled_runtime") {
configs += ["..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config"]
sources = libsources + [ "bootstrap_nocore.cc"]
include_dirs = [
"..",
configs += [
"..:dart_config",
"..:dart_maybe_product_config",
"..:dart_precompiled_runtime_config",
]
sources = libsources + [ "bootstrap_nocore.cc" ]
include_dirs = [ ".." ]
}
}
generate_core_libraries("core_libraries") {
sources = [
["async", "async", true, "../../sdk/lib/async", "../lib"],
["core", "core", true, "../../sdk/lib/core", "../lib"],
["collection", "collection", true, "../../sdk/lib/collection", "../lib"],
["convert", "convert", true, "../../sdk/lib/convert", "../lib"],
["developer", "developer", true, "../../sdk/lib/developer", "../lib"],
["_internal", "internal", true, "../../sdk/lib/internal", "../lib"],
["isolate", "isolate", true, "../../sdk/lib/isolate", "../lib"],
["math", "math", true, "../../sdk/lib/math", "../lib"],
["mirrors", "mirrors", true, "../../sdk/lib/mirrors", "../lib"],
["profiler", "profiler", false, "../../sdk/lib/profiler"],
["typed_data", "typed_data", false, "../lib"],
["_vmservice", "vmservice", true, "../../sdk/lib/vmservice", "../lib"],
[
"async",
"async",
true,
"../../sdk/lib/async",
"../lib",
],
[
"core",
"core",
true,
"../../sdk/lib/core",
"../lib",
],
[
"collection",
"collection",
true,
"../../sdk/lib/collection",
"../lib",
],
[
"convert",
"convert",
true,
"../../sdk/lib/convert",
"../lib",
],
[
"developer",
"developer",
true,
"../../sdk/lib/developer",
"../lib",
],
[
"_internal",
"internal",
true,
"../../sdk/lib/internal",
"../lib",
],
[
"isolate",
"isolate",
true,
"../../sdk/lib/isolate",
"../lib",
],
[
"math",
"math",
true,
"../../sdk/lib/math",
"../lib",
],
[
"mirrors",
"mirrors",
true,
"../../sdk/lib/mirrors",
"../lib",
],
[
"profiler",
"profiler",
false,
"../../sdk/lib/profiler",
],
[
"typed_data",
"typed_data",
false,
"../lib",
],
[
"_vmservice",
"vmservice",
true,
"../../sdk/lib/vmservice",
"../lib",
],
]
}

View file

@ -30,9 +30,7 @@ config("internal_config") {
"-fno-builtin-pvalloc",
]
if (is_clang) {
cflags += [
"-Wno-unused-const-variable",
]
cflags += [ "-Wno-unused-const-variable" ]
}
}
@ -62,19 +60,18 @@ source_set("dynamic_annotations") {
}
tcmalloc_sources_list = exec_script("../../tools/gypi_to_gn.py",
[rebase_path("tcmalloc_sources.gypi")],
"scope",
["tcmalloc_sources.gypi"])
[ rebase_path("tcmalloc_sources.gypi") ],
"scope",
[ "tcmalloc_sources.gypi" ])
source_set("tcmalloc") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ ":internal_config" ]
public_configs = [":link_config"]
public_configs = [ ":link_config" ]
deps = [
":dynamic_annotations"
":dynamic_annotations",
]
include_dirs = [
@ -87,15 +84,14 @@ source_set("tcmalloc") {
defines = [
"ENABLE_EMERGENCY_MALLOC",
"NO_HEAP_CHECK",
# Disable debug even in a Dart Debug build. It is too slow.
"NDEBUG",
]
# Disable stack sampling for heap profiling in Product builds.
if (is_product) {
defines += [
"NO_TCMALLOC_SAMPLES",
]
defines += [ "NO_TCMALLOC_SAMPLES" ]
}
cflags = [
@ -106,25 +102,25 @@ source_set("tcmalloc") {
]
if (!is_clang && current_cpu == "x86") {
cflags += [
"-Wno-format"
]
cflags += [ "-Wno-format" ]
}
set_sources_assignment_filter([
# No debug allocator.
"gperftools/src/debugallocation.cc",
# Not needed when using emergency malloc.
"gperftools/src/fake_stacktrace_scope.cc",
# Not using the cpuprofiler
"gperftools/src/base/thread_lister.c",
"gperftools/src/base/thread_lister.h",
"gperftools/src/profile-handler.cc",
"gperftools/src/profile-handler.h",
"gperftools/src/profiledata.cc",
"gperftools/src/profiledata.h",
"gperftools/src/profiler.cc",
])
# No debug allocator.
"gperftools/src/debugallocation.cc",
# Not needed when using emergency malloc.
"gperftools/src/fake_stacktrace_scope.cc",
# Not using the cpuprofiler
"gperftools/src/base/thread_lister.c",
"gperftools/src/base/thread_lister.h",
"gperftools/src/profile-handler.cc",
"gperftools/src/profile-handler.h",
"gperftools/src/profiledata.cc",
"gperftools/src/profiledata.h",
"gperftools/src/profiler.cc",
])
sources = tcmalloc_sources_list.sources
}

View file

@ -91,7 +91,8 @@ def to_gn_args(args, mode, arch, target_os):
gn_args['dart_use_tcmalloc'] = (gn_args['target_os'] == 'linux'
and not args.asan)
gn_args['arm_float_abi'] = 'hard'
if gn_args['target_cpu'].startswith('arm'):
gn_args['arm_float_abi'] = 'hard'
gn_args['is_debug'] = mode == 'debug'
gn_args['is_release'] = mode == 'release'

View file

@ -23,8 +23,8 @@ create_timestamp_file("dartdoc_files_stamp") {
invoke_dart("dart2js_create_snapshot_entries") {
deps = [
":dart2js_files_stamp",
":runtime_lib_files_stamp",
":dartdoc_files_stamp",
":runtime_lib_files_stamp",
]
dot_packages = rebase_path("../../.packages")
@ -55,18 +55,18 @@ invoke_dart("dart2js_create_snapshot_entries") {
application_snapshot("dart2js") {
deps = [
":dart2js_create_snapshot_entries"
":dart2js_create_snapshot_entries",
]
main_dart = "$root_gen_dir/dart2js.dart"
training_args = [
"--library-root=" + rebase_path("../../sdk"),
rebase_path("../../tests/language/first_test.dart")
rebase_path("../../tests/language/first_test.dart"),
]
}
application_snapshot("utils_wrapper") {
deps = [
":dart2js_create_snapshot_entries"
":dart2js_create_snapshot_entries",
]
main_dart = "$root_gen_dir/utils_wrapper.dart"
training_args = [ "--help" ]

View file

@ -13,36 +13,36 @@ group("dartanalyzer") {
}
analyzer_files = exec_script("../../tools/list_dart_files.py",
[rebase_path("../../pkg/analyzer")],
[ rebase_path("../../pkg/analyzer") ],
"list lines")
application_snapshot("generate_dartanalyzer_snapshot") {
main_dart = "../../pkg/analyzer_cli/bin/analyzer.dart"
training_args = [
"--dart-sdk=" + rebase_path("../../sdk"),
rebase_path("../../tests/language/first_test.dart")
rebase_path("../../tests/language/first_test.dart"),
]
name = "dartanalyzer"
cli_files = exec_script("../../tools/list_dart_files.py",
[rebase_path("../../pkg/analyzer_cli")],
[ rebase_path("../../pkg/analyzer_cli") ],
"list lines")
inputs = cli_files + analyzer_files
}
sdk_lib_files = exec_script("../../tools/list_dart_files.py",
[rebase_path("../../sdk/lib")],
[ rebase_path("../../sdk/lib") ],
"list lines")
template("generate_summary") {
assert(defined(invoker.type), "Must specify the summary type")
type = invoker.type
assert((type == "spec") || (type == "strong"))
assert(type == "spec" || type == "strong")
invoke_dart(target_name) {
inputs = sdk_lib_files + analyzer_files
output = "$root_gen_dir/$type.sum"
outputs = [
output
output,
]
dot_packages = rebase_path("../../.packages")

View file

@ -8,6 +8,6 @@ application_snapshot("dartdevc") {
main_dart = "../../pkg/dev_compiler/bin/dartdevc.dart"
training_args = [ "--help" ]
inputs = exec_script("../../tools/list_dart_files.py",
[rebase_path("../../pkg/dev_compiler/bin")],
[ rebase_path("../../pkg/dev_compiler/bin") ],
"list lines")
}

View file

@ -8,6 +8,6 @@ application_snapshot("dartdoc") {
main_dart = "../../third_party/pkg/dartdoc/bin/dartdoc.dart"
training_args = [ "--help" ]
inputs = exec_script("../../tools/list_dart_files.py",
[rebase_path("../../third_party/pkg/dartdoc")],
[ rebase_path("../../third_party/pkg/dartdoc") ],
"list lines")
}

View file

@ -7,7 +7,8 @@ import("../invoke_dart.gni")
application_snapshot("dartfmt") {
main_dart = "../../third_party/pkg_tested/dart_style/bin/format.dart"
training_args = [ "--help" ]
inputs = exec_script("../../tools/list_dart_files.py",
[rebase_path("../../third_party/pkg_tested/dart_style")],
"list lines")
inputs =
exec_script("../../tools/list_dart_files.py",
[ rebase_path("../../third_party/pkg_tested/dart_style") ],
"list lines")
}

View file

@ -8,9 +8,9 @@ application_snapshot("pub") {
main_dart = "../../third_party/pkg/pub/bin/pub.dart"
training_args = [ "--help" ]
deps = [
"../compiler:dart2js_files_stamp"
"../compiler:dart2js_files_stamp",
]
inputs = [
"$root_gen_dir/dart2js_files.stamp"
"$root_gen_dir/dart2js_files.stamp",
]
}