From ad138270a8fc9aaea602cfbf9b411a45592c219a Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Fri, 7 Nov 2025 20:00:37 -0500
Subject: [PATCH] HAND FIXES: Update build scripts for namespaces

---
 apriltag/BUILD.bazel    | 2 +-
 apriltag/CMakeLists.txt | 2 +-
 apriltag/build.gradle   | 2 +-
 fields/BUILD.bazel      | 2 +-
 fields/CMakeLists.txt   | 2 +-
 fields/build.gradle     | 2 +-
 glass/BUILD.bazel       | 2 +-
 glass/CMakeLists.txt    | 2 +-
 glass/build.gradle      | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apriltag/BUILD.bazel b/apriltag/BUILD.bazel
index 5390f266b1..b0d3c1e19a 100644
--- a/apriltag/BUILD.bazel
+++ b/apriltag/BUILD.bazel
@@ -55,7 +55,7 @@ cc_library(
 
 generate_resources(
     name = "generate-resources",
-    namespace = "frc",
+    namespace = "wpi::apriltag",
     prefix = "APRILTAG",
     resource_files = glob(["src/main/native/resources/**"]),
 )
diff --git a/apriltag/CMakeLists.txt b/apriltag/CMakeLists.txt
index bbafaebf71..223d055bb1 100644
--- a/apriltag/CMakeLists.txt
+++ b/apriltag/CMakeLists.txt
@@ -110,7 +110,7 @@ generate_resources(
     src/main/native/resources/org/wpilib/vision/apriltag
     generated/main/cpp
     APRILTAG
-    frc
+    wpi::apriltag
     apriltag_resources_src
 )
 
diff --git a/apriltag/build.gradle b/apriltag/build.gradle
index b6322f7360..909bf1df74 100644
--- a/apriltag/build.gradle
+++ b/apriltag/build.gradle
@@ -12,7 +12,7 @@ ext {
         apriltagTest: []]
     staticCvConfigs = []
 
-    def generateTask = createGenerateResourcesTask('main', 'APRILTAG', 'frc', project)
+    def generateTask = createGenerateResourcesTask('main', 'APRILTAG', 'wpi::apriltag', project)
 
     tasks.withType(CppCompile) {
         dependsOn generateTask
diff --git a/fields/BUILD.bazel b/fields/BUILD.bazel
index b99c66c8e0..3531ee8491 100644
--- a/fields/BUILD.bazel
+++ b/fields/BUILD.bazel
@@ -6,7 +6,7 @@ load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources")
 
 generate_resources(
     name = "generate-resources",
-    namespace = "fields",
+    namespace = "wpi::fields",
     prefix = "FIELDS",
     resource_files = glob(["src/main/native/resources/**"]),
 )
diff --git a/fields/CMakeLists.txt b/fields/CMakeLists.txt
index 39e170903e..7ecf62e5ac 100644
--- a/fields/CMakeLists.txt
+++ b/fields/CMakeLists.txt
@@ -34,7 +34,7 @@ generate_resources(
     src/main/native/resources/org/wpilib/fields
     ${CMAKE_CURRENT_BINARY_DIR}/generated/main/cpp
     FIELDS
-    fields
+    wpi::fields
     field_images_resources_src
 )
 
diff --git a/fields/build.gradle b/fields/build.gradle
index 696b35fb44..1a509099e2 100644
--- a/fields/build.gradle
+++ b/fields/build.gradle
@@ -30,7 +30,7 @@ apply from: "${rootDir}/shared/resources.gradle"
 apply from: "${rootDir}/shared/config.gradle"
 apply from: "${rootDir}/shared/java/javacommon.gradle"
 
-def generateTask = createGenerateResourcesTask('main', 'FIELDS', 'fields', project)
+def generateTask = createGenerateResourcesTask('main', 'FIELDS', 'wpi::fields', project)
 
 project(':').libraryBuild.dependsOn build
 tasks.withType(CppCompile) {
diff --git a/glass/BUILD.bazel b/glass/BUILD.bazel
index 817c549517..e176dfb025 100644
--- a/glass/BUILD.bazel
+++ b/glass/BUILD.bazel
@@ -76,7 +76,7 @@ generate_version_file(
 
 generate_resources(
     name = "generate-resources",
-    namespace = "glass",
+    namespace = "wpi::glass",
     prefix = "GLASS",
     resource_files = glob(["src/app/native/resources/*"]),
 )
diff --git a/glass/CMakeLists.txt b/glass/CMakeLists.txt
index 428af951c8..be58821577 100644
--- a/glass/CMakeLists.txt
+++ b/glass/CMakeLists.txt
@@ -64,7 +64,7 @@ install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass")
 #
 
 configure_file(src/app/generate/WPILibVersion.cpp.in WPILibVersion.cpp)
-generate_resources(src/app/native/resources generated/app/cpp GLASS glass glass_resources_src)
+generate_resources(src/app/native/resources generated/app/cpp GLASS wpi::glass glass_resources_src)
 
 file(GLOB glass_src src/app/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibVersion.cpp)
 
diff --git a/glass/build.gradle b/glass/build.gradle
index 51733ffd05..d09e7d68fb 100644
--- a/glass/build.gradle
+++ b/glass/build.gradle
@@ -59,7 +59,7 @@ gradle.taskGraph.addTaskExecutionGraphListener { graph ->
     }
 }
 
-def generateTask = createGenerateResourcesTask('app', 'GLASS', 'glass', project)
+def generateTask = createGenerateResourcesTask('app', 'GLASS', 'wpi::glass', project)
 
 project(':').libraryBuild.dependsOn build
 tasks.withType(CppCompile) {