From 5854a721e9aa833965ce7de63f52dca87025a6b2 Mon Sep 17 00:00:00 2001 From: Julio Merino Date: Wed, 17 Feb 2016 22:14:00 +0000 Subject: Turn //tools/build_rules into a package. This is in preparation for another change that will add a new helper script to the tools/build_rules directory, and such script requires a BUILD rule of its own. -- MOS_MIGRATED_REVID=114898083 --- examples/java-skylark/src/main/java/com/example/myproject/BUILD | 2 +- examples/java-skylark/src/test/java/com/example/myproject/BUILD | 2 +- examples/proto/BUILD | 2 +- examples/py/BUILD | 2 +- .../buildjar/java/com/google/devtools/build/buildjar/BUILD | 2 +- .../java/com/google/devtools/build/buildjar/genclass/BUILD | 2 +- .../java/com/google/devtools/build/buildjar/jarhelper/BUILD | 2 +- .../java/com/google/devtools/build/buildjar/javac/plugins/BUILD | 2 +- src/java_tools/singlejar/BUILD | 2 +- src/main/java/com/google/devtools/build/lib/BUILD | 2 +- src/main/protobuf/BUILD | 2 +- tools/BUILD | 2 ++ tools/build_defs/sass/test/sass_rule_test.bzl | 2 +- tools/build_rules/BUILD | 7 +++++++ tools/build_rules/rust/test/rust_rule_test.bzl | 2 +- 15 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 tools/build_rules/BUILD 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 939275826c..5f8790fd94 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.bzl", "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 429c140670..0257d24d8c 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.bzl", "java_library", "java_test") +load("//tools/build_rules:java_rules_skylark.bzl", "java_library", "java_test") java_library( name = "junit4", diff --git a/examples/proto/BUILD b/examples/proto/BUILD index ce88a6a914..def85a789f 100644 --- a/examples/proto/BUILD +++ b/examples/proto/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:build_rules/genproto.bzl", "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 b58477831a..7570f578dd 100644 --- a/examples/py/BUILD +++ b/examples/py/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:build_rules/py_rules.bzl", "py_library", "py_binary") +load("//tools/build_rules:py_rules.bzl", "py_library", "py_binary") py_library( name = "lib", diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD index be49e776d4..22496fb5b3 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD @@ -86,7 +86,7 @@ java_library( deps = [], ) -load("//tools:build_rules/java_rules_skylark.bzl", "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/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD index 04172992e7..240432a9ef 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD @@ -28,7 +28,7 @@ java_library( ## Bootstrapping using Skylark rules # -load("//tools:build_rules/java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary") +load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary") bootstrap_java_binary( name = "bootstrap_genclass", diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD index 5dda25ddf9..05c570adeb 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD @@ -36,7 +36,7 @@ java_library( ## Bootstrapping using Skylark rules # -load("//tools:build_rules/java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary") +load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary") bootstrap_java_library( name = "bootstrap_jarhelper", diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD index 132ef8796c..9c4178e891 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD @@ -68,7 +68,7 @@ java_library( ## Bootstrapping using Skylark rules # -load("//tools:build_rules/java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary") +load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library", "bootstrap_java_binary") bootstrap_java_library( name = "bootstrap_plugins", diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD index a8da62d45e..aa0843c992 100644 --- 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.bzl", "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 index 124d3c58fb..1800b43ea2 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -928,7 +928,7 @@ genrule( # Bootstrapping SingleJar using Skylark rules # -load("//tools:build_rules/java_rules_skylark.bzl", "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 index b97fcf1f3c..49546fed83 100644 --- a/src/main/protobuf/BUILD +++ b/src/main/protobuf/BUILD @@ -1,6 +1,6 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:build_rules/genproto.bzl", "proto_java_library") +load("//tools/build_rules:genproto.bzl", "proto_java_library") FILES = [ "build", diff --git a/tools/BUILD b/tools/BUILD index 6455ad0613..53fb97eeb3 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -9,6 +9,7 @@ filegroup( srcs = glob(["**"]) + [ "//tools/android:srcs", "//tools/android/jack:srcs", + "//tools/build_rules:srcs", "//tools/jdk:srcs", "//tools/genrule:srcs", "//tools/cpp:srcs", @@ -33,6 +34,7 @@ filegroup( "//tools/build_rules/closure:srcs", "//tools/build_rules/go:srcs", "//tools/build_rules/rust:srcs", + "//tools/build_rules:srcs", "//tools/buildstamp:srcs", "//tools/cpp:srcs", "//tools/genrule:srcs", diff --git a/tools/build_defs/sass/test/sass_rule_test.bzl b/tools/build_defs/sass/test/sass_rule_test.bzl index 6630a89830..c4a12fec86 100644 --- a/tools/build_defs/sass/test/sass_rule_test.bzl +++ b/tools/build_defs/sass/test/sass_rule_test.bzl @@ -18,7 +18,7 @@ load( ) load( - "//tools:build_rules/test_rules.bzl", + "//tools/build_rules:test_rules.bzl", "success_target", "successful_test", "failure_target", diff --git a/tools/build_rules/BUILD b/tools/build_rules/BUILD new file mode 100644 index 0000000000..1184bb1895 --- /dev/null +++ b/tools/build_rules/BUILD @@ -0,0 +1,7 @@ +licenses(["notice"]) # Apache 2.0 + +filegroup( + name = "srcs", + srcs = glob(["**"]), + visibility = ["//tools:__pkg__"], +) diff --git a/tools/build_rules/rust/test/rust_rule_test.bzl b/tools/build_rules/rust/test/rust_rule_test.bzl index 6be7f59640..c4094bd46a 100644 --- a/tools/build_rules/rust/test/rust_rule_test.bzl +++ b/tools/build_rules/rust/test/rust_rule_test.bzl @@ -21,7 +21,7 @@ load( "rust_test", ) load( - "//tools:build_rules/test_rules.bzl", + "//tools/build_rules:test_rules.bzl", "rule_test", ) -- cgit v1.2.3