Migrate Domain Registry to Closure Rules 0.1.0

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122525197
2025-05-14 08:27:14 +02:00 · 2016-05-17 08:11:52 -07:00 · 2016-05-17 08:11:52 -07:00 · e1cf51ebb3
commit e1cf51ebb3
parent 1abd2a6314
43 changed files with 69 additions and 1871 deletions
--- a/java/google/registry/repositories.bzl
+++ b/java/google/registry/repositories.bzl
@ -18,42 +18,6 @@

 def domain_registry_repositories():

-  native.maven_jar(
-      name = "aopalliance",
-      artifact = "aopalliance:aopalliance:1.0",
-      sha1 = "0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8",
-  )
-
-  native.maven_jar(
-      name = "asm",
-      artifact = "org.ow2.asm:asm:5.0.3",
-      sha1 = "dcc2193db20e19e1feca8b1240dbbc4e190824fa",
-  )
-
-  native.maven_jar(
-      name = "asm_analysis",
-      artifact = "org.ow2.asm:asm-analysis:5.0.3",
-      sha1 = "c7126aded0e8e13fed5f913559a0dd7b770a10f3",
-  )
-
-  native.maven_jar(
-      name = "asm_commons",
-      artifact = "org.ow2.asm:asm-commons:5.0.3",
-      sha1 = "a7111830132c7f87d08fe48cb0ca07630f8cb91c",
-  )
-
-  native.maven_jar(
-      name = "asm_util",
-      artifact = "org.ow2.asm:asm-util:5.0.3",
-      sha1 = "1512e5571325854b05fb1efce1db75fcced54389",
-  )
-
-  native.maven_jar(
-      name = "args4j",
-      artifact = "args4j:args4j:2.0.26",
-      sha1 = "01ebb18ebb3b379a74207d5af4ea7c8338ebd78b",
-  )
-
  native.maven_jar(
      name = "appengine_api_sdk",
      artifact = "com.google.appengine:appengine-api-1.0-sdk:1.9.30",
@ -168,26 +132,6 @@ def domain_registry_repositories():
      sha1 = "80dd3b0d5591580c429b0e2529706f6be5bddc0f",
  )

-  native.maven_jar(
-      name = "closure_compiler",
-      artifact = "com.google.javascript:closure-compiler:v20160208",
-      sha1 = "5a2f4be6cf41e27ed7119d26cb8f106300d87d91",
-  )
-
-  native.new_http_archive(
-      name = "closure_library",
-      build_file = "third_party/closure/library/closure_library.BUILD",
-      sha256 = "8f610300e4930190137505a574a54d12346426f2a7b4f179026e41674e452a86",
-      strip_prefix = "closure-library-20160208",
-      url = "https://github.com/google/closure-library/archive/20160208.zip",
-  )
-
-  native.maven_jar(
-      name = "closure_stylesheets",
-      artifact = "com.google.closure-stylesheets:closure-stylesheets:20160212",
-      sha1 = "f0e8625a2cfe0f501b28f5e6438b836358da8a97",
-  )
-
  native.maven_jar(
      name = "dagger",
      artifact = "com.google.dagger:dagger:2.4",
@ -326,24 +270,6 @@ def domain_registry_repositories():
      sha1 = "ce5b880b206de3f76d364988a6308c68c726f74a",
  )

-  native.maven_jar(
-      name = "guice",
-      artifact = "com.google.inject:guice:3.0",
-      sha1 = "9d84f15fe35e2c716a02979fb62f50a29f38aefa",
-  )
-
-  native.maven_jar(
-      name = "guice_assistedinject",
-      artifact = "com.google.inject.extensions:guice-assistedinject:3.0",
-      sha1 = "544449ddb19f088dcde44f055d30a08835a954a7",
-  )
-
-  native.maven_jar(
-      name = "guice_multibindings",
-      artifact = "com.google.inject.extensions:guice-multibindings:3.0",
-      sha1 = "5e670615a927571234df68a8b1fe1a16272be555",
-  )
-
  native.maven_jar(
      name = "hamcrest_core",
      artifact = "org.hamcrest:hamcrest-core:1.3",
@ -488,14 +414,6 @@ def domain_registry_repositories():
      sha1 = "79a8984096fc6591c1e3690e07d41be506356fa5",
  )

