Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix //drake label names in examples/... #8017

Merged
merged 22 commits into from
Feb 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
09f4e69
Fix //drake label names in examples
jwnimmer-tri Feb 9, 2018
984df04
Fix //drake label names in examples/acrobot
jwnimmer-tri Feb 9, 2018
0e14266
Fix //drake label names in examples/atlas
jwnimmer-tri Feb 9, 2018
b2bebd3
Fix //drake label names in examples/bead_on_a_wire
jwnimmer-tri Feb 9, 2018
03abce4
Fix //drake label names in examples/bouncing_ball
jwnimmer-tri Feb 9, 2018
65d3882
Fix //drake label names in examples/contact_model
jwnimmer-tri Feb 9, 2018
5b91262
Fix //drake label names in examples/cubic_polynomial
jwnimmer-tri Feb 9, 2018
e548b00
Fix //drake label names in examples/double_pendulum
jwnimmer-tri Feb 9, 2018
b781e2a
Fix //drake label names in examples/geometry_world
jwnimmer-tri Feb 9, 2018
e622454
Fix //drake label names in examples/humanoid_controller/...
jwnimmer-tri Feb 9, 2018
8648939
Fix //drake label names in examples/kinova_jaco_arm
jwnimmer-tri Feb 9, 2018
91fd267
Fix //drake label names in examples/multibody/...
jwnimmer-tri Feb 9, 2018
369598d
Fix //drake label names in examples/particles
jwnimmer-tri Feb 9, 2018
0ac38dc
Fix //drake label names in examples/pendulum
jwnimmer-tri Feb 9, 2018
4dda1b2
Fix //drake label names in examples/pr2
jwnimmer-tri Feb 9, 2018
71070f4
Fix //drake label names in examples/qp_inverse_dynamics
jwnimmer-tri Feb 9, 2018
d5189c7
Fix //drake label names in examples/quadrotor
jwnimmer-tri Feb 9, 2018
3305c6e
Fix //drake label names in examples/rod2d
jwnimmer-tri Feb 9, 2018
d516d9e
Fix //drake label names in examples/schunk_wsg
jwnimmer-tri Feb 9, 2018
6b76f50
Fix //drake label names in examples/valkyrie
jwnimmer-tri Feb 9, 2018
4a58f46
Fix //drake label names in examples/van_der_pol
jwnimmer-tri Feb 9, 2018
13d4f8d
Fix //drake label names in examples/zmp
jwnimmer-tri Feb 9, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions examples/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

load("//tools:drake.bzl", "drake_cc_binary")
load("//tools/lint:lint.bzl", "add_lint_tests")
load("//tools/skylark:6996.bzl", "adjust_labels_for_drake_hoist")
load("@drake//tools/install:install.bzl", "install")

drake_cc_binary(
name = "simple_continuous_time_system",
srcs = ["simple_continuous_time_system.cc"],
add_test_rule = 1,
deps = [
"//drake/systems/analysis:simulator",
"//drake/systems/framework:vector_system",
"//systems/analysis:simulator",
"//systems/framework:vector_system",
],
)

Expand All @@ -20,8 +19,8 @@ drake_cc_binary(
srcs = ["simple_discrete_time_system.cc"],
add_test_rule = 1,
deps = [
"//drake/systems/analysis:simulator",
"//drake/systems/framework:vector_system",
"//systems/analysis:simulator",
"//systems/framework:vector_system",
],
)

Expand All @@ -30,28 +29,28 @@ drake_cc_binary(
srcs = ["simple_mixed_continuous_and_discrete_time_system.cc"],
add_test_rule = 1,
deps = [
"//drake/systems/analysis:simulator",
"//drake/systems/framework:leaf_system",
"//systems/analysis:simulator",
"//systems/framework:leaf_system",
],
)

# The :prod_models in these packages are installed as part of the Drake release
# process, and loaded into drake_visualizer's model database by default.
INSTALLED_MODEL_PACKAGES = adjust_labels_for_drake_hoist([
"//drake/examples/acrobot",
"//drake/examples/atlas",
"//drake/examples/contact_model",
"//drake/examples/double_pendulum",
"//drake/examples/irb140",
"//drake/examples/kuka_iiwa_arm",
"//drake/examples/particles",
"//drake/examples/pendulum",
"//drake/examples/pr2",
"//drake/examples/quadrotor",
"//drake/examples/simple_four_bar",
"//drake/examples/valkyrie",
"//drake/examples/zmp",
])
INSTALLED_MODEL_PACKAGES = [
"//examples/acrobot",
"//examples/atlas",
"//examples/contact_model",
"//examples/double_pendulum",
"//examples/irb140",
"//examples/kuka_iiwa_arm",
"//examples/particles",
"//examples/pendulum",
"//examples/pr2",
"//examples/quadrotor",
"//examples/simple_four_bar",
"//examples/valkyrie",
"//examples/zmp",
]

