Fix --incompatible_disallow_empty_glob=true for Bazel 8 (#375)

RobotLocomotion · Jan 17, 2025 · b6fba61 · b6fba61
1 parent 7f47134
commit b6fba61
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/bazel_ros2_rules/ros2/resources/templates/package_cc_library.bazel.tpl b/bazel_ros2_rules/ros2/resources/templates/package_cc_library.bazel.tpl
@@ -1,7 +1,7 @@
 cc_library(
     name = @name@,
     srcs = @srcs@,
-    hdrs = glob(["{}/**/*.h*".format(x) for x in @headers@]),
+    hdrs = glob(["{}/**/*.h*".format(x) for x in @headers@], allow_empty = True),
     includes = @includes@,
     copts = @copts@,
     defines = @defines@,

diff --git a/bazel_ros2_rules/ros2/resources/templates/package_py_library.bazel.tpl b/bazel_ros2_rules/ros2/resources/templates/package_py_library.bazel.tpl
@@ -1,13 +1,14 @@
 py_library(
     name = @name@,
-    srcs = glob(["{}/**/*.py".format(x) for x in @tops@]),
+    srcs = glob(["{}/**/*.py".format(x) for x in @tops@], allow_empty = True),
     data = glob(
        include=[
          "{}/**/*.*".format(x) for x in @tops@
        ] + [
          "{}/*".format(x) for x in @eggs@
        ],
        exclude=["**/*.py", "**/*.so"],
+       allow_empty = True,
     ) + @data@,
     imports = @imports@,
     deps = @deps@,

diff --git a/bazel_ros2_rules/ros2/resources/templates/package_py_library_with_cc_libs.bazel.tpl b/bazel_ros2_rules/ros2/resources/templates/package_py_library_with_cc_libs.bazel.tpl
@@ -7,14 +7,15 @@ cc_library(
 
 py_library(
     name = @name@,
-    srcs = glob(["{}/**/*.py".format(x) for x in @tops@]),
+    srcs = glob(["{}/**/*.py".format(x) for x in @tops@], allow_empty = True),
     data = glob(
        include=[
          "{}/**/*.*".format(x) for x in @tops@
        ] + [
          "{}/*".format(x) for x in @eggs@
        ],
        exclude=["**/*.py", "**/*.so"],
+       allow_empty = True,
     ) + @data@,
     imports = @imports@,
     deps = @deps@,

diff --git a/bazel_ros2_rules/ros2/tools/common.bzl b/bazel_ros2_rules/ros2/tools/common.bzl
@@ -17,6 +17,7 @@ def share_filegroup(name, share_directories):
                 "*/*.bash",
                 "*/*.dsv",
             ],
+            allow_empty = True,
         ) if " " not in path],
         # NOTE(hidmic): workaround lack of support for spaces.
         # See https://github.com/bazelbuild/bazel/issues/4327.
@@ -30,7 +31,7 @@ def interfaces_filegroup(name, share_directory):
             "{}/**/*.msg".format(share_directory),
             "{}/**/*.srv".format(share_directory),
             "{}/**/*.action".format(share_directory),
-        ]),
+        ], allow_empty = True),
     )
 
 def incorporate_rmw_implementation(kwargs, env_changes, rmw_implementation):