HAND FIX - Fixup bazel files

This commit is contained in:
PJ Reiniger
2025-11-07 19:56:21 -05:00
committed by Peter Johnson
parent 7c6efa41ae
commit 6b69aab44e
31 changed files with 95 additions and 90 deletions

View File

@@ -7,16 +7,16 @@ load("//wpilibjExamples:example_projects.bzl", "COMMANDS_V2_FOLDERS", "EXAMPLES_
def _package_type(package_type):
pkg_files(
name = package_type + "-pkg",
srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/" + package_type + "/**"]),
strip_prefix = "src/main/java/edu/wpi/first/wpilibj",
srcs = native.glob(["src/main/java/org/wpilib/" + package_type + "/**"]),
strip_prefix = "src/main/java/org/wpilib",
)
pkgs = ["//:license_pkg_files", ":" + package_type + "-pkg"]
if package_type == "examples":
pkg_files(
name = package_type + "-tests-pkg",
srcs = native.glob(["src/test/java/edu/wpi/first/wpilibj/" + package_type + "/**"]),
strip_prefix = "src/test/java/edu/wpi/first/wpilibj/" + package_type,
srcs = native.glob(["src/test/java/org/wpilib/" + package_type + "/**"]),
strip_prefix = "src/test/java/org/wpilib/" + package_type,
prefix = "examples_test",
)
pkgs.append(package_type + "-tests-pkg")
@@ -33,8 +33,8 @@ def build_examples(halsim_deps):
for folder in EXAMPLES_FOLDERS:
java_binary(
name = folder + "-example",
srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/examples/" + folder + "/**/*.java"]),
main_class = "edu/wpi/first/wpilibj/examples/" + folder + "/Main",
srcs = native.glob(["src/main/java/org/wpilib/examples/" + folder + "/**/*.java"]),
main_class = "org/wpilib/examples/" + folder + "/Main",
plugins = [
"//epilogue-processor:plugin",
],
@@ -63,7 +63,7 @@ def build_commands():
for folder in COMMANDS_V2_FOLDERS:
java_library(
name = folder + "-command",
srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/commands/" + folder + "/**/*.java"]),
srcs = native.glob(["src/main/java/org/wpilib/commands/" + folder + "/**/*.java"]),
deps = [
"//hal:hal-java",
"//wpilibj:wpilibj-java",
@@ -79,7 +79,7 @@ def build_snippets():
for folder in SNIPPETS_FOLDERS:
java_library(
name = folder + "-snippet",
srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/snippets/" + folder + "/**/*.java"]),
srcs = native.glob(["src/main/java/org/wpilib/snippets/" + folder + "/**/*.java"]),
deps = [
"//hal:hal-java",
"//wpilibj:wpilibj-java",
@@ -94,7 +94,7 @@ def build_templates():
for folder in TEMPLATES_FOLDERS:
java_library(
name = folder + "-template",
srcs = native.glob(["src/main/java/edu/wpi/first/wpilibj/templates/" + folder + "/**/*.java"]),
srcs = native.glob(["src/main/java/org/wpilib/templates/" + folder + "/**/*.java"]),
deps = [
"//hal:hal-java",
"//wpilibj:wpilibj-java",
@@ -110,7 +110,7 @@ def build_tests():
for folder in TEST_FOLDERS:
wpilib_java_junit5_test(
name = folder + "-test",
srcs = native.glob(["src/test/java/edu/wpi/first/wpilibj/examples/" + folder + "/**/*.java"]),
srcs = native.glob(["src/test/java/org/wpilib/examples/" + folder + "/**/*.java"]),
deps = [
":" + folder + "-example",
"//hal:hal-java",