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

@@ -12,7 +12,7 @@ generate_resources(
)
wpilib_cc_library(
name = "fieldImages",
name = "fields",
srcs = [":generate-resources"] + glob(["src/main/native/cpp/**"]),
hdrs = glob(["src/main/native/include/**/*"]),
include_license_files = True,
@@ -21,24 +21,24 @@ wpilib_cc_library(
)
wpilib_cc_static_library(
name = "static/fieldImages",
name = "static/fields",
static_lib_name = select({
"@platforms//os:windows": "static/fieldImages.lib",
"//conditions:default": "static/libfieldImages.a",
"@platforms//os:windows": "static/fields.lib",
"//conditions:default": "static/libfields.a",
}),
visibility = ["//visibility:public"],
deps = [
":fieldImages",
":fields",
],
)
wpilib_java_library(
name = "fieldImages-java",
name = "fields-java",
srcs = glob(["src/main/java/**/*.java"]),
extra_source_pkgs = ["resources"],
maven_artifact_name = "fieldImages-java",
maven_group_id = "edu.wpi.first.fieldImages",
resource_strip_prefix = "fieldImages/src/main/native/resources",
maven_artifact_name = "fields-java",
maven_group_id = "edu.wpi.first.fields",
resource_strip_prefix = "fields/src/main/native/resources",
resources = glob(["src/main/native/resources/**"]),
visibility = ["//visibility:public"],
deps = [
@@ -54,15 +54,15 @@ pkg_files(
)
wpilib_java_junit5_test(
name = "fieldImages-test",
name = "fields-test",
srcs = glob(["src/test/java/**/*.java"]),
deps = [
":fieldImages-java",
":fields-java",
],
)
package_minimal_cc_project(
name = "fieldImages",
maven_artifact_name = "fieldImages-cpp",
maven_group_id = "edu.wpi.first.fieldImages",
name = "fields",
maven_artifact_name = "fields-cpp",
maven_group_id = "edu.wpi.first.fields",
)

View File

@@ -1,4 +1,4 @@
project(fieldImages)
project(fields)
include(CompileWarnings)
include(GenResources)
@@ -23,14 +23,14 @@ if(WITH_JAVA)
NAMESPACE "edu/wpi/first/fields" ${JAVA_RESOURCES}
INCLUDE_JARS ${JACKSON_JARS}
OUTPUT_DIR ${WPILIB_BINARY_DIR}/${java_lib_dest}
OUTPUT_NAME fieldImages
OUTPUT_NAME fields
)
set_property(TARGET field_images_jar PROPERTY FOLDER "java")
install_jar(field_images_jar DESTINATION ${java_lib_dest})
install_jar_exports(
TARGETS field_images_jar
FILE fieldImages_jar.cmake
DESTINATION share/fieldImages
FILE fields_jar.cmake
DESTINATION share/fields
)
endif()
@@ -42,27 +42,27 @@ generate_resources(
field_images_resources_src
)
add_library(fieldImages ${field_images_resources_src} src/main/native/cpp/fields.cpp)
set_target_properties(fieldImages PROPERTIES DEBUG_POSTFIX "d")
add_library(fields ${field_images_resources_src} src/main/native/cpp/fields.cpp)
set_target_properties(fields PROPERTIES DEBUG_POSTFIX "d")
set_property(TARGET fieldImages PROPERTY FOLDER "libraries")
target_compile_features(fieldImages PUBLIC cxx_std_20)
set_property(TARGET fields PROPERTY FOLDER "libraries")
target_compile_features(fields PUBLIC cxx_std_20)
if(MSVC)
target_compile_options(fieldImages PUBLIC /bigobj)
target_compile_options(fields PUBLIC /bigobj)
endif()
wpilib_target_warnings(fieldImages)
wpilib_target_warnings(fields)
install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/fieldImages")
install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/fields")
target_include_directories(
fieldImages
fields
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
$<INSTALL_INTERFACE:${include_dest}/fieldImages>
$<INSTALL_INTERFACE:${include_dest}/fields>
)
install(TARGETS fieldImages EXPORT fieldimages)
export(TARGETS fieldImages FILE fieldimages.cmake NAMESPACE fieldimages::)
install(TARGETS fields EXPORT fields)
export(TARGETS fields FILE fields.cmake NAMESPACE fields::)
configure_file(fieldimages-config.cmake.in ${WPILIB_BINARY_DIR}/fieldimages-config.cmake)
install(FILES ${WPILIB_BINARY_DIR}/fieldimages-config.cmake DESTINATION share/fieldImages)
install(EXPORT fieldimages DESTINATION share/fieldImages)
configure_file(fields-config.cmake.in ${WPILIB_BINARY_DIR}/fields-config.cmake)
install(FILES ${WPILIB_BINARY_DIR}/fields-config.cmake DESTINATION share/fields)
install(EXPORT fields DESTINATION share/fields)

View File

@@ -20,10 +20,10 @@ dependencies {
}
ext {
nativeName = 'fieldImages'
nativeName = 'fields'
baseId = nativeName
groupId = 'edu.wpi.first.fieldImages'
devMain = "edu.wpi.first.fieldImages.DevMain"
groupId = 'edu.wpi.first.fields'
devMain = "edu.wpi.first.fields.DevMain"
}
apply from: "${rootDir}/shared/resources.gradle"
@@ -44,7 +44,7 @@ sourceSets.main.resources {
model {
components {
"${nativeName}"(NativeLibrarySpec) {
baseName = 'fieldImages'
baseName = 'fields'
sources {
cpp {
source {

View File

@@ -1,5 +1,5 @@
@FILENAME_DEP_REPLACE@
include(${SELF_DIR}/fieldimages.cmake)
include(${SELF_DIR}/fields.cmake)
if(@WITH_JAVA@)
include(${SELF_DIR}/fieldImages_jar.cmake)
include(${SELF_DIR}/fields_jar.cmake)
endif()

View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = project.nativeName
def artifactGroupId = project.groupId
def cppZipBaseName = "_GROUP_edu_wpi_first_fieldImages_ID_${baseArtifactId}-cpp_CLS"
def cppZipBaseName = "_GROUP_edu_wpi_first_fields_ID_${baseArtifactId}-cpp_CLS"
def outputsFolder = file("$project.buildDir/outputs")
@@ -51,7 +51,7 @@ addTaskToCopyAllOutputs(cppSourcesZip)
model {
publishing {
def wpilibCTaskList = createComponentZipTasks($.components, ['fieldImages'], cppZipBaseName, Zip, project, includeStandardZipFormat)
def wpilibCTaskList = createComponentZipTasks($.components, ['fields'], cppZipBaseName, Zip, project, includeStandardZipFormat)
publications {
cpp(MavenPublication) {