-  # XXX: new_http_archive() doesn't maintain the executable bit.
-  #      https://github.com/bazelbuild/bazel/issues/984
-  native.http_file(
-      name = "phantomjs",
-      sha256 = "86dd9a4bf4aee45f1a84c9f61cf1947c1d6dce9b9e8d2a907105da7852460d2f",
-      url = "https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2",
-  )
-
  native.maven_jar(
      name = "protobuf_java",
      artifact = "com.google.protobuf:protobuf-java:2.6.1",
@ -526,18 +444,6 @@ def domain_registry_repositories():
      sha1 = "862a5bc736005d68727d1387844d09d62efdb6cb",
  )

-  native.maven_jar(
-      name = "soy",
-      artifact = "com.google.template:soy:2016-01-12",
-      sha1 = "adadc37aecf1042de7c9c6a6eb8f34719500ed69",
-  )
-
-  native.http_file(
-      name = "soyutils_usegoog",
-      sha256 = "fdb0e318949c1af668038df1d85d45353a00ff585f321c86efe91ac2a10cc91f",
-      url = "https://repo1.maven.org/maven2/com/google/template/soy/2016-01-12/soy-2016-01-12-soyutils_usegoog.js",
-  )
-
  native.maven_jar(
      name = "sshd_core",
      artifact = "org.apache.sshd:sshd-core:0.7.0",
--- a/java/google/registry/tools/BUILD
+++ b/java/google/registry/tools/BUILD
@ -78,7 +78,7 @@ java_library(

        "//third_party/java/appengine:appengine-remote-api",

-        "//third_party/closure/templates",
+        "@io_bazel_rules_closure//closure/templates",
    ],
 )

