Skip to content

Commit

Permalink
Merge branch 'main' into bump-roscpp-core
Browse files Browse the repository at this point in the history
  • Loading branch information
hofbi authored Feb 5, 2025
2 parents ca1f0bc + fc462fe commit 8ca11dd
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 58 deletions.
3 changes: 2 additions & 1 deletion 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 All @@ -22,7 +23,7 @@ bazel_dep(name = "gflags", version = "2.2.2")
bazel_dep(name = "glog", version = "0.7.1")
bazel_dep(name = "googletest", version = "1.15.2")
bazel_dep(name = "lz4", version = "1.9.4")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "rules_cc", version = "0.1.0")
bazel_dep(name = "rules_foreign_cc", version = "0.13.0")
bazel_dep(name = "rules_python", version = "1.1.0")
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.

0 comments on commit 8ca11dd

Please sign in to comment.