Use labels in load statements

This will fix some issue with loading skylark rules from @bazel_tools. Tested with ./compile.sh all and also a project that use pkg_tar from @bazel_tools (which is broken at HEAD). -- Change-Id: Iffbb7134ef5fee497890c4d01b85084973d45ad0 Reviewed-on: https://bazel-review.googlesource.com/2800 MOS_MIGRATED_REVID=113508661
aovakur · Feb 2, 2016 · 68d0b69 · 68d0b69
1 parent 038a574
commit 68d0b69
Show file tree

Hide file tree

Showing 34 changed files with 37 additions and 37 deletions.
diff --git a/BUILD b/BUILD
@@ -10,6 +10,6 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-load("/tools/build_rules/go/def", "go_prefix")
+load("//tools/build_rules/go:def.bzl", "go_prefix")
 
 go_prefix("github.com/bazelbuild/bazel")
diff --git a/examples/d/hello_lib/BUILD b/examples/d/hello_lib/BUILD
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "/tools/build_defs/d/d",
+    "//tools/build_defs/d:d.bzl",
     "d_docs",
     "d_library",
     "d_source_library",

diff --git a/examples/d/hello_world/BUILD b/examples/d/hello_world/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_defs/d/d", "d_binary", "d_docs")
+load("//tools/build_defs/d:d.bzl", "d_binary", "d_docs")
 
 d_binary(
     name = "hello_world",

diff --git a/examples/dotnet/example_binary/BUILD b/examples/dotnet/example_binary/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_defs/dotnet/csharp", "csharp_binary")
+load("//tools/build_defs/dotnet:csharp.bzl", "csharp_binary")
 
 csharp_binary(
     name = "hello",

diff --git a/examples/dotnet/example_lib/BUILD b/examples/dotnet/example_lib/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_defs/dotnet/csharp", "csharp_library")
+load("//tools/build_defs/dotnet:csharp.bzl", "csharp_library")
 
 csharp_library(
     name = "MyClass",

diff --git a/examples/dotnet/example_test/BUILD b/examples/dotnet/example_test/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_defs/dotnet/csharp", "csharp_nunit_test")
+load("//tools/build_defs/dotnet:csharp.bzl", "csharp_nunit_test")
 
 csharp_nunit_test(
     name = "MyTest",

diff --git a/examples/dotnet/example_transitive_lib/BUILD b/examples/dotnet/example_transitive_lib/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_defs/dotnet/csharp", "csharp_library")
+load("//tools/build_defs/dotnet:csharp.bzl", "csharp_library")
 
 csharp_library(
     name = "TransitiveClass",

diff --git a/examples/go/bin/BUILD b/examples/go/bin/BUILD
@@ -2,7 +2,7 @@ package(
     default_visibility = ["//visibility:public"],
 )
 
-load("/tools/build_rules/go/def", "go_binary")
+load("//tools/build_rules/go:def.bzl", "go_binary")
 
 go_binary(
     name = "bin",

diff --git a/examples/go/lib/BUILD b/examples/go/lib/BUILD
@@ -2,7 +2,7 @@ package(
     default_visibility = ["//visibility:public"],
 )
 
-load("/tools/build_rules/go/def", "go_library", "go_test")
+load("//tools/build_rules/go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",

diff --git a/examples/go/vendor/github_com/user/vendored/BUILD b/examples/go/vendor/github_com/user/vendored/BUILD
@@ -2,7 +2,7 @@ package(
     default_visibility = ["//visibility:public"],
 )
 
-load("/tools/build_rules/go/def", "go_library")
+load("//tools/build_rules/go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",

diff --git a/examples/java-skylark/src/main/java/com/example/myproject/BUILD b/examples/java-skylark/src/main/java/com/example/myproject/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_rules/java_rules_skylark", "java_library", "java_binary", "java_test")
+load("//tools:build_rules/java_rules_skylark.bzl", "java_library", "java_binary", "java_test")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/examples/java-skylark/src/test/java/com/example/myproject/BUILD b/examples/java-skylark/src/test/java/com/example/myproject/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_rules/java_rules_skylark", "java_library", "java_test")
+load("//tools:build_rules/java_rules_skylark.bzl", "java_library", "java_test")
 
 java_library(
     name = "junit4",

diff --git a/examples/jsonnet/BUILD b/examples/jsonnet/BUILD
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "/tools/build_defs/jsonnet/jsonnet",
+    "//tools/build_defs/jsonnet:jsonnet.bzl",
     "jsonnet_library",
     "jsonnet_to_json",
     "jsonnet_to_json_test",

diff --git a/examples/proto/BUILD b/examples/proto/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/genproto", "proto_java_library")
+load("//tools:build_rules/genproto.bzl", "proto_java_library")
 
 proto_library(
     name = "proto_smoke_test",

diff --git a/examples/py/BUILD b/examples/py/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/py_rules", "py_library", "py_binary")
+load("//tools:build_rules/py_rules.bzl", "py_library", "py_binary")
 
 py_library(
     name = "lib",

diff --git a/examples/rust/fibonacci/BUILD b/examples/rust/fibonacci/BUILD
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "/tools/build_rules/rust/rust",
+    "//tools/build_rules/rust:rust.bzl",
     "rust_library",
     "rust_test",
     "rust_bench_test",

diff --git a/examples/rust/hello_lib/BUILD b/examples/rust/hello_lib/BUILD
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load(
-    "/tools/build_rules/rust/rust",
+    "//tools/build_rules/rust:rust.bzl",
     "rust_library",
     "rust_test",
     "rust_doc",

diff --git a/examples/rust/hello_world/BUILD b/examples/rust/hello_world/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/rust/rust", "rust_binary", "rust_doc", "rust_doc_test")
+load("//tools/build_rules/rust:rust.bzl", "rust_binary", "rust_doc", "rust_doc_test")
 
 rust_binary(
     name = "hello_world",

diff --git a/examples/sass/hello_world/BUILD b/examples/sass/hello_world/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_defs/sass/sass", "sass_binary")
+load("//tools/build_defs/sass:sass.bzl", "sass_binary")
 
 # Import our shared colors and fonts so we can generate a CSS file.
 sass_binary(

diff --git a/examples/sass/shared/BUILD b/examples/sass/shared/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_defs/sass/sass", "sass_library")
+load("//tools/build_defs/sass:sass.bzl", "sass_library")
 
 # make a :colors target that any sass_binary rules can depend on.
 sass_library(

diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD
@@ -39,7 +39,7 @@ genrule(
     cmd = "cp $< $@",
 )
 
-load("self_extract_binary", "self_extract_binary")
+load(":self_extract_binary.bzl", "self_extract_binary")
 
 self_extract_binary(
     name = "install.sh",
@@ -57,7 +57,7 @@ self_extract_binary(
     ],
 )
 
-load("/tools/build_defs/pkg/pkg", "pkg_tar", "pkg_deb")
+load("//tools/build_defs/pkg:pkg.bzl", "pkg_tar", "pkg_deb")
 
 pkg_tar(
     name = "bazel-bin",

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
@@ -186,7 +186,7 @@ java_test(
 #
 # Bootstrapping using Skylark rules
 #
-load("/tools/build_rules/java_rules_skylark", "bootstrap_java_library", "bootstrap_java_binary")
+load("//tools:build_rules/java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
 
 bootstrap_java_library(
     name = "skylark-deps",

diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
@@ -61,7 +61,7 @@ java_test(
 #
 # Bootstrapping using Skylark rules
 #
-load("/tools/build_rules/java_rules_skylark", "bootstrap_java_library", "bootstrap_java_binary")
+load("//tools:build_rules/java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary")
 
 bootstrap_java_library(
     name = "skylark-deps",

diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -919,7 +919,7 @@ genrule(
 
 # Bootstrapping SingleJar using Skylark rules
 #
-load("/tools/build_rules/java_rules_skylark", "bootstrap_java_library")
+load("//tools:build_rules/java_rules_skylark.bzl", "bootstrap_java_library")
 
 bootstrap_java_library(
     name = "shell-skylark",

diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/genproto", "proto_java_library")
+load("//tools:build_rules/genproto.bzl", "proto_java_library")
 
 FILES = [
     "build",

diff --git a/tools/build_defs/docker/testdata/BUILD b/tools/build_defs/docker/testdata/BUILD
@@ -4,7 +4,7 @@ package(
     ],
 )
 
-load("/tools/build_defs/docker/docker", "docker_build")
+load("//tools/build_defs/docker:docker.bzl", "docker_build")
 
 filegroup(
     name = "srcs",

diff --git a/tools/build_defs/pkg/BUILD b/tools/build_defs/pkg/BUILD
@@ -51,7 +51,7 @@ py_binary(
 )
 
 # tests
-load("/tools/build_defs/pkg/pkg", "pkg_deb", "pkg_tar")
+load("//tools/build_defs/pkg:pkg.bzl", "pkg_deb", "pkg_tar")
 
 genrule(
     name = "generate_files",

diff --git a/tools/build_defs/sass/test/BUILD b/tools/build_defs/sass/test/BUILD
@@ -1,3 +1,3 @@
-load("sass_rule_test", "sass_rule_test")
+load(":sass_rule_test.bzl", "sass_rule_test")
 
 sass_rule_test("//examples/sass")
diff --git a/tools/build_defs/sass/test/sass_rule_test.bzl b/tools/build_defs/sass/test/sass_rule_test.bzl
@@ -13,12 +13,12 @@
 # limitations under the License.
 
 load(
-    "/tools/build_defs/sass/sass",
+    "//tools/build_defs/sass:sass.bzl",
     "sass_binary",
 )
 
 load(
-    "/tools/build_rules/test_rules",
+    "//tools:build_rules/test_rules.bzl",
     "success_target",
     "successful_test",
     "failure_target",

diff --git a/tools/build_defs/scala/test/BUILD b/tools/build_defs/scala/test/BUILD
@@ -1,4 +1,4 @@
-load("/tools/build_defs/scala/scala", "scala_binary", "scala_library")
+load("//tools/build_defs/scala:scala.bzl", "scala_binary", "scala_library")
 
 # The examples below show how to combine Scala and Java rules.
 # ScalaBinary is the Scala equivalent of JavaBinary.

diff --git a/tools/build_rules/go/tools/BUILD b/tools/build_rules/go/tools/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/go/def", "go_binary")
+load("//tools/build_rules/go:def.bzl", "go_binary")
 
 # This binary is used implicitly by go_test().
 go_binary(

diff --git a/tools/build_rules/go/tools/filter_tags/BUILD b/tools/build_rules/go/tools/filter_tags/BUILD
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("/tools/build_rules/go/def", "go_prefix", "go_library", "go_binary", "go_test")
+load("//tools/build_rules/go:def.bzl", "go_prefix", "go_library", "go_binary", "go_test")
 
 go_library(
     name = "filter_tags_lib",

diff --git a/tools/build_rules/rust/test/BUILD b/tools/build_rules/rust/test/BUILD
@@ -1,3 +1,3 @@
-load("rust_rule_test", "rust_rule_test")
+load(":rust_rule_test.bzl", "rust_rule_test")
 
 rust_rule_test("//examples/rust")
diff --git a/tools/build_rules/rust/test/rust_rule_test.bzl b/tools/build_rules/rust/test/rust_rule_test.bzl
@@ -15,14 +15,14 @@
 """Tests for rust rules."""
 
 load(
-    "/tools/build_rules/rust/rust",
+    "//tools/build_rules/rust:rust.bzl",
     "rust_library",
     "rust_binary",
     "rust_test",
 )
 
 load(
-    "/tools/build_rules/test_rules",
+    "//tools:build_rules/test_rules.bzl",
     "success_target",
     "successful_test",
     "failure_target",