--- a/java/google/registry/tools/soy/BUILD
+++ b/java/google/registry/tools/soy/BUILD
@ -2,7 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library")


 closure_template_java_library(
--- a/java/google/registry/ui/BUILD
+++ b/java/google/registry/ui/BUILD
@ -2,8 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/compiler:closure_js_binary.bzl", "closure_js_binary")
-load("//third_party/closure/compiler:closure_js_deps.bzl", "closure_js_deps")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_deps")

 exports_files(["globals.txt"])

@ -34,7 +33,7 @@ filegroup(
        ":assets_recursive",
        "//javascript/closure:js_files_recursive",
        "//javascript/template/soy:soy_usegoog_js_files",
-        "//java/google/registry/ui:deps-runfiles.js",
+        "//java/google/registry/ui:deps.js",
        "//java/google/registry/ui/css:registrar_bin.css",
        "//java/google/registry/ui/html:html_files",
    ],
@ -43,13 +42,14 @@ filegroup(
 filegroup(
    name = "runfiles_debug",
    srcs = [
-        "deps-runfiles.js",
-        ":js_files_recursive",
+        "@closure_library//:js_files",
+        "brain_bin.js.map",
+        "deps.js",
+        "registrar_bin.js.map",
        ":runfiles",
        "//javascript/closure:js_files_recursive",
        "//javascript/template/soy:soy_usegoog_js_files",
        "//java/google/registry/ui/css:css_files",
-        "//third_party/javascript/closure:js_files_recursive",
    ],
 )

@ -68,19 +68,12 @@ java_library(

 closure_js_deps(
    name = "deps",
-    srcs = [
+    deps = [
        "//java/google/registry/ui/js",
        "//java/google/registry/ui/js/registrar",
    ],
 )

-SOURCEMAP_SCRUB = ("  -e 's@b....-out/[^/]*/bin/@@g'" +
-                   "  -e 's@b....-out/[^/]*/genfiles/@@g'" +
-                   "  -e 's@\"java/@\"/assets/sources/java/@g'" +
-                   "  -e 's@\"javascript/@\"/assets/sources/javascript/@g'" +
-                   "  -e 's@\"third_party/@\"/assets/sources/third_party/@g'" +
-                   "  -e 's@\"external/@\"/assets/sources/external/@g'")
-
 ################################################################################
 ## Registrar Console

@ -91,23 +84,14 @@ SOURCEMAP_SCRUB = ("  -e 's@b....-out/[^/]*/bin/@@g'" +
 # non-union minified equivalents.
 closure_js_binary(
    name = "registrar_bin",
-    externs_list = ["//java/google/registry/ui/externs"],
-    main = "registry.registrar.main",
+    css = "//java/google/registry/ui/css:registrar_bin",
+    entry_points = ["goog:registry.registrar.main"],
    deps = [
-        "//java/google/registry/ui/css:registrar_bin",
+        "//java/google/registry/ui/externs",
        "//java/google/registry/ui/js/registrar",
    ],
 )

-# Mangle all the paths in the generated sourcemap so they're absolute; assuming
-# the codebase is available under /assets/sources/.
-genrule(
-    name = "registrar_bin_sourcemap",
-    srcs = ["registrar_bin.sourcemap"],
-    outs = ["registrar_bin.js.map"],
-    cmd = "sed $(location registrar_bin.sourcemap) " + SOURCEMAP_SCRUB + "  >$@",
-)
-
 # The webserver should provide this to trusted admin users, rather than
 # registrar_bin.js. This is what makes debugging in production possible.
 genrule(
@ -125,12 +109,12 @@ genrule(
 # an extra underscore.
 closure_js_binary(
    name = "registrar_dbg",
+    css = "//java/google/registry/ui/css:registrar_dbg",
    debug = 1,
-    externs_list = ["//java/google/registry/ui/externs"],
+    entry_points = ["goog:registry.registrar.main"],
    formatting = "PRETTY_PRINT",
-    main = "registry.registrar.main",
    deps = [
-        "//java/google/registry/ui/css:registrar_dbg",
+        "//java/google/registry/ui/externs",
        "//java/google/registry/ui/js/registrar",
    ],
 )
@ -140,16 +124,11 @@ closure_js_binary(

 closure_js_binary(
    name = "brain_bin",
-    externs_list = ["//java/google/registry/ui/externs"],
-    main = "registry.registrar.BrainFrame.main",
-    deps = ["//java/google/registry/ui/js/registrar"],
-)
-
-genrule(
-    name = "brain_bin_sourcemap",
-    srcs = ["brain_bin.sourcemap"],
-    outs = ["brain_bin.js.map"],
-    cmd = "sed $(location brain_bin.sourcemap) " + SOURCEMAP_SCRUB + "  >$@",
+    entry_points = ["goog:registry.registrar.BrainFrame.main"],
+    deps = [
+        "//java/google/registry/ui/externs",
+        "//java/google/registry/ui/js/registrar",
+    ],
 )

 genrule(
--- a/java/google/registry/ui/assets/html/insecure-brainframe.html
+++ b/java/google/registry/ui/assets/html/insecure-brainframe.html
@ -2,8 +2,9 @@
 <!-- This can only be used by admins in a testing environment. -->
 <!-- This iframe provides no isolation of Braintree from Console. -->
 <script src="https://js.braintreegateway.com/v2/braintree.js"></script>
+<script>var CLOSURE_NO_DEPS = true;</script>
 <script src="/assets/sources/javascript/closure/base.js"></script>
-<script src="/assets/sources/deps-runfiles.js"></script>
+<script src="/assets/sources/deps.js"></script>
 <body style="margin:0">
 <form><div id="brainframe"></div></form>
 <script>goog.require('registry.registrar.BrainFrame.main');</script>
--- a/java/google/registry/ui/css/BUILD
+++ b/java/google/registry/ui/css/BUILD
@ -2,8 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/stylesheets:closure_css_library.bzl", "closure_css_library")
-load("//third_party/closure/stylesheets:closure_css_binary.bzl", "closure_css_binary")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_css_library", "closure_css_binary")


 filegroup(
--- a/java/google/registry/ui/externs/BUILD
+++ b/java/google/registry/ui/externs/BUILD
@ -2,10 +2,12 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")

-filegroup(
+
+closure_js_library(
    name = "externs",
-    srcs = glob(["*.js"]),
+    externs = glob(["*.js"]),
 )

 filegroup(
--- a/java/google/registry/ui/js/BUILD
+++ b/java/google/registry/ui/js/BUILD
@ -2,7 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/compiler:closure_js_library.bzl", "closure_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")


 filegroup(
--- a/java/google/registry/ui/js/registrar/BUILD
+++ b/java/google/registry/ui/js/registrar/BUILD
@ -2,7 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/compiler:closure_js_library.bzl", "closure_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")


 filegroup(
--- a/java/google/registry/ui/server/BUILD
+++ b/java/google/registry/ui/server/BUILD
@ -27,6 +27,6 @@ java_library(
        "//third_party/java/re2j",
        "//third_party/java/servlet/servlet_api",

-        "//third_party/closure/templates",
+        "@io_bazel_rules_closure//closure/templates",
    ],
 )
--- a/java/google/registry/ui/server/api/BUILD
+++ b/java/google/registry/ui/server/api/BUILD
@ -21,6 +21,6 @@ java_library(
        "//third_party/java/jsr305_annotations",
        "//third_party/java/servlet/servlet_api",

-        "//third_party/closure/templates",
+        "@io_bazel_rules_closure//closure/templates",
    ],
 )
--- a/java/google/registry/ui/server/registrar/BUILD
+++ b/java/google/registry/ui/server/registrar/BUILD
@ -40,6 +40,6 @@ java_library(
        "//third_party/java/objectify:objectify-v4_1",
        "//third_party/java/servlet/servlet_api",

-        "//third_party/closure/templates",
+        "@io_bazel_rules_closure//closure/templates",
    ],
 )
--- a/java/google/registry/ui/soy/BUILD
+++ b/java/google/registry/ui/soy/BUILD
@ -2,8 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library")
-load("//third_party/closure/templates:closure_template_js_library.bzl", "closure_template_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library", "closure_template_js_library")


 filegroup(
--- a/java/google/registry/ui/soy/api/BUILD
+++ b/java/google/registry/ui/soy/api/BUILD
@ -2,8 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library")
-load("//third_party/closure/templates:closure_template_js_library.bzl", "closure_template_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library", "closure_template_js_library")


 filegroup(
--- a/java/google/registry/ui/soy/registrar/BUILD
+++ b/java/google/registry/ui/soy/registrar/BUILD
@ -2,8 +2,7 @@ package(default_visibility = ["//java/google/registry:registry_project"])

 licenses(["notice"])  # Apache 2.0

-load("//third_party/closure/templates:closure_template_java_library.bzl", "closure_template_java_library")
-load("//third_party/closure/templates:closure_template_js_library.bzl", "closure_template_js_library")
+load("@io_bazel_rules_closure//closure:defs.bzl", "closure_template_java_library", "closure_template_js_library")


 filegroup(
--- a/java/google/registry/ui/soy/registrar/Console.soy
+++ b/java/google/registry/ui/soy/registrar/Console.soy
@ -38,9 +38,10 @@
    {case google.registry.ui.ConsoleDebug.DEBUG}
      <script src="/assets/js/registrar_dbg.js"></script>
    {case google.registry.ui.ConsoleDebug.RAW}
+      <script>var CLOSURE_NO_DEPS = true;</script>
      <script src="/assets/sources/external/closure_library/closure/goog/base.js">
      </script>
-      <script src="/assets/sources/deps-runfiles.js"></script>
+      <script src="/assets/sources/deps.js"></script>
      <script>goog.require('registry.registrar.main');</script>
  {/switch}
  {if isNonnull(DEBUG)}