mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
[build] Refactor zip base name generation for consistency (#8831)
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:
@@ -24,11 +24,11 @@ evaluationDependsOn(':datalog')
|
||||
|
||||
def baseArtifactIdCpp = 'documentation'
|
||||
def artifactGroupIdCpp = 'org.wpilib.wpilibc'
|
||||
def zipBaseNameCpp = '_GROUP_org_wpilib_wpilibc_ID_documentation_CLS'
|
||||
def zipBaseNameCpp = makeZipBaseName(artifactGroupIdCpp, baseArtifactIdCpp)
|
||||
|
||||
def baseArtifactIdJava = 'documentation'
|
||||
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")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user