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

[build] Refactor zip base name generation for consistency (#8831)

Browse Source 
Right now, the `zipBaseName` variable in various publish.gradle files
contains the group ID and artifact ID for use by the combiner, however,
they are also duplicated in `artifactGroupId` and `baseArtifactId`,
leading to potential mistakes if they aren't updated together. This
fixes that by adding a new utility function `makeZipBaseName` to
automatically create the right name given a group ID and artifact ID.
This also fixes publishing for thirdparty subprojects, which didn't
update `zipBaseName`.
This commit is contained in:
Gold856
2026-04-27 14:46:11 -04:00
committed by GitHub
parent 29beacbefe
commit 3bf67edc34
22 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -108,6 +108,10 @@ ext.addTaskToCopyAllOutputs = { task ->
copyAllOutputs.from task.archiveFile copyAllOutputs.from task.archiveFile
} }
ext.makeZipBaseName = { group, artifactId ->
return "_GROUP_${group.replace(".", "_")}_ID_${artifactId}_CLS"
}
subprojects { subprojects {
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'idea' apply plugin: 'idea'

4
docs/build.gradle
View File

@@ -24,11 +24,11 @@ evaluationDependsOn(':datalog')
def baseArtifactIdCpp = 'documentation' def baseArtifactIdCpp = 'documentation'
def artifactGroupIdCpp = 'org.wpilib.wpilibc' def artifactGroupIdCpp = 'org.wpilib.wpilibc'
def zipBaseNameCpp = '_GROUP_org_wpilib_wpilibc_ID_documentation_CLS' def zipBaseNameCpp = makeZipBaseName(artifactGroupIdCpp, baseArtifactIdCpp)
def baseArtifactIdJava = 'documentation' def baseArtifactIdJava = 'documentation'
def artifactGroupIdJava = 'org.wpilib.wpilibj' def artifactGroupIdJava = 'org.wpilib.wpilibj'
def zipBaseNameJava = '_GROUP_org_wpilib_wpilibj_ID_documentation_CLS' def zipBaseNameJava = makeZipBaseName(artifactGroupIdJava, baseArtifactIdJava)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
fields/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = project.nativeName def baseArtifactId = project.nativeName
def artifactGroupId = project.groupId def artifactGroupId = project.groupId
def cppZipBaseName = "_GROUP_org_wpilib_fields_ID_${baseArtifactId}-cpp_CLS" def cppZipBaseName = makeZipBaseName(artifactGroupId, "${baseArtifactId}-cpp")
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

6
glass/publish.gradle
View File

@@ -2,15 +2,15 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'Glass' def baseArtifactId = 'Glass'
def artifactGroupId = 'org.wpilib.tools' def artifactGroupId = 'org.wpilib.tools'
def zipBaseName = '_GROUP_org_wpilib_tools_ID_Glass_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def libBaseArtifactId = 'libglass' def libBaseArtifactId = 'libglass'
def libArtifactGroupId = 'org.wpilib.glass' def libArtifactGroupId = 'org.wpilib.glass'
def libZipBaseName = '_GROUP_org_wpilib_glass_ID_libglass_CLS' def libZipBaseName = makeZipBaseName(libArtifactGroupId, libBaseArtifactId)
def libntBaseArtifactId = 'libglassnt' def libntBaseArtifactId = 'libglassnt'
def libntArtifactGroupId = 'org.wpilib.glass' def libntArtifactGroupId = 'org.wpilib.glass'
def libntZipBaseName = '_GROUP_org_wpilib_glass_ID_libglassnt_CLS' def libntZipBaseName = makeZipBaseName(libntArtifactGroupId, libntBaseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
msvcruntime/build.gradle
View File

@@ -11,7 +11,7 @@ if (OperatingSystem.current().isWindows()) {
def baseArtifactId = 'runtime' def baseArtifactId = 'runtime'
def artifactGroupId = "org.wpilib.msvc" def artifactGroupId = "org.wpilib.msvc"
def zipBaseName = "_GROUP_org_wpilib_msvc_ID_runtime_CLS" def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def vsLocator = gradle.services.get(VisualStudioLocator) def vsLocator = gradle.services.get(VisualStudioLocator)

2
ntcoreffi/build.gradle
View File

@@ -82,7 +82,7 @@ model {
def nativeName = 'ntcoreffi' def nativeName = 'ntcoreffi'
def baseArtifactId = nativeName def baseArtifactId = nativeName
def artifactGroupId = "org.wpilib.${nativeName}" def artifactGroupId = "org.wpilib.${nativeName}"
def zipBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-cpp_CLS" def zipBaseName = makeZipBaseName(artifactGroupId, "${baseArtifactId}-cpp")
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")
evaluationDependsOn(':ntcore') evaluationDependsOn(':ntcore')

2
shared/java/javacommon.gradle
View File

@@ -4,7 +4,7 @@ apply plugin: 'jacoco'
def baseArtifactId = project.baseId def baseArtifactId = project.baseId
def artifactGroupId = project.groupId def artifactGroupId = project.groupId
def javaBaseName = "_GROUP_${project.groupId.replace('.', '_')}_ID_${project.baseId}-java_CLS" def javaBaseName = makeZipBaseName(artifactGroupId, "${baseArtifactId}-java")
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
shared/javacpp/publish.gradle
View File

@@ -4,7 +4,7 @@ def outputsFolder = file("$buildDir/outputs")
def baseArtifactId = nativeName def baseArtifactId = nativeName
def artifactGroupId = "org.wpilib.${nativeName}" def artifactGroupId = "org.wpilib.${nativeName}"
def zipBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-cpp_CLS" def zipBaseName = makeZipBaseName(artifactGroupId, "${baseArtifactId}-cpp")
def licenseFile = file("$rootDir/license.md") def licenseFile = file("$rootDir/license.md")

4
shared/jni/publish.gradle
View File

@@ -5,9 +5,9 @@ def outputsFolder = file("$buildDir/outputs")
def baseArtifactId = nativeName def baseArtifactId = nativeName
def artifactGroupId = "org.wpilib.${nativeName}" def artifactGroupId = "org.wpilib.${nativeName}"
def zipBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-cpp_CLS" def zipBaseName = makeZipBaseName(artifactGroupId, "${baseArtifactId}-cpp")
ext.zipBaseName = zipBaseName ext.zipBaseName = zipBaseName
def jniCvStaticBaseName = "_GROUP_org_wpilib_${nativeName}_ID_${nativeName}-jnicvstatic_CLS" def jniCvStaticBaseName = makeZipBaseName(artifactGroupId, "${nativeName}-jnicvstatic")
def licenseFile = file("$rootDir/license.md") def licenseFile = file("$rootDir/license.md")

2
shared/plugins/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = pluginName def baseArtifactId = pluginName
def artifactGroupId = 'org.wpilib.halsim' def artifactGroupId = 'org.wpilib.halsim'
def zipBaseName = "_GROUP_org_wpilib_halsim_ID_${pluginName}_CLS" def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
thirdparty/catch2/publish.gradle vendored
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'catch2-cpp' def baseArtifactId = 'catch2-cpp'
def artifactGroupId = 'org.wpilib.thirdparty.catch2' def artifactGroupId = 'org.wpilib.thirdparty.catch2'
def zipBaseName = '_GROUP_edu_wpi_first_thirdparty_catch2_ID_catch2-cpp_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
thirdparty/googletest/publish.gradle vendored
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'googletest-cpp' def baseArtifactId = 'googletest-cpp'
def artifactGroupId = 'org.wpilib.thirdparty.googletest' def artifactGroupId = 'org.wpilib.thirdparty.googletest'
def zipBaseName = '_GROUP_edu_wpi_first_thirdparty_googletest_ID_googletest-cpp_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
thirdparty/imgui_suite/publish.gradle vendored
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'imguiSuite-cpp' def baseArtifactId = 'imguiSuite-cpp'
def artifactGroupId = 'org.wpilib.thirdparty.imguiSuite' def artifactGroupId = 'org.wpilib.thirdparty.imguiSuite'
def zipBaseName = '_GROUP_edu_wpi_first_thirdparty_imguiSuite_ID_imguiSuite-cpp_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
tools/datalogtool/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'DataLogTool' def baseArtifactId = 'DataLogTool'
def artifactGroupId = 'org.wpilib.tools' def artifactGroupId = 'org.wpilib.tools'
def zipBaseName = '_GROUP_org_wpilib_tools_ID_DataLogTool_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
tools/outlineviewer/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'OutlineViewer' def baseArtifactId = 'OutlineViewer'
def artifactGroupId = 'org.wpilib.tools' def artifactGroupId = 'org.wpilib.tools'
def zipBaseName = '_GROUP_org_wpilib_tools_ID_OutlineViewer_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
tools/processstarter/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'processstarter' def baseArtifactId = 'processstarter'
def artifactGroupId = 'org.wpilib.tools' def artifactGroupId = 'org.wpilib.tools'
def zipBaseName = '_GROUP_org_wpilib_tools_ID_processstarter_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
tools/sysid/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'SysId' def baseArtifactId = 'SysId'
def artifactGroupId = 'org.wpilib.tools' def artifactGroupId = 'org.wpilib.tools'
def zipBaseName = '_GROUP_org_wpilib_tools_ID_SysId_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
tools/wpical/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'wpical' def baseArtifactId = 'wpical'
def artifactGroupId = 'org.wpilib.tools' def artifactGroupId = 'org.wpilib.tools'
def zipBaseName = '_GROUP_org_wpilib_tools_ID_wpical_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
wpigui/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'wpigui-cpp' def baseArtifactId = 'wpigui-cpp'
def artifactGroupId = 'org.wpilib.wpigui' def artifactGroupId = 'org.wpilib.wpigui'
def zipBaseName = '_GROUP_org_wpilib_wpigui_ID_wpigui-cpp_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

2
wpilibc/publish.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: 'maven-publish'
def baseArtifactId = 'wpilibc-cpp' def baseArtifactId = 'wpilibc-cpp'
def artifactGroupId = 'org.wpilib.wpilibc' def artifactGroupId = 'org.wpilib.wpilibc'
def zipBaseName = '_GROUP_org_wpilib_wpilibc_ID_wpilibc-cpp_CLS' def zipBaseName = makeZipBaseName(artifactGroupId, baseArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

6
wpilibcExamples/publish.gradle
View File

@@ -5,9 +5,9 @@ def baseTemplatesArtifactId = 'templates'
def baseCommandsArtifactId = 'commands' def baseCommandsArtifactId = 'commands'
def artifactGroupId = 'org.wpilib.wpilibc' def artifactGroupId = 'org.wpilib.wpilibc'
def examplesZipBaseName = '_GROUP_org_wpilib_wpilibc_ID_examples_CLS' def examplesZipBaseName = makeZipBaseName(artifactGroupId, baseExamplesArtifactId)
def templatesZipBaseName = '_GROUP_org_wpilib_wpilibc_ID_templates_CLS' def templatesZipBaseName = makeZipBaseName(artifactGroupId, baseTemplatesArtifactId)
def commandsZipBaseName = '_GROUP_org_wpilib_wpilibc_ID_commands_CLS' def commandsZipBaseName = makeZipBaseName(artifactGroupId, baseCommandsArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")

6
wpilibjExamples/publish.gradle
View File

@@ -5,9 +5,9 @@ def baseTemplatesArtifactId = 'templates'
def baseCommandsArtifactId = 'commands' def baseCommandsArtifactId = 'commands'
def artifactGroupId = 'org.wpilib.wpilibj' def artifactGroupId = 'org.wpilib.wpilibj'
def examplesZipBaseName = '_GROUP_org_wpilib_wpilibj_ID_examples_CLS' def examplesZipBaseName = makeZipBaseName(artifactGroupId, baseExamplesArtifactId)
def templatesZipBaseName = '_GROUP_org_wpilib_wpilibj_ID_templates_CLS' def templatesZipBaseName = makeZipBaseName(artifactGroupId, baseTemplatesArtifactId)
def commandsZipBaseName = '_GROUP_org_wpilib_wpilibj_ID_commands_CLS' def commandsZipBaseName = makeZipBaseName(artifactGroupId, baseCommandsArtifactId)
def outputsFolder = file("$project.buildDir/outputs") def outputsFolder = file("$project.buildDir/outputs")