Gradle Build
This adds gradle support for building wpilibj and wpilibc. At this
point, both of these libraries should be fully ready to go.
Gradle should give us a number of improvements, including less
dependencies for getting building up and running, and MUCH faster build
times. I'm noticing significantly faster build times already compared to
Maven, with neither system building the plugins. The changes here should
be pretty straight forward. The basic command for gradle is './gradlew'.
This is the gradle wrapper, and it will find and download the correct
gradle executable for your system. There is no need to install anything
yourself. To see every task available, run './gradlew tasks'. The
important tasks for us are listed under the WPILib header when the tasks
command is run. To generate unit test binaries, the
fRCUserProgramExecutable command will create the C++ tester, and the
wpilibjIntegrationTestJar command will create the Java tester. The Jenkins
deploy scripts have been modified to know the difference between maven
generated and gradle generated jars with an environment variable. Creating
the eclipse plugins still requires Maven, but gradle will handle calling
it correctly and generating the proper dependencies for it. Create the
plugins by calling ./gradlew eclipsePlugins.
Jenkins can now be modified to support the new build system. Unit tests
are run with ./gradlew test. Generating the integration tests uses the
above two commands, and then process proceeds exactly as it did before.
For publishing documentation, a new task has been created, ./gradlew
publishDocs, which handles putting the documentation where Jenkins expects
for publishing.
Change-Id: I9a260d391984f98ef9170993efe933e4026161dc
2015-05-05 09:54:14 -04:00
|
|
|
apply plugin: 'java'
|
|
|
|
|
apply plugin: 'cpp'
|
|
|
|
|
apply plugin: 'maven-publish'
|
|
|
|
|
|
|
|
|
|
// We need this so we can get the networktables javadoc for the javadoc task
|
|
|
|
|
evaluationDependsOn(':networktables:java')
|
|
|
|
|
|
|
|
|
|
def jdkDownloadSite = 'http://www.oracle.com/technetwork/java/javase/downloads/jdk8-arm-downloads-2187472.html'
|
|
|
|
|
def jdkFolder = 'jdk-linux-arm-vfp-sflt'
|
|
|
|
|
def jdkVersion = 'jdk1.8.0_33'
|
|
|
|
|
def jdkLocation = System.getProperty("user.home") + File.separator + jdkFolder + File.separator + jdkVersion
|
|
|
|
|
def generatedJNIHeaderLoc = 'wpilibJavaJNI/build/include'
|
|
|
|
|
|
|
|
|
|
// Maven publishing configuration
|
|
|
|
|
publishing {
|
|
|
|
|
publications {
|
|
|
|
|
maven(MavenPublication) {
|
|
|
|
|
artifact wpilibjJar
|
|
|
|
|
artifact(wpilibjSources) {
|
|
|
|
|
classifier 'sources'
|
|
|
|
|
}
|
|
|
|
|
artifact(wpilibjJavadoc) {
|
|
|
|
|
classifier 'javadoc'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
groupId 'edu.wpi.first.wpilibj'
|
|
|
|
|
artifactId 'wpilibJavaFinal'
|
|
|
|
|
version '0.1.0-SNAPSHOT'
|
|
|
|
|
}
|
|
|
|
|
mavenSim(MavenPublication) {
|
|
|
|
|
artifact wpilibjSimJar
|
|
|
|
|
artifact(wpilibjSimSources) {
|
|
|
|
|
classifier 'sources'
|
|
|
|
|
}
|
|
|
|
|
artifact(wpilibjSimJavadoc) {
|
|
|
|
|
classifier 'javadoc'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
groupId 'edu.wpi.first.wpilibj'
|
|
|
|
|
artifactId 'wpilibJavaSim'
|
|
|
|
|
version '0.1.0-SNAPSHOT'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Configuration for the HAL bindings
|
|
|
|
|
model {
|
|
|
|
|
components {
|
|
|
|
|
wpilibJavaJNI(NativeLibrarySpec) {
|
|
|
|
|
targetPlatform 'arm'
|
|
|
|
|
binaries.all {
|
|
|
|
|
tasks.withType(CppCompile) {
|
|
|
|
|
dependsOn verifyJre
|
|
|
|
|
dependsOn jniHeaders
|
|
|
|
|
dependsOn addNiLibraryLinks
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
sources {
|
|
|
|
|
cpp {
|
|
|
|
|
source {
|
|
|
|
|
srcDirs = ['wpilibJavaJNI/lib']
|
|
|
|
|
includes = ['**/*.cpp']
|
|
|
|
|
}
|
|
|
|
|
exportedHeaders {
|
|
|
|
|
// JDK is included for jni.h. We also need the arm-linux specific headers. This does not need to change
|
|
|
|
|
// when compiling on Windows
|
|
|
|
|
// The JNI headers are put into the build/include directory by the jniHeaders task on wpilibJavaDevices
|
|
|
|
|
def includeLocation = jdkLocation + File.separator + 'include'
|
|
|
|
|
srcDirs = ["wpilibJavaJNI/include", includeLocation, includeLocation + File.separator + "linux"]
|
|
|
|
|
jniHeaders.outputs.files.each { file ->
|
|
|
|
|
srcDirs file.getPath()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
lib project: ':hal', library: 'HALAthena', linkage: 'static'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Configuration for the Java project, which pulls sources from the wpilibJava and wpilibJavaDevices folders
|
|
|
|
|
sourceSets {
|
|
|
|
|
// This is the sourceset for RoboRIO-specific code
|
|
|
|
|
main {
|
|
|
|
|
java {
|
|
|
|
|
srcDirs 'wpilibJavaDevices/src/main/java'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Unit tests. These run on any platform
|
|
|
|
|
test {
|
|
|
|
|
java {
|
|
|
|
|
srcDirs 'wpilibJava/src/test/java', 'wpilibJavaDevices/src/test/java'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// This is the shared code between the RoboRIO and simulation
|
|
|
|
|
shared {
|
|
|
|
|
java {
|
|
|
|
|
srcDirs 'wpilibJava/src/main/java'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Integration tests run on the WPI test stand
|
|
|
|
|
integrationTest {
|
|
|
|
|
java {
|
|
|
|
|
srcDirs 'wpilibJavaIntegrationTests/src/main/java', 'wpilibJavaIntegrationTests/src/test/java'
|
|
|
|
|
}
|
|
|
|
|
resources {
|
|
|
|
|
srcDir 'wpilibJavaIntegrationTests/src/main/resources'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// The simulation specific code
|
|
|
|
|
simulation {
|
|
|
|
|
java {
|
|
|
|
|
srcDirs 'wpilibJavaSim/src/main/java'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dependencies {
|
|
|
|
|
compile sourceSets.shared.output
|
|
|
|
|
compile project(':networktables:java')
|
|
|
|
|
testCompile 'junit:junit:4.11'
|
|
|
|
|
sharedCompile project(':networktables:java')
|
|
|
|
|
integrationTestCompile project(':networktables:java')
|
|
|
|
|
integrationTestCompile 'junit:junit:4.11'
|
|
|
|
|
integrationTestCompile sourceSets.main.output
|
|
|
|
|
integrationTestCompile sourceSets.shared.output
|
|
|
|
|
integrationTestCompile 'com.googlecode.junit-toolbox:junit-toolbox:2.0'
|
|
|
|
|
integrationTestCompile 'org.apache.ant:ant:1.9.4'
|
|
|
|
|
integrationTestCompile 'org.apache.ant:ant-junit:1.9.4'
|
|
|
|
|
simulationCompile sourceSets.main.output
|
|
|
|
|
simulationCompile sourceSets.shared.output
|
|
|
|
|
simulationCompile project(':simulation:JavaGazebo')
|
|
|
|
|
simulationCompile project(':networktables:java')
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjJar(type: Jar) {
|
|
|
|
|
description = 'Creates the WPILib Java jar, with the JNI shared library in the correct place'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
dependsOn { wpilibJavaJNISharedLibrary }
|
|
|
|
|
dependsOn { classes }
|
|
|
|
|
from files(sourceSets.main.output.classesDir)
|
|
|
|
|
from files(sourceSets.shared.output.classesDir)
|
|
|
|
|
binaries.withType(SharedLibraryBinarySpec) {
|
|
|
|
|
from(file(it.sharedLibraryFile)) {
|
|
|
|
|
into 'linux-arm'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjSources(type: Jar, dependsOn: classes) {
|
|
|
|
|
description = 'Creates the sources jar for the maven publishing routine'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
classifier = 'sources'
|
|
|
|
|
from sourceSets.main.allJava
|
|
|
|
|
from sourceSets.shared.allJava
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task javadoc(type: Javadoc, overwrite: true) {
|
|
|
|
|
def netTables = project(':networktables:java')
|
|
|
|
|
source sourceSets.main.allJava, sourceSets.shared.allJava, netTables.sourceSets.main.allJava
|
|
|
|
|
classpath = files([sourceSets.main.compileClasspath, sourceSets.shared.compileClasspath, netTables.sourceSets.main.compileClasspath])
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjJavadoc(type: Jar, dependsOn: javadoc) {
|
|
|
|
|
description = 'Creates the javadoc jar for the maven publishing routine'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
classifier = 'javadoc'
|
|
|
|
|
from javadoc.destinationDir
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjSimJar(type: Jar, dependsOn: simulationClasses) {
|
|
|
|
|
description = 'Creates the WPILibJSimulation Jar'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
from sourceSets.simulation.output.classesDir
|
|
|
|
|
from sourceSets.shared.output.classesDir
|
|
|
|
|
baseName 'wpilibjSimulation'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjSimSources(type: Jar, dependsOn: simulationClasses) {
|
|
|
|
|
description = 'Creates the wpilibjSimulation sources jar for the maven publishing routine'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
classifier = 'sources'
|
|
|
|
|
from sourceSets.simulation.allJava
|
|
|
|
|
from sourceSets.shared.allJava
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task simulationJavadoc(type: Javadoc) {
|
|
|
|
|
description = 'Generates javadoc for the simulation components'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
source sourceSets.simulation.allJava, sourceSets.shared.allJava
|
|
|
|
|
classpath = files([sourceSets.simulation.compileClasspath, sourceSets.shared.compileClasspath])
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjSimJavadoc(type: Jar, dependsOn: simulationJavadoc) {
|
|
|
|
|
description = 'Creates the wpilibjSimulation javadoc jar for the maven publishing routine'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
classifier = 'javadoc'
|
|
|
|
|
from simulationJavadoc.destinationDir
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
task wpilibjIntegrationTestJar(type: Jar) {
|
|
|
|
|
description = 'Creates the wpilib integration tests jar'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
dependsOn { wpilibJavaJNISharedLibrary }
|
|
|
|
|
dependsOn { wpilibjJar }
|
|
|
|
|
dependsOn { integrationTestClasses }
|
|
|
|
|
from sourceSets.integrationTest.output.classesDir
|
|
|
|
|
// Get all dependencies needed for running the jar
|
|
|
|
|
configurations.integrationTestCompile.filter { it.getPath().endsWith('.jar') }.each {
|
|
|
|
|
if (!it.isDirectory()) {
|
|
|
|
|
from zipTree(it)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
wpilibjJar.outputs.files.each { from zipTree(it) }
|
|
|
|
|
manifest {
|
|
|
|
|
attributes 'Main-Class': 'edu.wpi.first.wpilibj.test.AntJunitLanucher'
|
|
|
|
|
}
|
|
|
|
|
baseName = 'wpilibJavaIntegrationTests'
|
|
|
|
|
version = '0.1.0-SNAPSHOT'
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Generates the JNI headers from the HAL package
|
|
|
|
|
*/
|
|
|
|
|
task jniHeaders {
|
|
|
|
|
description = 'Generates JNI headers from edu.wpi.first.wpilibj.hal.*'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
def outputFolder = file(generatedJNIHeaderLoc)
|
|
|
|
|
inputs.files sourceSets.main.output
|
|
|
|
|
outputs.file outputFolder
|
|
|
|
|
doLast {
|
|
|
|
|
outputFolder.mkdirs()
|
|
|
|
|
exec {
|
|
|
|
|
executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
|
|
|
|
|
args '-d', outputFolder
|
|
|
|
|
args '-classpath', sourceSets.main.output.classesDir
|
|
|
|
|
args 'edu.wpi.first.wpilibj.can.CANJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.communication.FRCNetworkCommunicationsLibrary'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.HALUtil'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.JNIWrapper'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.AccelerometerJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.AnalogJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.CounterJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.DIOJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.EncoderJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.I2CJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.InterruptJNI'
|
This commit adds JNI bindings for the C++ Notifier.
The bindings only wrap the HAL interface, rather than the entire C++ Notifier,
as I ran into issues trying to wrap the whole Notifier (all the existing
bindings only wrap HAL components, so wrapping stuff in :wpilibc is
unexplored). As such, the new edu.wpi.first.wpilibj.Notifier is just a
re-implementation of the wpilibc/.../Notifier.cpp.
The purpose of doing this bindings is to allow Java users a better option
for running tasks which require good timing (such as control loops). The
previous method used java.util.Timer to schedule a task, causing various
issues. Although this update does improve things, Java loop timing is still
substantially worse than that of C++, and, even worse, if Java decides to call
the garbage collector at the wrong time then the loop can be delayed by
multiple milliseconds and the next iteration will be shorter to account for it
(although this particular behavior could be updated).
A few notes on individual components:
-the HAL Task.hpp and Task.cpp were modified due to compilation/linkage
issues with the JNI bindings. Nothing substantive changed.
-NotifierJNI was added to the build files for gradle.
-HALUtil was modified to include a function for getting the length of a C
pointer, rather than relying on it being 32-bit.
Change-Id: I966512d8a82c2a438ed8c8bbcc6cdc6ed186d0f2
2015-06-02 14:00:47 -04:00
|
|
|
args 'edu.wpi.first.wpilibj.hal.NotifierJNI'
|
Gradle Build
This adds gradle support for building wpilibj and wpilibc. At this
point, both of these libraries should be fully ready to go.
Gradle should give us a number of improvements, including less
dependencies for getting building up and running, and MUCH faster build
times. I'm noticing significantly faster build times already compared to
Maven, with neither system building the plugins. The changes here should
be pretty straight forward. The basic command for gradle is './gradlew'.
This is the gradle wrapper, and it will find and download the correct
gradle executable for your system. There is no need to install anything
yourself. To see every task available, run './gradlew tasks'. The
important tasks for us are listed under the WPILib header when the tasks
command is run. To generate unit test binaries, the
fRCUserProgramExecutable command will create the C++ tester, and the
wpilibjIntegrationTestJar command will create the Java tester. The Jenkins
deploy scripts have been modified to know the difference between maven
generated and gradle generated jars with an environment variable. Creating
the eclipse plugins still requires Maven, but gradle will handle calling
it correctly and generating the proper dependencies for it. Create the
plugins by calling ./gradlew eclipsePlugins.
Jenkins can now be modified to support the new build system. Unit tests
are run with ./gradlew test. Generating the integration tests uses the
above two commands, and then process proceeds exactly as it did before.
For publishing documentation, a new task has been created, ./gradlew
publishDocs, which handles putting the documentation where Jenkins expects
for publishing.
Change-Id: I9a260d391984f98ef9170993efe933e4026161dc
2015-05-05 09:54:14 -04:00
|
|
|
args 'edu.wpi.first.wpilibj.hal.PWMJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.RelayJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.SPIJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.SolenoidJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.CompressorJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.PDPJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.PowerJNI'
|
|
|
|
|
args 'edu.wpi.first.wpilibj.hal.SerialPortJNI'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
clean {
|
|
|
|
|
delete generatedJNIHeaderLoc
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Ensures that the JNI headers have been downloaded and are in the correct location for generating the JNI build
|
|
|
|
|
task verifyJre {
|
|
|
|
|
description = 'Verifies that the ARM JDK is downloaded in the user directory'
|
|
|
|
|
group = 'WPILib'
|
|
|
|
|
def outputFolder = new File(jdkLocation)
|
|
|
|
|
outputs.file outputFolder
|
|
|
|
|
doLast {
|
|
|
|
|
if (!outputFolder.exists() && !outputFolder.isDirectory()) {
|
|
|
|
|
def errorMessage = 'The ARM JDK was not found. Please install the JDK in the following location:' +
|
|
|
|
|
System.lineSeparator() + jdkLocation +
|
|
|
|
|
System.lineSeparator() + 'You can download the JDK here:' +
|
|
|
|
|
System.lineSeparator() + jdkDownloadSite
|
|
|
|
|
throw new GradleException(errorMessage)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|