filegroup(
name = "prod_models",
Expand All @@ -61,9 +60,9 @@ filegroup(

# TODO(jwnimmer-tri): Figure out which examples needs to be installed (see
# issues #4224 and #1766).
INSTALLED_EXAMPLES = adjust_labels_for_drake_hoist([
"//drake/examples/kuka_iiwa_arm",
])
INSTALLED_EXAMPLES = [
"//examples/kuka_iiwa_arm",
]

install(
name = "install",
Expand Down
144 changes: 72 additions & 72 deletions examples/acrobot/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ drake_cc_library(
hdrs = ["acrobot_lcm.h"],
deps = [
":acrobot_state_vector",
"//drake/lcmtypes:acrobot",
"//drake/systems/framework:leaf_system",
"//drake/systems/framework:vector",
"//lcmtypes:acrobot",
"//systems/framework:leaf_system",
"//systems/framework:vector",
],
)

Expand All @@ -36,10 +36,10 @@ drake_cc_library(
hdrs = ["acrobot_plant.h"],
deps = [
":acrobot_state_vector",
"//drake/common:default_scalars",
"//drake/systems/controllers:linear_quadratic_regulator",
"//drake/systems/framework",
"//drake/systems/sensors:rotary_encoders",
"//common:default_scalars",
"//systems/controllers:linear_quadratic_regulator",
"//systems/framework",
"//systems/sensors:rotary_encoders",
],
)

Expand All @@ -51,9 +51,9 @@ drake_cc_binary(
testonly = 1,
srcs = ["test/acrobot_lcm_msg_generator.cc"],
deps = [
"//drake/lcm",
"//drake/lcmtypes:acrobot",
"//drake/systems/analysis:simulator",
"//lcm",
"//lcmtypes:acrobot",
"//systems/analysis:simulator",
],
)

Expand All @@ -65,12 +65,12 @@ drake_cc_binary(
test_rule_args = ["-realtime_factor=0.0"],
deps = [
":acrobot_plant",
"//drake/common:find_resource",
"//drake/lcm",
"//drake/multibody:rigid_body_tree",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis:simulator",
"//common:find_resource",
"//lcm",
"//multibody:rigid_body_tree",
"//multibody/parsers",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis:simulator",
"@gflags",
],
)
Expand All @@ -84,19 +84,19 @@ drake_cc_binary(
test_rule_args = ["-realtime_factor=0.0"],
deps = [
":acrobot_plant",
"//drake/common:find_resource",
"//drake/common/proto:call_matlab",
"//drake/lcm",
"//drake/multibody:rigid_body_tree",
"//drake/multibody/joints",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis:simulator",
"//drake/systems/estimators:kalman_filter",
"//drake/systems/framework:diagram",
"//drake/systems/primitives:linear_system",
"//drake/systems/primitives:signal_logger",
"//drake/systems/sensors:rotary_encoders",
"//common:find_resource",
"//common/proto:call_matlab",
"//lcm",
"//multibody:rigid_body_tree",
"//multibody/joints",
"//multibody/parsers",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis:simulator",
"//systems/estimators:kalman_filter",
"//systems/framework:diagram",
"//systems/primitives:linear_system",
"//systems/primitives:signal_logger",
"//systems/sensors:rotary_encoders",
"@gflags",
],
)
Expand All @@ -109,14 +109,14 @@ drake_cc_binary(
test_rule_args = ["-realtime_factor=0.0"],
deps = [
":acrobot_plant",
"//drake/common:find_resource",
"//drake/lcm",
"//drake/multibody:rigid_body_tree",
"//drake/multibody/joints",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis:simulator",
"//drake/systems/framework:diagram",
"//common:find_resource",
"//lcm",
"//multibody:rigid_body_tree",
"//multibody/joints",
"//multibody/parsers",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis:simulator",
"//systems/framework:diagram",
"@gflags",
],
)
Expand All @@ -130,14 +130,14 @@ drake_cc_binary(
data = [":models"],
deps = [
":acrobot_plant",
"//drake/common:find_resource",
"//drake/lcm",
"//drake/multibody:rigid_body_tree",
"//drake/multibody/joints",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis",
"//drake/systems/controllers:linear_quadratic_regulator",
"//common:find_resource",
"//lcm",
"//multibody:rigid_body_tree",
"//multibody/joints",
"//multibody/parsers",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis",
"//systems/controllers:linear_quadratic_regulator",
"@gflags",
],
)
Expand All @@ -150,16 +150,16 @@ drake_cc_binary(
test_rule_args = ["-realtime_factor=0.0"],
deps = [
":acrobot_plant",
"//drake/common:find_resource",
"//drake/lcm",
"//drake/multibody:rigid_body_tree",
"//drake/multibody/joints",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis",
"//drake/systems/controllers:linear_quadratic_regulator",
"//drake/systems/primitives:trajectory_source",
"//drake/systems/trajectory_optimization:direct_collocation",
"//common:find_resource",
"//lcm",
"//multibody:rigid_body_tree",
"//multibody/joints",
"//multibody/parsers",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis",
"//systems/controllers:linear_quadratic_regulator",
"//systems/primitives:trajectory_source",
"//systems/trajectory_optimization:direct_collocation",
"@gflags",
],
)
Expand All @@ -173,11 +173,11 @@ drake_cc_binary(
deps = [
":acrobot_lcm",
":acrobot_plant",
"//drake/lcm",
"//drake/multibody:rigid_body_tree",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis",
"//drake/systems/controllers:linear_quadratic_regulator",
"//lcm",
"//multibody:rigid_body_tree",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis",
"//systems/controllers:linear_quadratic_regulator",
],
)

Expand All @@ -188,13 +188,13 @@ drake_cc_binary(
deps = [
":acrobot_lcm",
":acrobot_plant",
"//drake/common:find_resource",
"//drake/lcm",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant",
"//drake/multibody/rigid_body_plant:drake_visualizer",
"//drake/systems/analysis",
"//drake/systems/controllers:linear_quadratic_regulator",
"//common:find_resource",
"//lcm",
"//multibody/parsers",
"//multibody/rigid_body_plant",
"//multibody/rigid_body_plant:drake_visualizer",
"//systems/analysis",
"//systems/controllers:linear_quadratic_regulator",
"@gflags",
],
)
Expand All @@ -204,11 +204,11 @@ drake_cc_googletest(
data = [":models"],
deps = [
":acrobot_plant",
"//drake/common:find_resource",
"//drake/common/test_utilities:eigen_matrix_compare",
"//drake/multibody/joints",
"//drake/multibody/parsers",
"//drake/multibody/rigid_body_plant",
"//common:find_resource",
"//common/test_utilities:eigen_matrix_compare",
"//multibody/joints",
"//multibody/parsers",
"//multibody/rigid_body_plant",
],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/atlas/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ drake_cc_library(
srcs = ["atlasUtil.cpp"],
hdrs = ["atlasUtil.h"],
deps = [
"//drake/common:essential",
"//common:essential",
],
)

Expand Down
6 changes: 3 additions & 3 deletions examples/bead_on_a_wire/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ drake_cc_library(
"bead_on_a_wire-inl.h",
],
deps = [
"//drake/common:essential",
"//drake/systems/framework:leaf_system",
"//common:essential",
"//systems/framework:leaf_system",
],
)

Expand All @@ -24,7 +24,7 @@ drake_cc_googletest(
name = "bead_on_a_wire_test",
deps = [
":bead_on_a_wire",
"//drake/systems/analysis",
"//systems/analysis",
],
)

Expand Down
12 changes: 6 additions & 6 deletions examples/bouncing_ball/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ drake_cc_library(
"ball-inl.h",
],
deps = [
"//drake/common:default_scalars",
"//drake/common:essential",
"//drake/systems/framework:leaf_system",
"//common:default_scalars",
"//common:essential",
"//systems/framework:leaf_system",
],
)

Expand All @@ -28,8 +28,8 @@ drake_cc_library(
],
deps = [
":ball",
"//drake/common:default_scalars",
"//drake/common:essential",
"//common:default_scalars",
"//common:essential",
],
)

Expand All @@ -46,7 +46,7 @@ drake_cc_googletest(
name = "bouncing_ball_test",
deps = [
":bouncing_ball",
"//drake/systems/analysis",
"//systems/analysis",
],
)

Expand Down
Loading