SCRIPT fixup project rename

This commit is contained in:
PJ Reiniger
2025-11-07 19:55:39 -05:00
committed by Peter Johnson
parent a5492d30da
commit 10b4a0c971
61 changed files with 192 additions and 192 deletions

View File

@@ -24,7 +24,7 @@ foreach(example ${EXAMPLES})
${example}
apriltag
wpilibc
wpilibNewCommands
commandsv2
romiVendordep
xrpVendordep
)
@@ -44,7 +44,7 @@ foreach(example ${EXAMPLES})
Example_${example}_test
apriltag
wpilibc
wpilibNewCommands
commandsv2
romiVendordep
xrpVendordep
googletest
@@ -62,7 +62,7 @@ foreach(template ${TEMPLATES})
add_executable(${template} ${sources})
wpilib_target_warnings(${template})
target_include_directories(${template} PUBLIC src/main/cpp/templates/${template}/include)
target_link_libraries(${template} wpilibc wpilibNewCommands romiVendordep xrpVendordep)
target_link_libraries(${template} wpilibc commandsv2 romiVendordep xrpVendordep)
add_dependencies(wpilibcExamples ${template})
endforeach()
@@ -75,6 +75,6 @@ foreach(snippet ${SNIPPETS})
add_executable(snippet${snippet} ${sources})
wpilib_target_warnings(snippet${snippet})
target_include_directories(snippet${snippet} PUBLIC src/main/cpp/snippets/${snippet}/include)
target_link_libraries(snippet${snippet} wpilibc wpilibNewCommands romiVendordep xrpVendordep)
target_link_libraries(snippet${snippet} wpilibc commandsv2 romiVendordep xrpVendordep)
add_dependencies(wpilibcExamples_snippets snippet${snippet})
endforeach()

View File

@@ -77,7 +77,7 @@ model {
binary.buildable = false
return
}
lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared'
lib project: ':commandsv2', library: 'commandsv2', linkage: 'shared'
lib project: ':romiVendordep', library: 'romiVendordep', linkage: 'shared'
lib project: ':xrpVendordep', library: 'xrpVendordep', linkage: 'shared'
lib project: ':apriltag', library: 'apriltag', linkage: 'shared'
@@ -108,7 +108,7 @@ model {
"${key}"(NativeExecutableSpec) {
targetBuildTypes 'debug'
binaries.all { binary ->
lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared'
lib project: ':commandsv2', library: 'commandsv2', linkage: 'shared'
lib project: ':romiVendordep', library: 'romiVendordep', linkage: 'shared'
lib project: ':xrpVendordep', library: 'xrpVendordep', linkage: 'shared'
lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared'
@@ -156,7 +156,7 @@ model {
"${key}"(NativeExecutableSpec) {
targetBuildTypes 'debug'
binaries.all { binary ->
lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared'
lib project: ':commandsv2', library: 'commandsv2', linkage: 'shared'
lib project: ':romiVendordep', library: 'romiVendordep', linkage: 'shared'
lib project: ':xrpVendordep', library: 'xrpVendordep', linkage: 'shared'
lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared'
@@ -187,7 +187,7 @@ model {
"snippets${key}"(NativeExecutableSpec) {
targetBuildTypes 'debug'
binaries.all { binary ->
lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared'
lib project: ':commandsv2', library: 'commandsv2', linkage: 'shared'
lib project: ':romiVendordep', library: 'romiVendordep', linkage: 'shared'
lib project: ':xrpVendordep', library: 'xrpVendordep', linkage: 'shared'
lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared'
@@ -307,7 +307,7 @@ model {
}
binaries {
withType(GoogleTestTestSuiteBinarySpec) {
lib project: ':wpilibNewCommands', library: 'wpilibNewCommands', linkage: 'shared'
lib project: ':commandsv2', library: 'commandsv2', linkage: 'shared'
lib project: ':romiVendordep', library: 'romiVendordep', linkage: 'shared'
lib project: ':xrpVendordep', library: 'xrpVendordep', linkage: 'shared'
lib project: ':wpilibc', library: 'wpilibc', linkage: 'shared'

View File

@@ -40,7 +40,7 @@ def build_examples(halsim_deps = []):
name = folder + "-example",
srcs = native.glob(["src/main/cpp/examples/" + folder + "/cpp/**/*.cpp", "src/main/cpp/examples/" + folder + "/c/**/*.c"], allow_empty = True),
deps = [
"//wpilibNewCommands",
"//commandsv2",
"//apriltag",
"//romiVendordep",
"//xrpVendordep",
@@ -59,7 +59,7 @@ def build_commands():
srcs = native.glob(["src/main/cpp/commands/" + folder + "/**/*.cpp"]),
hdrs = native.glob(["src/main/cpp/commands/" + folder + "/**/*.h"]),
deps = [
"//wpilibNewCommands",
"//commandsv2",
],
strip_include_prefix = "src/main/cpp/commands/" + folder,
tags = ["wpi-example"],
@@ -74,7 +74,7 @@ def build_snippets():
srcs = native.glob(["src/main/cpp/snippets/" + folder + "/**/*.cpp"]),
hdrs = native.glob(["src/main/cpp/snippets/" + folder + "/**/*.h"], allow_empty = True),
deps = [
"//wpilibNewCommands",
"//commandsv2",
],
strip_include_prefix = "src/main/cpp/snippets/" + folder + "/include",
tags = ["wpi-example"],
@@ -89,7 +89,7 @@ def build_templates():
srcs = native.glob(["src/main/cpp/templates/" + folder + "/**/*.cpp"]),
hdrs = native.glob(["src/main/cpp/templates/" + folder + "/**/*.h"]),
deps = [
"//wpilibNewCommands",
"//commandsv2",
],
strip_include_prefix = "src/main/cpp/templates/" + folder + "/include",
tags = ["wpi-example"],
@@ -104,7 +104,7 @@ def build_tests():
size = "small",
srcs = native.glob([example_test_folder + "/**/*.cpp", example_src_folder + "/cpp/**/*.cpp", example_src_folder + "/c/**/*.c"], allow_empty = True),
deps = [
"//wpilibNewCommands",
"//commandsv2",
":{}-examples-headers".format(folder),
"//thirdparty/googletest",
],