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

[cscore] Fix jnicvstatic classifier (#2561)

Browse Source 
The archive needed to be zip, additionally the library needed to statically link to cscore. All better now
This commit is contained in:
Thad House
2020-06-30 22:50:02 -07:00
committed by GitHub
parent 9f4de91554
commit b1353e4d6e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cscore/build.gradle
View File

@@ -44,7 +44,7 @@ model {
it.buildable = false
return
}
lib library: "${nativeName}", linkage: 'shared'
lib library: "${nativeName}", linkage: 'static'
lib project: ':wpiutil', library: 'wpiutil', linkage: 'shared'
}
}

2
shared/jni/publish.gradle
View File

@@ -113,7 +113,7 @@ model {
}
if (project.hasProperty('cvStaticBuild') && project.getProperty('cvStaticBuild') == true) {
def jniCvTaskList = createComponentZipTasks($.components, ["${nativeName}JNICvStatic"], jniCvStaticBaseName, Jar, project, { task, value ->
def jniCvTaskList = createComponentZipTasks($.components, ["${nativeName}JNICvStatic"], jniCvStaticBaseName, Zip, project, { task, value ->
value.each { binary ->
if (binary.buildable) {
if (binary instanceof SharedLibraryBinarySpec) {