mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
HAND FIXES: Update build scripts for namespaces
This commit is contained in:
committed by
Peter Johnson
parent
07b60384d0
commit
ad138270a8
@@ -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/**"]),
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user