From d3339d17bb41bd1be44743276f59830cd2f816df Mon Sep 17 00:00:00 2001 From: Matthew Woehlke Date: Tue, 1 Aug 2017 10:37:56 -0400 Subject: [PATCH] Work around possible Bazel providers bug Apparently in newer versions of Bazel (starting with 0.5? As of 0.5.3 at least...), Bazel doesn't recognize that a provider is the same entity if one BUILD loads the .bzl file that declares the provider with a workspace-qualified name, and another omits the workspace qualification. Since these are the same .bzl, this feels suspiciously like a Bazel bug. Anyway, work around the issue by always using the workspace-qualified path. This should get `bazel build install` working again with Bazel 0.5.3. --- BUILD.bazel | 2 +- drake/BUILD | 2 +- drake/bindings/BUILD | 2 +- drake/common/BUILD | 2 +- drake/lcmtypes/BUILD | 2 +- tools/BUILD | 2 +- tools/install/gflags/BUILD | 7 ++++++- tools/install/jchart2d/BUILD | 7 ++++++- tools/install/optitrack_driver/BUILD | 7 ++++++- tools/install/protobuf/BUILD | 7 ++++++- 10 files changed, 30 insertions(+), 10 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 9378e690db9f..498be59b2a6e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -5,7 +5,7 @@ # OSX it won't conflict with a build artifacts directory named "build". load("//tools:check_licenses.bzl", "check_licenses") -load("//tools:install.bzl", "install", "install_files") +load("@drake//tools:install.bzl", "install", "install_files") load("//tools:lint.bzl", "add_lint_tests") package( diff --git a/drake/BUILD b/drake/BUILD index f1bfd878ea2f..ad55866e0e2f 100644 --- a/drake/BUILD +++ b/drake/BUILD @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:install.bzl", "install") +load("@drake//tools:install.bzl", "install") load("//tools:lint.bzl", "add_lint_tests") load("//tools:transitive_hdrs.bzl", "transitive_hdrs_library") diff --git a/drake/bindings/BUILD b/drake/bindings/BUILD index 638e34a78196..6ad8a920eec0 100644 --- a/drake/bindings/BUILD +++ b/drake/bindings/BUILD @@ -2,7 +2,7 @@ # This file contains rules for Bazel; see drake/doc/bazel.rst. load("//tools:gurobi.bzl", "gurobi_test_tags") -load("//tools:install.bzl", "install") +load("@drake//tools:install.bzl", "install") load("//tools:lint.bzl", "add_lint_tests") load("//tools:mosek.bzl", "mosek_test_tags") load(":pybind.bzl", "drake_pybind_cc_binary") diff --git a/drake/common/BUILD b/drake/common/BUILD index ec599ad69812..a792e1098b47 100644 --- a/drake/common/BUILD +++ b/drake/common/BUILD @@ -7,7 +7,7 @@ load( "drake_cc_googletest", "drake_cc_library", ) -load("//tools:install.bzl", "install") +load("@drake//tools:install.bzl", "install") load("//tools:lint.bzl", "add_lint_tests") package(default_visibility = ["//visibility:public"]) diff --git a/drake/lcmtypes/BUILD b/drake/lcmtypes/BUILD index 51f9b70bd4ff..e8c216553562 100644 --- a/drake/lcmtypes/BUILD +++ b/drake/lcmtypes/BUILD @@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"]) -load("//tools:install.bzl", "install") +load("@drake//tools:install.bzl", "install") load("//tools:lcm.bzl", "lcm_cc_library", "lcm_py_library", "lcm_java_library") load("//tools:lint.bzl", "add_lint_tests") diff --git a/tools/BUILD b/tools/BUILD index 07f797f64eb5..c6c50dedcb56 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -1,7 +1,7 @@ # -*- python -*- load( - "//tools:install.bzl", + "@drake//tools:install.bzl", "cmake_config", "exports_create_cps_scripts", "install_cmake_config", diff --git a/tools/install/gflags/BUILD b/tools/install/gflags/BUILD index 535395b10c64..9bc372982627 100644 --- a/tools/install/gflags/BUILD +++ b/tools/install/gflags/BUILD @@ -1,6 +1,11 @@ # -*- python -*- -load("//tools:install.bzl", "cmake_config", "install", "install_cmake_config") +load( + "@drake//tools:install.bzl", + "cmake_config", + "install", + "install_cmake_config", +) load("//tools:lint.bzl", "add_lint_tests") package(default_visibility = ["//visibility:public"]) diff --git a/tools/install/jchart2d/BUILD b/tools/install/jchart2d/BUILD index 5c13ef522999..720b759394b4 100644 --- a/tools/install/jchart2d/BUILD +++ b/tools/install/jchart2d/BUILD @@ -1,6 +1,11 @@ # -*- python -*- -load("//tools:install.bzl", "cmake_config", "install", "install_cmake_config") +load( + "@drake//tools:install.bzl", + "cmake_config", + "install", + "install_cmake_config", +) load("//tools:lint.bzl", "add_lint_tests") package(default_visibility = ["//visibility:public"]) diff --git a/tools/install/optitrack_driver/BUILD b/tools/install/optitrack_driver/BUILD index af0d24a07c02..8a401d018826 100644 --- a/tools/install/optitrack_driver/BUILD +++ b/tools/install/optitrack_driver/BUILD @@ -1,6 +1,11 @@ # -*- python -*- -load("//tools:install.bzl", "cmake_config", "install", "install_cmake_config") +load( + "@drake//tools:install.bzl", + "cmake_config", + "install", + "install_cmake_config", +) load("//tools:lint.bzl", "add_lint_tests") package(default_visibility = ["//visibility:public"]) diff --git a/tools/install/protobuf/BUILD b/tools/install/protobuf/BUILD index 774826c7beab..23d21f3db782 100644 --- a/tools/install/protobuf/BUILD +++ b/tools/install/protobuf/BUILD @@ -1,6 +1,11 @@ # -*- python -*- -load("//tools:install.bzl", "cmake_config", "install", "install_cmake_config") +load( + "@drake//tools:install.bzl", + "cmake_config", + "install", + "install_cmake_config", +) load("//tools:lint.bzl", "add_lint_tests") package(default_visibility = ["//visibility:public"])