Skip to content

Commit

Permalink
skylark: Prefer @drake//tools/skylark over //tools/skylark
Browse files Browse the repository at this point in the history 
For more information, see:
- bazelbuild/bazel#3115
- RobotLocomotion#8700
  • Loading branch information
@EricCousineau-TRI
EricCousineau-TRI committed Oct 29, 2018
1 parent c1296ee commit 086e4cb
Show file tree
Hide file tree
Showing 40 changed files with 75 additions and 55 deletions.
2 changes: 1 addition & 1 deletion attic/multibody/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ load(
"@drake//tools/skylark:drake_proto.bzl",
"drake_cc_proto_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("//tools/lint:lint.bzl", "add_lint_tests")

package(default_visibility = ["//visibility:public"])
Expand Down
2 changes: 1 addition & 1 deletion attic/multibody/dev/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load(
drake_cc_googletest = "attic_drake_cc_googletest",
drake_cc_library = "attic_drake_cc_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("//tools/lint:lint.bzl", "add_lint_tests")

drake_cc_library(
Expand Down
2 changes: 1 addition & 1 deletion bindings/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
)
load(
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ load(
"drake_cc_library",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_binary",
"drake_py_library",
"drake_py_test",
"drake_py_unittest",
)
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"generate_pybind_documentation_header",
"get_drake_py_installs",
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/common/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
"drake_py_unittest",
)
Expand Down
5 changes: 4 additions & 1 deletion bindings/pydrake/doc/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ package(default_visibility = ["//visibility:private"])

load("@drake//tools/skylark:drake_py.bzl", "drake_py_binary")
load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:drake_runfiles_binary.bzl", "drake_runfiles_binary")
load(
"@drake//tools/skylark:drake_runfiles_binary.bzl",
"drake_runfiles_binary",
)

py_library(
name = "sphinx_pydrake",
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/examples/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
"drake_py_unittest",
)
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/examples/multibody/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_binary",
"drake_py_library",
)
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/maliput/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_binary",
"drake_py_library",
"drake_py_unittest",
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/manipulation/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
"drake_py_unittest",
)
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/multibody/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
"drake_py_unittest",
)
Expand Down
10 changes: 7 additions & 3 deletions bindings/pydrake/solvers/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@

