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

Use aspect bazel lib expand template #90

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module(name = "rules_ros")

bazel_dep(name = "aspect_bazel_lib", version = "2.10.0")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "boost.any", version = "1.83.0.bcr.1")
bazel_dep(name = "boost.chrono", version = "1.83.0.bcr.1")
Expand Down
3 changes: 2 additions & 1 deletion examples/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module(name = "rules_ros_examples")

bazel_dep(name = "aspect_bazel_lib", version = "2.10.0")
bazel_dep(name = "rules_python", version = "0.38.0")
bazel_dep(name = "boost.any", version = "1.83.0")
bazel_dep(name = "boost.any", version = "1.83.0.bcr.1")
bazel_dep(name = "boost.smart_ptr", version = "1.83.0.bcr.1")
bazel_dep(name = "boost.thread", version = "1.83.0")

Expand Down
2 changes: 1 addition & 1 deletion examples/chatter/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- Defining a Bazel target for running ROS-topic introspection functionality.
"""

load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@rules_python//python:defs.bzl", "py_binary")
load("@rules_ros//ros:cc_defs.bzl", "cc_ros_binary")
load(
Expand All @@ -18,7 +19,6 @@ load(
load("@rules_ros//ros:launch.bzl", "ros_launch")
load("@rules_ros//ros:test.bzl", "ros_test")
load("@rules_ros//ros:topic.bzl", "ros_topic")
load("@rules_ros//third_party:expand_template.bzl", "expand_template")

# Handling of ROS messages & services resembles to some extent Bazel's rules for
# handling protobuf messages (e.g. proto_library and cc_proto_library).
Expand Down
2 changes: 1 addition & 1 deletion ros/launch.bzl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
""" Implements functionality for launching ROS deployments using roslaunch.
"""

load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@rules_python//python:defs.bzl", "py_binary")
load("//third_party:expand_template.bzl", "expand_template")

def ros_launch(name, nodes, launch_files, **kwargs):
""" Defines a ROS deployment.
Expand Down
4 changes: 2 additions & 2 deletions ros/repositories/orocos_kdl.BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
""" Builds orocos_kdl.
"""

load("@rules_cc//cc:defs.bzl", "cc_library")
load(
"@rules_ros//third_party:expand_template.bzl",
"@aspect_bazel_lib//lib:expand_template.bzl",
"expand_template",
)
load("@rules_cc//cc:defs.bzl", "cc_library")

cc_library(
name = "orocos_kdl",
Expand Down
5 changes: 1 addition & 4 deletions ros/repositories/ros_comm.BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
""" Builds ros_comm.
"""

load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@bazel_skylib//lib:dicts.bzl", "dicts")
load("@bazel_skylib//lib:selects.bzl", "selects")
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
Expand All @@ -17,10 +18,6 @@ load(
"py_ros_interface_library",
"ros_interface_library",
)
load(
"@rules_ros//third_party:expand_template.bzl",
"expand_template",
)
load("@rules_ros_pip_deps//:requirements.bzl", "requirement")

cc_library(
Expand Down
2 changes: 1 addition & 1 deletion ros/test.bzl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
""" Implements functionality for defining ROS tests using rostest.
"""

load("@aspect_bazel_lib//lib:expand_template.bzl", "expand_template")
load("@rules_python//python:defs.bzl", "py_test")
load("//third_party:expand_template.bzl", "expand_template")

def ros_test(name, nodes, launch_file, deps = [], **kwargs):
""" Defines a ROS test.
Expand Down
47 changes: 0 additions & 47 deletions third_party/expand_template.bzl

This file was deleted.