build: rename the ivy compile mode 'local' to 'aot' (#26686)

PR Close #26686
2018-10-23 09:54:12 -07:00 · 2018-10-23 09:54:12 -07:00 · ee0b857172
parent e0d6782d26
commit ee0b857172
35 changed files with 59 additions and 60 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -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:
@ -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.
--- a/packages/bazel/src/ng_module.bzl
+++ b/packages/bazel/src/ng_module.bzl
@ -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:
@ -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"
@ -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"
--- a/packages/bazel/test/ng_package/BUILD.bazel
+++ b/packages/bazel/test/ng_package/BUILD.bazel
@ -25,7 +25,7 @@ jasmine_node_test(
        "@ngdeps//shelljs",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
 )
--- a/packages/bazel/test/ngc-wrapped/BUILD.bazel
+++ b/packages/bazel/test/ngc-wrapped/BUILD.bazel
@ -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"],
 )
--- a/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel
+++ b/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel
@ -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",
--- a/packages/common/http/test/BUILD.bazel
+++ b/packages/common/http/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/common/test/BUILD.bazel
+++ b/packages/common/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel
@ -12,7 +12,7 @@ ng_module(
    ),
    module_name = "app_built",
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
--- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel
@ -11,7 +11,7 @@ ts_library(
        ],
    ),
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
@ -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 = [
--- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel
@ -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",
--- a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel
@ -29,7 +29,7 @@ jasmine_node_test(
    srcs = ["spec.js"],
    data = [":flat_module_index"],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
 )
--- a/packages/compiler-cli/test/BUILD.bazel
+++ b/packages/compiler-cli/test/BUILD.bazel
@ -43,7 +43,7 @@ jasmine_node_test(
        "//packages/core:npm_package",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
@ -81,7 +81,7 @@ jasmine_node_test(
        "//packages/router:npm_package",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
@ -116,7 +116,7 @@ jasmine_node_test(
        "//packages/router:npm_package",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
--- a/packages/compiler-cli/test/compliance/README.md
+++ b/packages/compiler-cli/test/compliance/README.md
@ -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
--- a/packages/compiler-cli/test/diagnostics/BUILD.bazel
+++ b/packages/compiler-cli/test/diagnostics/BUILD.bazel
@ -38,7 +38,7 @@ jasmine_node_test(
        "//packages/core:npm_package",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
@ -72,7 +72,7 @@ jasmine_node_test(
        "//packages/forms:npm_package",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
--- a/packages/compiler-cli/test/transformers/BUILD.bazel
+++ b/packages/compiler-cli/test/transformers/BUILD.bazel
@ -26,7 +26,7 @@ jasmine_node_test(
        "//packages/router:npm_package",
    ],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@ -75,8 +75,8 @@ jasmine_node_test(
        "//packages/core:npm_package",
    ],
    tags = [
+        "fixme-ivy-aot",
        "fixme-ivy-jit",
-        "fixme-ivy-local",
    ],
    deps = [
        ":test_lib",
@ -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",
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@ -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",
@ -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",
--- a/packages/elements/test/BUILD.bazel
+++ b/packages/elements/test/BUILD.bazel
@ -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 = [
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/http/test/BUILD.bazel
+++ b/packages/http/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@ -23,8 +23,8 @@ jasmine_node_test(
        "//packages/forms:npm_package",
    ],
    tags = [
+        "fixme-ivy-aot",
        "fixme-ivy-jit",
-        "fixme-ivy-local",
    ],
    deps = [
        ":test_lib",
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@ -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",
--- a/packages/platform-browser/animations/test/BUILD.bazel
+++ b/packages/platform-browser/animations/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@ -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",
@ -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",
--- a/packages/platform-server/test/BUILD.bazel
+++ b/packages/platform-server/test/BUILD.bazel
@ -26,8 +26,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",
--- a/packages/platform-webworker/test/BUILD.bazel
+++ b/packages/platform-webworker/test/BUILD.bazel
@ -20,7 +20,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",
@ -30,8 +30,8 @@ jasmine_node_test(
 ts_web_test_suite(
    name = "test_web",
    tags = [
+        "fixme-ivy-aot",
        "fixme-ivy-jit",
-        "fixme-ivy-local",
    ],
    deps = [
        ":test_lib",
--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@ -24,8 +24,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",
@ -36,8 +36,8 @@ jasmine_node_test(
 ts_web_test_suite(
    name = "test_web",
    tags = [
+        "fixme-ivy-aot",
        "fixme-ivy-jit",
-        "fixme-ivy-local",
    ],
    deps = [
        ":test_lib",
--- a/packages/router/test/aot_ngsummary_test/BUILD.bazel
+++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel
@ -17,7 +17,7 @@ ts_library(
    testonly = True,
    srcs = ["aot_router_bootstrap.spec.ts"],
    tags = [
-        "fixme-ivy-local",
+        "fixme-ivy-aot",
        "no-ivy-jit",
    ],
    deps = [
@ -33,7 +33,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 = [
--- a/packages/router/upgrade/test/BUILD.bazel
+++ b/packages/router/upgrade/test/BUILD.bazel
@ -16,8 +16,8 @@ ts_library(
 ts_web_test_suite(
    name = "test_web",
    tags = [
+        "fixme-ivy-aot",
        "fixme-ivy-jit",
-        "fixme-ivy-local",
    ],
    deps = [
        ":test_lib",
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@ -20,7 +20,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",
@ -29,7 +29,7 @@ jasmine_node_test(

 ts_web_test_suite(
    name = "test_web",
-    tags = ["fixme-ivy-local"],
+    tags = ["fixme-ivy-aot"],
    deps = [
        ":test_lib",
    ],
--- a/packages/upgrade/test/BUILD.bazel
+++ b/packages/upgrade/test/BUILD.bazel
@ -23,8 +23,8 @@ ts_web_test_suite(
        "//:angularjs_scripts",
    ],
    tags = [
+        "fixme-ivy-aot",
        "fixme-ivy-jit",
-        "fixme-ivy-local",
    ],
    deps = [
        ":test_lib",
--- a/scripts/build-packages-dist.sh
+++ b/scripts/build-packages-dist.sh
@ -61,4 +61,4 @@ buildTargetPackages "$BAZEL_TARGETS" "dist/packages-dist" "legacy" "Production"
    || "${CIRCLE_PROJECT_REPONAME-}" != "angular"
 ]] && exit 0

-buildTargetPackages "$BAZEL_TARGETS" "dist/packages-dist-ivy-local" "local" "Ivy AOT"
+buildTargetPackages "$BAZEL_TARGETS" "dist/packages-dist-ivy-aot" "aot" "Ivy AOT"
--- a/scripts/ci/publish-build-artifacts.sh
+++ b/scripts/ci/publish-build-artifacts.sh
@ -123,8 +123,7 @@ function publishAllBuilds() {
  local latestTag=`getLatestTag`

  publishPackages $GIT_SCHEME dist/packages-dist $CUR_BRANCH "${latestTag}+${shortSha}"
-  publishPackages $GIT_SCHEME dist/packages-dist-ivy-jit "${CUR_BRANCH}-ivy-jit" "${latestTag}-ivy-jit+${shortSha}"
-  publishPackages $GIT_SCHEME dist/packages-dist-ivy-local "${CUR_BRANCH}-ivy-aot" "${latestTag}-ivy-aot+${shortSha}"
+  publishPackages $GIT_SCHEME dist/packages-dist-ivy-aot "${CUR_BRANCH}-ivy-aot" "${latestTag}-ivy-aot+${shortSha}"
 }

 # See docs/DEVELOPER.md for help
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@ -223,12 +223,12 @@ def ng_rollup_bundle(deps = [], **kwargs):
 def ivy_tags(tags):
    """Sets inclusive ivy-jit and ivy-local tags"""

-    # Set the tags by default unless no-ivy-jit, no-ivy-local, fixme-ivy-jit, or fixme-ivy-local were specified.
+    # Set the tags by default unless no-ivy-jit, no-ivy-aot, fixme-ivy-jit, or fixme-ivy-aot were specified.
    # We should remove this and use only explicitly defined tags once https://github.com/bazelbuild/rules_nodejs/pull/388 is fixed.
    if not tags:
-        tags = ["ivy-jit", "ivy-local"]
+        tags = ["ivy-jit", "ivy-aot"]
    elif "no-ivy-jit" not in tags and "fixme-ivy-jit" not in tags:
        tags = tags + ["ivy-jit"]
-    elif "no-ivy-local" not in tags and "fixme-ivy-local" not in tags:
-        tags = tags + ["ivy-local"]
+    elif "no-ivy-aot" not in tags and "fixme-ivy-aot" not in tags:
+        tags = tags + ["ivy-aot"]
    return tags