From 68d0b69165127e259b23515f3d6d62fd1e4fc0ea Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Mon, 1 Feb 2016 10:28:54 +0000 Subject: 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 --- examples/d/hello_lib/BUILD | 2 +- examples/d/hello_world/BUILD | 2 +- examples/dotnet/example_binary/BUILD | 2 +- examples/dotnet/example_lib/BUILD | 2 +- examples/dotnet/example_test/BUILD | 2 +- examples/dotnet/example_transitive_lib/BUILD | 2 +- examples/go/bin/BUILD | 2 +- examples/go/lib/BUILD | 2 +- examples/go/vendor/github_com/user/vendored/BUILD | 2 +- examples/java-skylark/src/main/java/com/example/myproject/BUILD | 2 +- examples/java-skylark/src/test/java/com/example/myproject/BUILD | 2 +- examples/jsonnet/BUILD | 2 +- examples/proto/BUILD | 2 +- examples/py/BUILD | 2 +- examples/rust/fibonacci/BUILD | 2 +- examples/rust/hello_lib/BUILD | 2 +- examples/rust/hello_world/BUILD | 2 +- examples/sass/hello_world/BUILD | 2 +- examples/sass/shared/BUILD | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'examples') diff --git a/examples/d/hello_lib/BUILD b/examples/d/hello_lib/BUILD index a4d901d224..3b4f084737 100644 --- 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 index 27e6a4e3eb..901f42f735 100644 --- 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 index 04c126a31e..0b9263c5dc 100644 --- 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 index 0ec2cd7dab..ad1b2b1466 100644 --- 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 index 06461ca3c5..41613cfb21 100644 --- 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 index c6535d781c..b210b7ac53 100644 --- 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 index d6676c401a..ee97b92c89 100644 --- 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 index ac982b1145..54d4d4fd94 100644 --- 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 index 7fa0283e99..a96b4cef95 100644 --- 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 index 70618aafb5..939275826c 100644 --- 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 index a38d22208a..429c140670 100644 --- 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 index 735057ed17..72bc4eee69 100644 --- 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 index 32e43e5831..ce88a6a914 100644 --- 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 index 3963387ee7..b58477831a 100644 --- 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 index a29e2123ba..74f7914217 100644 --- 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 index 90941e6a42..c47368727a 100644 --- 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 index 71061255cd..e78362915c 100644 --- 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 index 7109872d52..ad42b99244 100644 --- 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 index c9bdc2f500..bc3f3370d8 100644 --- 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( -- cgit v1.2.3