Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes the native library from the RoboRIO Jar (#139)

Browse Source 
Includes the native zip in the maven artifact as well.
This commit is contained in:
Thad House
2016-10-25 20:42:06 -07:00
committed by Peter Johnson
parent 88fdbc6d3e
commit c45384b91a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.gradle
View File

@@ -31,9 +31,11 @@ jar {
model {
binaries {
withType(SharedLibraryBinarySpec) { binary ->
from(file(binary.sharedLibraryFile)) {
into getPlatformPath(binary)
}
// Only include the native file if not cross compiling to the roboRIO
if (!project.isArm || project.hasProperty('compilerPrefix'))
from(file(binary.sharedLibraryFile)) {
into getPlatformPath(binary)
}
}
}
}

7
publish.gradle
View File

@@ -47,7 +47,12 @@ publishing {
artifact nat.networktablesJavaSource
artifact nat.networktablesJavadoc
if (project.buildArm) {
artifact project('arm:ntcore').jar
def natArm = project('arm:ntcore')
artifact natArm.jar
// If the library is not embedded include it in the repo
if (!project.hasProperty('compilerPrefix')) {
artifact natArm.ntcoreZip
}
}
if (project.hasProperty('makeDesktop')) {