Skip to content

Commit

Permalink
build: rename the ivy compile mode 'local' to 'aot' (angular#26686)
Browse files Browse the repository at this point in the history
PR Close angular#26686
  • Loading branch information
IgorMinar committed Oct 23, 2018
1 parent e0d6782 commit ee0b857
Show file tree
Hide file tree
Showing 35 changed files with 59 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:

- run: bazel run @yarn//:yarn
- *setup_bazel_remote_execution
- run: bazel test //... --define=compile=local --build_tag_filters=ivy-local --test_tag_filters=ivy-local
- run: bazel test //... --define=compile=aot --build_tag_filters=ivy-aot --test_tag_filters=ivy-aot

# This job should only be run on PR builds, where `CIRCLE_PR_NUMBER` is defined.
aio_preview:
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
paths:
- packages-dist
- packages-dist-ivy-jit
- packages-dist-ivy-local
- packages-dist-ivy-aot

# We run the integration tests outside of Bazel for now.
# They are a separate workflow job so that they can be easily re-run.
Expand Down
8 changes: 4 additions & 4 deletions packages/bazel/src/ng_module.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ def compile_strategy(ctx):
ctx: skylark rule execution context
Returns:
one of 'legacy', 'local', 'jit', or 'global' depending on the configuration in ctx
one of 'legacy', 'aot', 'jit', or 'global' depending on the configuration in ctx
"""

strategy = "legacy"
if "compile" in ctx.var:
strategy = ctx.var["compile"]

if strategy not in ["legacy", "local", "jit"]:
if strategy not in ["legacy", "aot", "jit"]:
fail("Unknown --define=compile value '%s'" % strategy)

if strategy == "legacy" and hasattr(ctx.attr, "_global_mode") and ctx.attr._global_mode:
Expand All @@ -60,7 +60,7 @@ def _compiler_name(ctx):
return "ngc"
elif strategy == "global":
return "ngc.ivy"
elif strategy == "local":
elif strategy == "aot":
return "ngtsc"
elif strategy == "jit":
return "tsc"
Expand All @@ -82,7 +82,7 @@ def _enable_ivy_value(ctx):
return False
elif strategy == "global":
return True
elif strategy == "local":
elif strategy == "aot":
return "ngtsc"
elif strategy == "jit":
return "tsc"
Expand Down
2 changes: 1 addition & 1 deletion packages/bazel/test/ng_package/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jasmine_node_test(
"@ngdeps//shelljs",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
)
Expand Down
2 changes: 1 addition & 1 deletion packages/bazel/test/ngc-wrapped/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ jasmine_node_test(
"//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
"@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
],
tags = ["fixme-ivy-local"],
tags = ["fixme-ivy-aot"],
)
2 changes: 1 addition & 1 deletion packages/bazel/test/ngc-wrapped/empty/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package(default_visibility = ["//packages/bazel/test:__subpackages__"])
ng_module(
name = "empty",
srcs = ["empty.ts"],
tags = ["fixme-ivy-local"],
tags = ["fixme-ivy-aot"],
tsconfig = ":tsconfig.json",
deps = [
"//packages/core",
Expand Down
4 changes: 2 additions & 2 deletions packages/common/http/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -32,8 +32,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "test_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/common/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -34,8 +34,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "test_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ng_module(
),
module_name = "app_built",
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ts_library(
],
),
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand All @@ -26,7 +26,7 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jasmine_node_test(
srcs = ["spec.js"],
data = [":flat_module_index"],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
)
6 changes: 3 additions & 3 deletions packages/compiler-cli/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jasmine_node_test(
"//packages/core:npm_package",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down Expand Up @@ -81,7 +81,7 @@ jasmine_node_test(
"//packages/router:npm_package",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down Expand Up @@ -116,7 +116,7 @@ jasmine_node_test(
"//packages/router:npm_package",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down
2 changes: 1 addition & 1 deletion packages/compiler-cli/test/compliance/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Tests in this directory should be run with:

bazel test --define=compile=local packages/compiler-cli/test/compliance:compliance
bazel test --define=compile=aot packages/compiler-cli/test/compliance:compliance
4 changes: 2 additions & 2 deletions packages/compiler-cli/test/diagnostics/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jasmine_node_test(
"//packages/core:npm_package",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down Expand Up @@ -72,7 +72,7 @@ jasmine_node_test(
"//packages/forms:npm_package",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down
2 changes: 1 addition & 1 deletion packages/compiler-cli/test/transformers/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jasmine_node_test(
"//packages/router:npm_package",
],
tags = [
"fixme-ivy-local",
"fixme-ivy-aot",
"no-ivy-jit",
],
deps = [
Expand Down
4 changes: 2 additions & 2 deletions packages/compiler/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jasmine_node_test(
"//packages/core:npm_package",
],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -91,8 +91,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "test_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -70,8 +70,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "test_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/test/render3/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ jasmine_node_test(
"angular/packages/core/test/render3/load_domino",
],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":render3_node_lib",
Expand All @@ -72,8 +72,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "render3_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":render3_lib",
Expand Down
2 changes: 1 addition & 1 deletion packages/elements/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ ts_web_test_suite(
":elements_test_bootstrap_scripts",
],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
# do not sort
deps = [
Expand Down
4 changes: 2 additions & 2 deletions packages/forms/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -31,8 +31,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "test_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/http/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ts_library(
jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = ["fixme-ivy-local"],
tags = ["fixme-ivy-aot"],
deps = [
":test_lib",
"//tools/testing:node",
Expand All @@ -27,7 +27,7 @@ jasmine_node_test(

ts_web_test_suite(
name = "test_web",
tags = ["fixme-ivy-local"],
tags = ["fixme-ivy-aot"],
deps = [
":test_lib",
"@ngdeps//karma",
Expand Down
2 changes: 1 addition & 1 deletion packages/language-service/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jasmine_node_test(
"//packages/forms:npm_package",
],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
2 changes: 1 addition & 1 deletion packages/platform-browser-dynamic/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ ts_web_test_suite(
"//packages/platform-browser/test:browser/static_assets/200.html",
],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/platform-browser/animations/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -37,8 +37,8 @@ jasmine_node_test(
ts_web_test_suite(
name = "test_web",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
4 changes: 2 additions & 2 deletions packages/platform-browser/test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jasmine_node_test(
name = "test",
bootstrap = ["angular/tools/testing/init_node_spec.js"],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand All @@ -45,8 +45,8 @@ ts_web_test_suite(
":static_assets/test.html",
],
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"fixme-ivy-local",
],
deps = [
":test_lib",
Expand Down
Loading

0 comments on commit ee0b857

Please sign in to comment.