Merge pull request RobotLocomotion#7574 from jwnimmer-tri/6996-pybind

Make new pybind folder structure insensitive to Drake package names
hedaniel7 · Dec 7, 2017 · 7f23076 · 7f23076
2 parents 89fe87c + 3713863
commit 7f23076
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/drake/bindings/pydrake/BUILD.bazel b/drake/bindings/pydrake/BUILD.bazel
@@ -12,13 +12,16 @@ load(
     "drake_py_test",
 )
 load(
-    "//drake/bindings/pydrake:pybind.bzl",
+    "//tools/skylark:pybind.bzl",
     "drake_pybind_library",
     "get_drake_pybind_installs",
     "get_pybind_library_dest",
 )
+load("//tools/skylark:6996.bzl", "adjust_labels_for_drake_hoist")
 
-package(default_visibility = ["//drake/bindings/pydrake:__subpackages__"])
+package(default_visibility = adjust_labels_for_drake_hoist([
+    "//drake/bindings/pydrake:__subpackages__",
+]))
 
 # N.B. Any common headers should be shared via a HEADER ONLY library.
 
@@ -106,14 +109,14 @@ drake_pybind_library(
     py_srcs = ["symbolic.py"],
 )
 
-PYBIND_LIBRARIES = [
+PYBIND_LIBRARIES = adjust_labels_for_drake_hoist([
     ":autodiffutils_py",
     ":common_py",
     ":parsers_py",
     ":rbtree_py",
     ":symbolic_py",
     "//drake/bindings/pydrake/solvers",
-]
+])
 
 install(
     name = "install",

diff --git a/drake/bindings/pydrake/solvers/BUILD.bazel b/drake/bindings/pydrake/solvers/BUILD.bazel
@@ -5,7 +5,7 @@ load("//tools/lint:lint.bzl", "add_lint_tests")
 load("//tools/workspace/gurobi:gurobi.bzl", "gurobi_test_tags")
 load("//tools/workspace/mosek:mosek.bzl", "mosek_test_tags")
 load(
-    "//drake/bindings/pydrake:pybind.bzl",
+    "//tools/skylark:pybind.bzl",
     "drake_pybind_library",
     "get_drake_pybind_installs",
     "get_pybind_library_dest",
@@ -15,8 +15,11 @@ load(
     "drake_py_library",
     "drake_py_test",
 )
+load("//tools/skylark:6996.bzl", "adjust_labels_for_drake_hoist")
 
-package(default_visibility = ["//drake/bindings/pydrake:__subpackages__"])
+package(default_visibility = adjust_labels_for_drake_hoist([
+    "//drake/bindings/pydrake:__subpackages__",
+]))
 
 drake_py_library(
     name = "module_py",

diff --git a/drake/bindings/pydrake/pybind.bzl → tools/skylark/pybind.bzl b/drake/bindings/pydrake/pybind.bzl → tools/skylark/pybind.bzl
@@ -10,12 +10,16 @@ load(
     "//tools/skylark:drake_py.bzl",
     "drake_py_library",
 )
+load("//tools/skylark:6996.bzl", "adjust_label_for_drake_hoist")
 
 _PY_VERSION = "2.7"
 
 # This is the base package to determine which paths should be imported, and
 # where the Python components should be installed.
-_BASE_PACKAGE = "drake/bindings"
+#
+# TODO(jwnimmer-tri) Either make this path configurable, or else move this file
+# (pybind.bzl) back into the bindings folder directly.
+_BASE_PACKAGE = adjust_label_for_drake_hoist("//drake/bindings")[2:]
 
 # TODO(eric.cousineau): Consider making a `PybindProvider`, to sort
 # out dependencies, sources, etc, and simplify installation