load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags", "mosek_test_tags")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:test_tags.bzl",
"gurobi_test_tags",
"mosek_test_tags",
)
load(
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
"drake_py_test",
"drake_py_unittest",
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/systems/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
Expand All @@ -13,7 +13,7 @@ load(
"drake_cc_library",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_binary",
"drake_py_library",
"drake_py_unittest",
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/third_party/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
load("@drake//tools/install:install.bzl", "install")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
)
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"get_pybind_package_info",
)
load(":forward_files.bzl", "forward_files")
Expand Down
4 changes: 2 additions & 2 deletions bindings/pydrake/util/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ load(
"drake_cc_library",
)
load(
"//tools/skylark:pybind.bzl",
"@drake//tools/skylark:pybind.bzl",
"drake_pybind_cc_googletest",
"drake_pybind_library",
"get_drake_py_installs",
"get_pybind_package_info",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_library",
"drake_py_test",
"drake_py_unittest",
Expand Down
2 changes: 1 addition & 1 deletion common/proto/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load(
"drake_cc_package_library",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_binary",
"drake_py_library",
"drake_py_unittest",
Expand Down
2 changes: 1 addition & 1 deletion examples/cubic_polynomial/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

load("@drake//tools/skylark:drake_cc.bzl", "drake_cc_binary")
load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:test_tags.bzl", "mosek_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "mosek_test_tags")

drake_cc_binary(
name = "region_of_attraction",
Expand Down
2 changes: 1 addition & 1 deletion examples/humanoid_controller/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load(
"drake_cc_googletest",
"drake_cc_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("//tools/lint:lint.bzl", "add_lint_tests")

package(default_visibility = ["//visibility:public"])
Expand Down
4 changes: 2 additions & 2 deletions examples/kuka_iiwa_arm/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ load(
"drake_cc_library",
)
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_unittest",
)
load("//tools/install:install_data.bzl", "install", "install_data")
load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_test",
)

Expand Down
2 changes: 1 addition & 1 deletion examples/manipulation_station/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ drake_cc_googletest(
# Python examples

load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_binary",
"drake_py_library",
)
Expand Down
2 changes: 1 addition & 1 deletion examples/qp_inverse_dynamics/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load(
"drake_cc_googletest",
"drake_cc_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("//tools/lint:lint.bzl", "add_lint_tests")

package(
Expand Down
2 changes: 1 addition & 1 deletion lcm/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load(
"drake_cc_library",
"drake_cc_package_library",
)
load("//tools/skylark:drake_py.bzl", "drake_py_test")
load("@drake//tools/skylark:drake_py.bzl", "drake_py_test")
load("//tools/lint:lint.bzl", "add_lint_tests")

package(default_visibility = ["//visibility:public"])
Expand Down
2 changes: 1 addition & 1 deletion lcmtypes/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ load(
"drake_py_test",
)
load(
"//tools/skylark:drake_lcm.bzl",
"@drake//tools/skylark:drake_lcm.bzl",
"drake_lcm_cc_library",
"drake_lcm_java_library",
"drake_lcm_py_library",
Expand Down
2 changes: 1 addition & 1 deletion manipulation/dev/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ load(
"drake_cc_library",
)
load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")

filegroup(
name = "test_models",
Expand Down
2 changes: 1 addition & 1 deletion multibody/inverse_kinematics/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ load(
"@drake//tools/skylark:drake_proto.bzl",
"drake_cc_proto_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("//tools/lint:lint.bzl", "add_lint_tests")

package(default_visibility = ["//visibility:public"])
Expand Down
6 changes: 5 additions & 1 deletion solvers/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ load(
"drake_cc_package_library",
"drake_cc_test",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags", "mosek_test_tags")
load(
"@drake//tools/skylark:test_tags.bzl",
"gurobi_test_tags",
"mosek_test_tags",
)
load("//tools/lint:lint.bzl", "add_lint_tests")

package(default_visibility = ["//visibility:public"])
Expand Down
2 changes: 1 addition & 1 deletion systems/controllers/plan_eval/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load(
"drake_cc_library",
"drake_cc_package_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("//tools/lint:lint.bzl", "add_lint_tests")

package(default_visibility = ["//visibility:public"])
Expand Down
2 changes: 1 addition & 1 deletion systems/controllers/qp_inverse_dynamics/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ load(
"@drake//tools/skylark:drake_proto.bzl",
"drake_cc_proto_library",
)
load("//tools/skylark:test_tags.bzl", "gurobi_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "gurobi_test_tags")

package(default_visibility = ["//visibility:public"])

Expand Down
2 changes: 1 addition & 1 deletion systems/estimators/dev/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load(
"drake_cc_test",
)
load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:test_tags.bzl", "mosek_test_tags")
load("@drake//tools/skylark:test_tags.bzl", "mosek_test_tags")

package(default_visibility = ["//visibility:public"])

Expand Down
5 changes: 4 additions & 1 deletion tools/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# -*- python -*-

load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:drake_runfiles_binary.bzl", "drake_runfiles_binary")
load(
"@drake//tools/skylark:drake_runfiles_binary.bzl",
"drake_runfiles_binary",
)

package(default_visibility = ["//visibility:public"])

Expand Down
2 changes: 1 addition & 1 deletion tools/install/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package(default_visibility = ["//visibility:public"])

load("//tools/lint:lint.bzl", "add_lint_tests")
load(
"//tools/skylark:drake_py.bzl",
"@drake//tools/skylark:drake_py.bzl",
"drake_py_test",
"drake_py_unittest",
)
Expand Down
2 changes: 1 addition & 1 deletion tools/lint/bazel_lint.bzl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- mode: python -*-
# vi: set ft=python :

load("//tools/skylark:drake_py.bzl", "py_test_isolated")
load("@drake//tools/skylark:drake_py.bzl", "py_test_isolated")

#------------------------------------------------------------------------------
# Internal helper; set up test given name and list of files. Will do nothing
Expand Down
2 changes: 1 addition & 1 deletion tools/lint/cpplint.bzl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- python -*-

load("//tools/skylark:drake_py.bzl", "py_test_isolated")
load("@drake//tools/skylark:drake_py.bzl", "py_test_isolated")

# From https://bazel.build/versions/master/docs/be/c-cpp.html#cc_library.srcs
_SOURCE_EXTENSIONS = [source_ext for source_ext in """
Expand Down
Loading

0 comments on commit 086e4cb

Please sign in to comment.