Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-25 01:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed networktables build

Browse Source 
using findAll form instead off whenAdded
fixed instances of network tables versions from 0.1.0 to 3.0.0

Change-Id: I01054d727259ea5dbf3ba8fae49764337d4f6cf9
This commit is contained in:
peter mitrano
2015-09-24 21:58:28 -04:00
parent 00f797a327
commit 75d9228f33
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eclipse-plugins/edu.wpi.first.wpilib.plugins.java/pom.xml
View File

@@ -86,7 +86,7 @@
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
<outputDirectory>${java-zip}/lib</outputDirectory>
<destFileName>NetworkTables-sources.jar</destFileName>
@@ -142,7 +142,7 @@
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</artifactItem>
<artifactItem>
@@ -309,7 +309,7 @@
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
@@ -347,7 +347,7 @@
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<!--<dependency>-->

25
wpilibc/build.gradle
View File

@@ -197,24 +197,25 @@ task wpilibcSimZip(type: Zip) {
// Add the dependency on the wpilib_nonsharedStaticLibrary task to the wpilibc task. Because of the gradle lifecycle,
// this cannot be done purely with dependsOn in the task, as the static library task doesn't exist yet. Same goes for
// the networkTablesStaticLibrary task and the two HAL tasks below
tasks.whenTaskAdded { task ->
if (task.name == 'wpilib_nonsharedStaticLibrary') {
wpilibcZip.dependsOn task
}
tasks.findAll {
it.name == 'wpilib_nonsharedStaticLibrary'
}.each {
wpilibcZip.dependsOn it
}
// Add the networktables static library as a dependency
project(':networktables:ntcore').tasks.whenTaskAdded { task ->
if (task.name == 'networkTablesStaticLibrary') {
wpilibcZip.dependsOn task
}
project(':networktables:ntcore').tasks.findAll {
it.name == 'armNtcoreStaticLibrary'
}.each {
wpilibcZip.dependsOn it
}
// Add the hal static and shared libraries as a dependency
project(':hal').tasks.whenTaskAdded { task ->
if (task.name == 'hALAthenaStaticLibrary' || task.name == 'hALAthenaSharedLibrary') {
wpilibcZip.dependsOn task
}
project(':hal').tasks.findAll {
it.name == 'hALAthenaStaticLibrary' || it.name == 'hALAthenaSharedLibrary'
}.each {
wpilibcZip.dependsOn it
}
// If doxygen exists on the command line, then add the doxygen task as dependency of the wpilibcZip task