Add drake_{lcm,proto}.bzl in tools/skylark

drake/common/proto/BUILD.bazel

@@ -6,12 +6,15 @@ load(
  "drake_cc_googletest",
  "drake_cc_library",
 )
+load(
+ "@drake//tools/skylark:drake_proto.bzl",
+ "drake_cc_proto_library",
+)
 load("//tools/lint:lint.bzl", "add_lint_tests")
-load("@protobuf//:protobuf.bzl", "cc_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
-cc_proto_library(
+drake_cc_proto_library(
  name = "matlab_rpc",
  srcs = [
  "matlab_rpc.proto",

drake/lcmtypes/BUILD.bazel

@@ -13,14 +13,14 @@ load(
  "drake_py_test",
 )
 load(
- "//tools/workspace/lcm:lcm.bzl",
- "lcm_cc_library",
- "lcm_py_library",
- "lcm_java_library",
+ "//tools/skylark:drake_lcm.bzl",
+ "drake_lcm_cc_library",
+ "drake_lcm_java_library",
+ "drake_lcm_py_library",
 )
 load("//tools/lint:lint.bzl", "add_lint_tests")
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "acrobot",
  lcm_package = "drake",
  lcm_srcs = [
@@ -30,117 +30,117 @@ lcm_cc_library(
  ],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "body_acceleration",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_body_acceleration.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "body_motion_data",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_body_motion_data.lcm"],
  deps = [":piecewise_polynomial"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "body_wrench_data",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_body_wrench_data.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "constrained_values",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_constrained_values.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "contact_info_for_viz",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_contact_info_for_viz.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "contact_results_for_viz",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_contact_results_for_viz.lcm"],
  deps = [":contact_info_for_viz"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "contact_information",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_contact_information.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "desired_body_motion",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_desired_body_motion.lcm"],
  deps = [":constrained_values"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "desired_centroidal_momentum_dot",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_desired_centroidal_momentum_dot.lcm"],
  deps = [":constrained_values"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "desired_dof_motions",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_desired_dof_motions.lcm"],
  deps = [":constrained_values"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "inverse_dynamics_debug_info",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_inverse_dynamics_debug_info.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "joint_pd_override",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_joint_pd_override.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "manipulator_plan_move_end_effector",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_manipulator_plan_move_end_effector.lcm"],
  deps = ["@lcmtypes_bot2_core"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "piecewise_polynomial",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_piecewise_polynomial.lcm"],
  deps = [":polynomial_matrix"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "polynomial",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_polynomial.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "plan_eval_debug_info",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_plan_eval_debug_info.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "polynomial_matrix",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_polynomial_matrix.lcm"],
  deps = [":polynomial"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "qp_controller_input",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_qp_controller_input.lcm"],
@@ -154,7 +154,7 @@ lcm_cc_library(
  ],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "qp_input",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_qp_input.lcm"],
@@ -166,43 +166,43 @@ lcm_cc_library(
  ],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "resolved_contact",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_resolved_contact.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "support_data",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_support_data.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "whole_body_data",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_whole_body_data.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "zmp_data",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_zmp_data.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "zmp_com_observer_state",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_zmp_com_observer_state.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "drake_signal",
  lcm_package = "drake",
  lcm_srcs = ["lcmt_drake_signal.lcm"],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "viewer",
  lcm_package = "drake",
  lcm_srcs = [
@@ -214,7 +214,7 @@ lcm_cc_library(
  ],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "automotive",
  lcm_package = "drake",
  lcm_srcs = [
@@ -234,7 +234,7 @@ lcm_cc_library(
  ],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "iiwa",
  lcm_package = "drake",
  lcm_srcs = [
@@ -243,7 +243,7 @@ lcm_cc_library(
  ],
 )
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "schunk",
  lcm_package = "drake",
  lcm_srcs = [
@@ -254,7 +254,7 @@ lcm_cc_library(
 
 # TODO(jwnimmer-tri) Many more C++ messages are missing ...
 
-lcm_py_library(
+drake_lcm_py_library(
  name = "lcmtypes_py",
  lcm_package = "drake",
  lcm_srcs = glob(["*.lcm"]),
@@ -263,7 +263,7 @@ lcm_py_library(
  ],
 )
 
-lcm_java_library(
+drake_lcm_java_library(
  name = "lcmtypes_drake_java",
  lcm_package = "drake",
  lcm_srcs = glob(["*.lcm"]),

drake/multibody/BUILD.bazel

@@ -8,9 +8,12 @@ load(
  "drake_cc_library",
  "drake_cc_test",
 )
+load(
+ "@drake//tools/skylark:drake_proto.bzl",
+ "drake_cc_proto_library",
+)
 load("//tools/workspace/gurobi:gurobi.bzl", "gurobi_test_tags")
 load("//tools/lint:lint.bzl", "add_lint_tests")
-load("@protobuf//:protobuf.bzl", "cc_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -276,7 +279,7 @@ drake_cc_library(
  ],
 )
 
-cc_proto_library(
+drake_cc_proto_library(
  name = "rigid_body_tree_alias_groups_proto",
  srcs = [
  "alias_groups.proto",

drake/systems/controllers/qp_inverse_dynamics/BUILD.bazel

@@ -3,8 +3,11 @@
 
 load("//tools/lint:lint.bzl", "add_lint_tests")
 load("//tools:drake.bzl", "drake_cc_googletest", "drake_cc_library")
+load(
+ "@drake//tools/skylark:drake_proto.bzl",
+ "drake_cc_proto_library",
+)
 load("//tools/workspace/gurobi:gurobi.bzl", "gurobi_test_tags")
-load("@protobuf//:protobuf.bzl", "cc_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -16,7 +19,7 @@ exports_files(
  ["test/iiwa.id_controller_config"],
 )
 
-cc_proto_library(
+drake_cc_proto_library(
  name = "id_controller_config",
  srcs = [
  "id_controller_config.proto",

drake/tools/BUILD.bazel

@@ -3,7 +3,6 @@
 
 package(default_visibility = ["//visibility:public"])
 
-load("@protobuf//:protobuf.bzl", "py_proto_library")
 load(
  "//tools:drake.bzl",
  "drake_cc_googletest",
@@ -15,10 +14,17 @@ load(
  "drake_py_library",
  "drake_py_test",
 )
-load("//tools/workspace/lcm:lcm.bzl", "lcm_cc_library")
+load(
+ "@drake//tools/skylark:drake_lcm.bzl",
+ "drake_lcm_cc_library",
+)
+load(
+ "@drake//tools/skylark:drake_proto.bzl",
+ "drake_py_proto_library",
+)
 load("//tools/lint:lint.bzl", "add_lint_tests")
 
-py_proto_library(
+drake_py_proto_library(
  name = "named_vector",
  srcs = ["named_vector.proto"],
 )
@@ -36,7 +42,7 @@ drake_py_binary(
 
 # === test/ ===
 
-lcm_cc_library(
+drake_lcm_cc_library(
  name = "lcmt_sample",
  testonly = 1,
  includes = ["test/gen"],

tools/lint/cpplint.bzl

@@ -99,8 +99,8 @@ def cpplint(existing_rules = None, data = None, extra_srcs = None):
  existing_rules = native.existing_rules().values()
 
  for rule in existing_rules:
- if rule.get("generator_function") == "lcm_cc_library":
- # Do not lint generated code.
+ if "nolint" in rule.get("tags"):
+ # Disable linting when requested (e.g., for generated code).
  continue
 
  # Extract the list of C++ source code labels and convert to filenames.

tools/lint/python_lint.bzl

@@ -50,10 +50,8 @@ def python_lint(existing_rules = None, ignore = None, exclude = None,
  if existing_rules == None:
  existing_rules = native.existing_rules().values()
  for rule in existing_rules:
- # Do not lint generated code.
- if rule.get("generator_function") in [
- "py_proto_library",
- "lcm_py_library"]:
+ # Disable linting when requested (e.g., for generated code).
+ if "nolint" in rule.get("tags"):
  continue
 
  # Extract the list of python sources.