Remove Fuchsia-specific build files.

Also fix Fuchsia tools to account for new project location (//third_party/dart).

Change-Id: If89a934729c4fa44229eaca83219dbdf8bb700a8
Bug:
Reviewed-on: https://dart-review.googlesource.com/14800
Commit-Queue: Zach Anderson <zra@google.com>
Reviewed-by: Zach Anderson <zra@google.com>
This commit is contained in:
P.Y. Laligand 2017-10-19 17:52:37 +00:00 committed by commit-bot@chromium.org
parent ba3cc12592
commit ce79a77331
11 changed files with 7 additions and 179 deletions

8
DEPS
View file

@ -79,7 +79,7 @@ vars = {
"dartdoc_tag" : "@v0.14.1", "dartdoc_tag" : "@v0.14.1",
"fixnum_tag": "@0.10.5", "fixnum_tag": "@0.10.5",
"func_tag": "@1.0.0", "func_rev": "@25eec48146a58967d75330075ab376b3838b18a8",
"glob_tag": "@1.1.5", "glob_tag": "@1.1.5",
"html_tag" : "@0.13.2", "html_tag" : "@0.13.2",
"http_multi_server_tag" : "@2.0.4", "http_multi_server_tag" : "@2.0.4",
@ -91,7 +91,7 @@ vars = {
"isolate_tag": "@1.1.0", "isolate_tag": "@1.1.0",
"jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1", "jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
"json_rpc_2_tag": "@2.0.4", "json_rpc_2_tag": "@2.0.4",
"linter_tag": "@0.1.35", "linter_rev": "@ae88f710dce03bc92e20f78645cbdf069b39d529",
"logging_tag": "@0.11.3+1", "logging_tag": "@0.11.3+1",
"markdown_tag": "@0.11.4", "markdown_tag": "@0.11.4",
"matcher_tag": "@0.12.1+4", "matcher_tag": "@0.12.1+4",
@ -215,7 +215,7 @@ deps = {
Var("dart_root") + "/third_party/pkg/fixnum": Var("dart_root") + "/third_party/pkg/fixnum":
Var("github_mirror") + "fixnum.git" + Var("fixnum_tag"), Var("github_mirror") + "fixnum.git" + Var("fixnum_tag"),
Var("dart_root") + "/third_party/pkg/func": Var("dart_root") + "/third_party/pkg/func":
Var("github_mirror") + "func.git" + Var("func_tag"), Var("github_mirror") + "func.git" + Var("func_rev"),
Var("dart_root") + "/third_party/pkg/glob": Var("dart_root") + "/third_party/pkg/glob":
Var("github_mirror") + "glob.git" + Var("glob_tag"), Var("github_mirror") + "glob.git" + Var("glob_tag"),
Var("dart_root") + "/third_party/pkg/html": Var("dart_root") + "/third_party/pkg/html":
@ -237,7 +237,7 @@ deps = {
Var("dart_root") + "/third_party/pkg/json_rpc_2": Var("dart_root") + "/third_party/pkg/json_rpc_2":
Var("github_mirror") + "json_rpc_2.git" + Var("json_rpc_2_tag"), Var("github_mirror") + "json_rpc_2.git" + Var("json_rpc_2_tag"),
Var("dart_root") + "/third_party/pkg/linter": Var("dart_root") + "/third_party/pkg/linter":
Var("github_mirror") + "linter.git" + Var("linter_tag"), Var("github_mirror") + "linter.git" + Var("linter_rev"),
Var("dart_root") + "/third_party/pkg/logging": Var("dart_root") + "/third_party/pkg/logging":
Var("github_mirror") + "logging.git" + Var("logging_tag"), Var("github_mirror") + "logging.git" + Var("logging_tag"),
Var("dart_root") + "/third_party/pkg/markdown": Var("dart_root") + "/third_party/pkg/markdown":

View file

@ -1,40 +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.
import("//build/dart/dart_package.gni")
import("//build/dart/dart_tool.gni")
dart_package("analysis_server") {
package_name = "analysis_server"
disable_analysis = true
deps = [
"//dart/pkg/analyzer",
"//dart/pkg/telemetry",
"//dart/third_party/pkg/linter",
"//third_party/dart-pkg/pub/args",
"//third_party/dart-pkg/pub/dart_style",
"//third_party/dart-pkg/pub/intl",
"//third_party/dart-pkg/pub/isolate",
"//third_party/dart-pkg/pub/logging",
"//third_party/dart-pkg/pub/package_config",
"//third_party/dart-pkg/pub/path",
"//third_party/dart-pkg/pub/plugin",
"//third_party/dart-pkg/pub/usage",
"//third_party/dart-pkg/pub/watcher",
"//third_party/dart-pkg/pub/yaml",
]
}
dart_tool("analysis_server_bin") {
main_dart = "bin/server.dart"
disable_analysis = true
deps = [
":analysis_server",
"//dart/pkg/analyzer_plugin",
]
}

View file

@ -1,27 +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.
import("//build/dart/dart_package.gni")
dart_package("analyzer") {
package_name = "analyzer"
disable_analysis = true
deps = [
"//dart/pkg/front_end",
"//third_party/dart-pkg/pub/args",
"//third_party/dart-pkg/pub/charcode",
"//third_party/dart-pkg/pub/crypto",
"//third_party/dart-pkg/pub/glob",
"//third_party/dart-pkg/pub/html",
"//third_party/dart-pkg/pub/isolate",
"//third_party/dart-pkg/pub/meta",
"//third_party/dart-pkg/pub/package_config",
"//third_party/dart-pkg/pub/path",
"//third_party/dart-pkg/pub/plugin",
"//third_party/dart-pkg/pub/watcher",
"//third_party/dart-pkg/pub/yaml",
]
}

View file

@ -1,24 +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.
import("//build/dart/dart_package.gni")
dart_package("analyzer_cli") {
package_name = "analyzer_cli"
disable_analysis = true
deps = [
"//dart/pkg/analyzer",
"//dart/pkg/telemetry",
"//dart/third_party/pkg/linter",
"//third_party/dart-pkg/pub/args",
"//third_party/dart-pkg/pub/bazel_worker",
"//third_party/dart-pkg/pub/cli_util",
"//third_party/dart-pkg/pub/package_config",
"//third_party/dart-pkg/pub/plugin",
"//third_party/dart-pkg/pub/protobuf",
"//third_party/dart-pkg/pub/yaml",
]
}

View file

@ -1,17 +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.
import("//build/dart/dart_package.gni")
dart_package("analyzer_plugin") {
package_name = "analyzer_plugin"
disable_analysis = true
deps = [
"//dart/pkg/analyzer",
"//third_party/dart-pkg/pub/html",
"//third_party/dart-pkg/pub/path",
]
}

View file

@ -1,17 +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.
import("//build/dart/dart_package.gni")
dart_package("front_end") {
package_name = "front_end"
disable_analysis = true
deps = [
"//dart/pkg/kernel",
"//third_party/dart-pkg/pub/path",
"//third_party/dart-pkg/pub/source_span",
]
}

View file

@ -1,18 +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.
import("//build/dart/dart_package.gni")
dart_package("kernel") {
package_name = "kernel"
disable_analysis = true
deps = [
"//third_party/dart-pkg/pub/args",
"//third_party/dart-pkg/pub/logging",
"//third_party/dart-pkg/pub/package_config",
"//third_party/dart-pkg/pub/path",
]
}

View file

@ -1,18 +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.
import("//build/dart/dart_package.gni")
dart_package("telemetry") {
package_name = "telemetry"
disable_analysis = true
deps = [
"//third_party/dart-pkg/pub/http",
"//third_party/dart-pkg/pub/path",
"//third_party/dart-pkg/pub/stack_trace",
"//third_party/dart-pkg/pub/usage",
]
}

View file

@ -1,11 +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.
import("//build/dart/dart_package.gni")
dart_package("typed_mock") {
package_name = "typed_mock"
disable_analysis = true
}

View file

@ -50,7 +50,7 @@ def ParseDepsFile(deps_file):
filtered_deps = {} filtered_deps = {}
for k, v in deps.iteritems(): for k, v in deps.iteritems():
if 'sdk/third_party/pkg' in k: if 'sdk/third_party/pkg' in k:
new_key = k.replace('sdk', 'dart', 1) new_key = k.replace('sdk', 'third_party/dart', 1)
filtered_deps[new_key] = v filtered_deps[new_key] = v
return filtered_deps return filtered_deps
@ -64,7 +64,7 @@ def WriteManifest(deps, manifest_file):
revision="%s"/> revision="%s"/>
""" """
warning = ('<!-- This file is generated by ' warning = ('<!-- This file is generated by '
'//dart/tools/create_pkg_manifest.py. DO NOT EDIT -->\n') '//third_party/dart/tools/create_pkg_manifest.py. DO NOT EDIT -->\n')
with open(manifest_file, 'w') as manifest: with open(manifest_file, 'w') as manifest:
manifest.write('<?xml version="1.0" encoding="UTF-8"?>\n') manifest.write('<?xml version="1.0" encoding="UTF-8"?>\n')
manifest.write(warning) manifest.write(warning)

View file

@ -18,7 +18,7 @@ HOST_OS = utils.GuessOS()
HOST_ARCH = utils.GuessArchitecture() HOST_ARCH = utils.GuessArchitecture()
SCRIPT_DIR = os.path.dirname(sys.argv[0]) SCRIPT_DIR = os.path.dirname(sys.argv[0])
DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..')) DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..'))
FUCHSIA_ROOT = os.path.realpath(os.path.join(DART_ROOT, '..')) FUCHSIA_ROOT = os.path.realpath(os.path.join(DART_ROOT, '..', '..'))
FLUTTER_ROOT = os.path.join(FUCHSIA_ROOT, 'lib', 'flutter') FLUTTER_ROOT = os.path.join(FUCHSIA_ROOT, 'lib', 'flutter')
DEFAULT_DART_VERSION = 'latest' DEFAULT_DART_VERSION = 'latest'