From d5ed9fb859f29dd677daeac981061e56440b941b Mon Sep 17 00:00:00 2001 From: Thad House Date: Thu, 8 Jun 2023 21:11:51 -0700 Subject: [PATCH] [wpimath] Create separate archive with just units headers (#5383) This will allow very low level deps to use the same units library we ship with wpilib --- shared/jni/publish.gradle | 1 + wpimath/build.gradle | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/shared/jni/publish.gradle b/shared/jni/publish.gradle index 42f0a951bc..a33ca82686 100644 --- a/shared/jni/publish.gradle +++ b/shared/jni/publish.gradle @@ -6,6 +6,7 @@ def outputsFolder = file("$buildDir/outputs") def baseArtifactId = nativeName def artifactGroupId = "edu.wpi.first.${nativeName}" def zipBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-cpp_CLS" +ext.zipBaseName = zipBaseName def jniBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-jni_CLS" def jniCvStaticBaseName = "_GROUP_edu_wpi_first_${nativeName}_ID_${nativeName}-jnicvstatic_CLS" diff --git a/wpimath/build.gradle b/wpimath/build.gradle index 9e7c3a8d08..1c16f70cb6 100644 --- a/wpimath/build.gradle +++ b/wpimath/build.gradle @@ -125,3 +125,25 @@ task generateNat() { sourceSets.main.java.srcDir "${buildDir}/generated/java" compileJava.dependsOn generateNumbers compileJava.dependsOn generateNat + +task unitsHeaders(type: Zip) { + destinationDirectory = file("$buildDir/outputs") + archiveBaseName = zipBaseName + archiveClassifier = "units" + + from(licenseFile) { + into '/' + } + + ext.includeDirs = [ + project.file('src/main/native/include/units') + ] + + ext.includeDirs.each { + from(it) { + into '/units' + } + } +} + +addTaskToCopyAllOutputs(unitsHeaders)