mirror of
https://github.com/dart-lang/sdk
synced 2024-09-05 00:13:50 +00:00
[dartdev] move the location of the dartdev dill snapshot
TEST=covered by existing build/test systems Change-Id: Ic4ca16c3abc956e1947a2a7fa035ef7f889255fd Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/173442 Commit-Queue: Devon Carew <devoncarew@google.com> Reviewed-by: Ben Konyi <bkonyi@google.com>
This commit is contained in:
parent
5ba23bc30e
commit
a0ed69b03a
|
@ -63,14 +63,14 @@ Utils::CStringUniquePtr DartDevIsolate::TryResolveDartDevSnapshotPath() {
|
|||
|
||||
// First assume we're in dart-sdk/bin.
|
||||
char* snapshot_path =
|
||||
Utils::SCreate("%s../lib/_internal/dartdev.dill", dir_prefix.get());
|
||||
Utils::SCreate("%ssnapshots/dartdev.dill", dir_prefix.get());
|
||||
if (File::Exists(nullptr, snapshot_path)) {
|
||||
return Utils::CreateCStringUniquePtr(snapshot_path);
|
||||
}
|
||||
free(snapshot_path);
|
||||
|
||||
// If we're not in dart-sdk/bin, we might be in one of the $SDK/out/*
|
||||
// directories. Try to use a snapshot rom a previously built SDK.
|
||||
// directories. Try to use a snapshot from a previously built SDK.
|
||||
snapshot_path = Utils::SCreate("%sdartdev.dill", dir_prefix.get());
|
||||
if (File::Exists(nullptr, snapshot_path)) {
|
||||
return Utils::CreateCStringUniquePtr(snapshot_path);
|
||||
|
|
13
sdk/BUILD.gn
13
sdk/BUILD.gn
|
@ -46,16 +46,18 @@ declare_args() {
|
|||
# ......snapshots/
|
||||
# ........analysis_server.dart.snapshot
|
||||
# ........dart2js.dart.snapshot
|
||||
# ........dart2native.dart.snapshot (if not on ia32)
|
||||
# ........dartanalyzer.dart.snapshot
|
||||
# ........dds.dart.snapshot
|
||||
# ........dartdev.dill
|
||||
# ........dartdevc.dart.snapshot
|
||||
# ........dartdoc.dart.snapshot
|
||||
# ........dartfmt.dart.snapshot
|
||||
# ........dartdevc.dart.snapshot
|
||||
# ........dds.dart.snapshot
|
||||
# ........frontend_server.dart.snapshot
|
||||
# ........gen_kernel.dart.snapshot (if not on ia32)
|
||||
# ........dart2native.dart.snapshot (if not on ia32)
|
||||
# ........kernel-service.dart.snapshot
|
||||
# ........kernel_worker.dart.snapshot
|
||||
# ........pub.dart.snapshot
|
||||
# ........frontend_server.dart.snapshot
|
||||
# ......resources/
|
||||
# ........dartdoc/
|
||||
# ...........packages
|
||||
|
@ -73,7 +75,6 @@ declare_args() {
|
|||
# ........dart2js_server_platform.dill
|
||||
# ........dart2js_platform_strong.dill
|
||||
# ........dart2js_server_platform_strong.dill
|
||||
# ........dartdev.dill
|
||||
# ........vm_platform_strong.dill
|
||||
# ........dev_compiler/
|
||||
# ......async/
|
||||
|
@ -582,7 +583,7 @@ copy("copy_dartdev_dill_files") {
|
|||
"../utils/dartdev:dartdev",
|
||||
]
|
||||
sources = [ "$root_out_dir/dartdev.dill" ]
|
||||
outputs = [ "$root_out_dir/dart-sdk/lib/_internal/{{source_file_part}}" ]
|
||||
outputs = [ "$root_out_dir/dart-sdk/bin/snapshots/{{source_file_part}}" ]
|
||||
}
|
||||
|
||||
copy("copy_dart2js_dill_files") {
|
||||
|
|
Loading…
Reference in a new issue