Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

HAND FIXES: Update build scripts for namespaces

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 20:00:37 -05:00
committed by Peter Johnson
parent 07b60384d0
commit ad138270a8
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apriltag/BUILD.bazel
View File

@@ -55,7 +55,7 @@ cc_library(
generate_resources( generate_resources(
name = "generate-resources", name = "generate-resources",
namespace = "frc", namespace = "wpi::apriltag",
prefix = "APRILTAG", prefix = "APRILTAG",
resource_files = glob(["src/main/native/resources/**"]), resource_files = glob(["src/main/native/resources/**"]),
) )

2
apriltag/CMakeLists.txt
View File

@@ -110,7 +110,7 @@ generate_resources(
src/main/native/resources/org/wpilib/vision/apriltag src/main/native/resources/org/wpilib/vision/apriltag
generated/main/cpp generated/main/cpp
APRILTAG APRILTAG
frc wpi::apriltag
apriltag_resources_src apriltag_resources_src
) )

2
apriltag/build.gradle
View File

@@ -12,7 +12,7 @@ ext {
apriltagTest: []] apriltagTest: []]
staticCvConfigs = [] staticCvConfigs = []
def generateTask = createGenerateResourcesTask('main', 'APRILTAG', 'frc', project) def generateTask = createGenerateResourcesTask('main', 'APRILTAG', 'wpi::apriltag', project)
tasks.withType(CppCompile) { tasks.withType(CppCompile) {
dependsOn generateTask dependsOn generateTask

2
fields/BUILD.bazel
View File

@@ -6,7 +6,7 @@ load("//shared/bazel/rules/gen:gen-resources.bzl", "generate_resources")
generate_resources( generate_resources(
name = "generate-resources", name = "generate-resources",
namespace = "fields", namespace = "wpi::fields",
prefix = "FIELDS", prefix = "FIELDS",
resource_files = glob(["src/main/native/resources/**"]), resource_files = glob(["src/main/native/resources/**"]),
) )

2
fields/CMakeLists.txt
View File

@@ -34,7 +34,7 @@ generate_resources(
src/main/native/resources/org/wpilib/fields src/main/native/resources/org/wpilib/fields
${CMAKE_CURRENT_BINARY_DIR}/generated/main/cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/main/cpp
FIELDS FIELDS
fields wpi::fields
field_images_resources_src field_images_resources_src
) )

2
fields/build.gradle
View File

@@ -30,7 +30,7 @@ apply from: "${rootDir}/shared/resources.gradle"
apply from: "${rootDir}/shared/config.gradle" apply from: "${rootDir}/shared/config.gradle"
apply from: "${rootDir}/shared/java/javacommon.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 project(':').libraryBuild.dependsOn build
tasks.withType(CppCompile) { tasks.withType(CppCompile) {

2
glass/BUILD.bazel
View File

@@ -76,7 +76,7 @@ generate_version_file(
generate_resources( generate_resources(
name = "generate-resources", name = "generate-resources",
namespace = "glass", namespace = "wpi::glass",
prefix = "GLASS", prefix = "GLASS",
resource_files = glob(["src/app/native/resources/*"]), resource_files = glob(["src/app/native/resources/*"]),
) )

2
glass/CMakeLists.txt
View File

@@ -64,7 +64,7 @@ install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass")
# #
configure_file(src/app/generate/WPILibVersion.cpp.in WPILibVersion.cpp) 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) file(GLOB glass_src src/app/native/cpp/*.cpp ${CMAKE_CURRENT_BINARY_DIR}/WPILibVersion.cpp)

2
glass/build.gradle
View File

@@ -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 project(':').libraryBuild.dependsOn build
tasks.withType(CppCompile) { tasks.withType(CppCompile) {