Version 4 Image

Updated the HAL library to work with the new version 3 headers
from NI. There were multiple changes in this verison: more PWM
generators were added, so the functions for setting PWM signals have
been updated. UserWatchdog has been removed, and Watchdog has been
removed from WPILib to accomodate for this. Digital selection has been
consolidated to one function in the NI headers, so this has been updated
in the HAL. New SPI and I2C libraries have been added, but need to
be implemented in the HAL before they will work.
This commit is contained in:
Fredric Silberberg
2014-02-25 18:43:40 -05:00
committed by Brad Miller
parent b1ef116104
commit 4546abc8c5
238 changed files with 757 additions and 21785 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
@@ -14,37 +14,37 @@
</parent>
<dependencies>
<dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<testExcludes>
<exclude>edu/wpi/first/wpilibj/networktables2/system/SystemTest.java</exclude>
</testExcludes>
<testExcludes>
<exclude>edu/wpi/first/wpilibj/networktables2/system/SystemTest.java</exclude>
</testExcludes>
</configuration>
</plugin>
<plugin>
@@ -66,14 +66,14 @@
</execution>
</executions>
</plugin>
<plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,68 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<packaging>jar</packaging>
<version>0.1.0-SNAPSHOT</version>
<parent>
<groupId>edu.wpi.first.wpilib.templates.azalea</groupId>
<artifactId>library-jar</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../../maven-utilities/azalea/library-jar</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>com.sun.squawk</groupId>
<artifactId>runtime</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<testExcludes>
<exclude>edu/wpi/first/wpilibj/networktables2/system/SystemTest.java</exclude>
</testExcludes>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>../src/main/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,40 +0,0 @@
package edu.wpi.first.wpilibj.networktables2.stream;
import java.io.*;
import javax.microedition.io.*;
/**
* An object that will provide cRIO socket connections when a client connects to the server on the given port
*
* @author mwills
*
*/
public class SocketConnectionServerStreamProvider implements IOStreamProvider{
private final ServerSocketConnection server;
/**
* Create a new Stream provider that wraps a Socket Server on the given port
* @param port
* @throws IOException
*/
public SocketConnectionServerStreamProvider(final int port) throws IOException{
server = (ServerSocketConnection) Connector.open("socket://:" + port);
}
public IOStream accept() throws IOException {
SocketConnection socket = (SocketConnection) server.acceptAndOpen();
if(socket!=null){
socket.setSocketOption(SocketConnection.LINGER, 0);
return new SocketConnectionStream(socket);
}
return null;
}
public void close() throws IOException {
server.close();
}
}

View File

@@ -1,64 +0,0 @@
package edu.wpi.first.wpilibj.networktables2.stream;
import java.io.*;
import javax.microedition.io.*;
/**
* A socket connection on the cRIO
*
* @author mwills
*
*/
public class SocketConnectionStream implements IOStream{
private final SocketConnection socket;
private final InputStream is;
private final OutputStream os;
/**
* Create a new IOStream for a socket connection with the given host and port
* @param host
* @param port
* @throws IOException
*/
public SocketConnectionStream(final String host, final int port) throws IOException {
this((SocketConnection) Connector.open("socket://"+host+":"+port));
}
/**
* Create a new IOStream for a socket connection
* @param socket
* @throws IOException
*/
public SocketConnectionStream(final SocketConnection socket) throws IOException {
this.socket = socket;
is = socket.openInputStream();
os = socket.openOutputStream();
}
public InputStream getInputStream() {
return is;
}
public OutputStream getOutputStream() {
return os;
}
public void close() {
try{
is.close();
} catch(IOException e){
//just ignore and close the rest of the stream
}
try{
os.close();
} catch(IOException e){
//just ignore and close the rest of the stream
}
try{
socket.close();
} catch(IOException e){
//just ignore and assume socket is now closed
}
}
}

View File

@@ -1,30 +0,0 @@
package edu.wpi.first.wpilibj.networktables2.stream;
import java.io.*;
/**
*
* @author mwills
*
*/
public class SocketConnectionStreamFactory implements IOStreamFactory{
private final String host;
private final int port;
/**
* Create a new factory that will create socket connections with the given host and port
* @param host
* @param port
* @throws IOException
*/
public SocketConnectionStreamFactory(final String host, final int port) throws IOException {
this.host = host;
this.port = port;
}
public IOStream createStream() throws IOException {
return new SocketConnectionStream(host, port);
}
}

View File

@@ -1,32 +0,0 @@
package edu.wpi.first.wpilibj.networktables2.stream;
import java.io.*;
/**
* Static factory for socket stream factories and providers
*
* @author Mitchell
*
*/
public class SocketStreams {
/**
* Create a new IOStream factory
* @param host
* @param port
* @return a IOStreamFactory that will create Socket Connections on the given host and port
* @throws IOException
*/
public static IOStreamFactory newStreamFactory(final String host, final int port) throws IOException{
return new SocketConnectionStreamFactory(host, port);
}
/**
* Create a new IOStream provider
* @param port
* @return an IOStreamProvider for a socket server on the given port
* @throws IOException
*/
public static IOStreamProvider newStreamProvider(final int port) throws IOException {
return new SocketConnectionServerStreamProvider(port);
}
}

View File

@@ -1,47 +0,0 @@
package java.io;
public class BufferedInputStream extends InputStream{
private final InputStream source;
private byte[] buffer;
private int pos;//the next position to be read
private int maxPos;//the maximum valid position in the buffer + 1
public BufferedInputStream(InputStream source){
this(source, 8192);
}
public BufferedInputStream(InputStream source, int size){
this.source = source;
buffer = new byte[size];
pos = 0;
maxPos = 0;
}
private void fillBuffer() throws IOException {
int numRemaining = maxPos-pos;
System.arraycopy(buffer, pos, buffer, 0, numRemaining);
pos = 0;
maxPos = numRemaining;
int numRead = source.read(buffer, numRemaining, buffer.length-numRemaining);
maxPos += numRead;
}
public int read() throws IOException {
if(pos<maxPos)
return buffer[pos++]&0xFF;//cast to make sure not to return -1 and instead just return lowest byte of int
fillBuffer();
if(pos<maxPos)
return buffer[pos++]&0xFF;
return -1;
}
public int available() throws IOException{
return maxPos-pos+source.available();
}
public void close() throws IOException{
source.close();
}
}

View File

@@ -1,54 +0,0 @@
package java.io;
public class BufferedOutputStream extends OutputStream{
private final byte[] buffer;
private int pos;
private final OutputStream out;
public BufferedOutputStream(OutputStream out){
this(out, 8192);
}
public BufferedOutputStream(OutputStream out, int size){
this.out = out;
buffer = new byte[size];
pos = 0;
}
private void flushBuffer() throws IOException{
if(pos>0){
out.write(buffer, 0, pos);
pos = 0;
}
}
public void write(int b) throws IOException {
buffer[pos++] = (byte)b;
if(pos>=buffer.length)
flushBuffer();
}
public void write(byte b[], int off, int len) throws IOException {
if(len>=buffer.length){
flushBuffer();
out.write(b, off, len);
}
else{
if(len>=(buffer.length-pos))
flushBuffer();
System.arraycopy(b, off, buffer, pos, len);
pos += len;
}
}
public void flush() throws IOException{
flushBuffer();
out.flush();
}
public void close() throws IOException{
flushBuffer();
out.close();
}
}

View File

@@ -1,115 +0,0 @@
package edu.wpi.first.wpilibj.networktables2.system;
import edu.wpi.first.testing.*;
import edu.wpi.first.wpilibj.networktables2.server.*;
import edu.wpi.first.wpilibj.networktables2.stream.*;
import edu.wpi.first.wpilibj.tables.ITable;
import edu.wpi.first.wpilibj.tables.ITableListener;
import java.io.*;
public class SystemTest extends TestClass {
private static NetworkTableServer staticServer;
static{
try {
staticServer = new NetworkTableServer(SocketStreams.newStreamProvider(1735));
} catch (IOException ex) {
ex.printStackTrace();
}
}
NetworkTableServer server;
public void before() throws IOException{
server = staticServer;
staticServer.getEntryStore().clearEntries();
}
public void after(){
//server.close();
}
public void testSimpleBidirectionalPut() throws Exception{
sendMessage("server up");
waitMessage();//Client connected
System.out.println("client sent");
sleep(100);
assertEquals("CValue1-1", server.getString("ClientString1"));
assertEquals("CValue2-1", server.getString("ClientString2"));
server.putString("ServerString1", "SValue1-1");
server.putString("ServerString2", "SValue2-1");
sendMessage("server sent");
System.out.println("sent server");
waitMessage();//Client sent
System.out.println("client sent");
sleep(100);
assertEquals("CValue1-2", server.getString("ClientString1"));
assertEquals("CValue2-2", server.getString("ClientString2"));
server.putString("ServerString1", "SValue1-2");
server.putString("ServerString2", "SValue2-2");
sendMessage("server sent");
System.out.println("sent server");
waitMessage();//test complete
}
public void testRapidServerPutSingleKey() throws Exception{
sendMessage("server up");
waitMessage();//Client connected
for(int i = 0; i<10000; ++i)
server.putString("ServerKey", "SValue"+i);
sleep(100);
sendMessage("server done");
waitMessage();//test complete
}
public void testRapidServerPutMultiKey() throws Exception{
sendMessage("server up");
waitMessage();//Client connected
for(int i = 0; i<1000; ++i)
for(int j = 0; j<100; ++j)
server.putString("ServerKey"+j, "SValue"+i);
sleep(100);
sendMessage("server done");
waitMessage();//test complete
}
public void testPeriodicServerPutMultiKey() throws Exception{
sendMessage("server up");
waitMessage();//Client connected
for(int i = 0; i<100; ++i){
for(int j = 0; j<100; ++j)
server.putString("ServerKey"+j, "SValue"+i);
sleep(20);
}
sleep(100);
sendMessage("server done");
waitMessage();//test complete
}
public void testBiDirectionalStress() throws Exception{
server.addTableListener(new ITableListener() {
public void valueChanged(ITable source, String key, Object value, boolean isNew) {
int prefixIndex = key.indexOf("/client/");
if(prefixIndex == 0) {
String name = key.substring("/client/".length());
server.putDouble("/server/" + name, ((Double) value).doubleValue());
}
}
}, false);
sendMessage("Server ready");
waitMessage(); // Client connected
waitMessage(); // Client done
}
}

View File

@@ -1,48 +0,0 @@
<project name="Network_Tables_2.0 cRIO">
<!-- crio build properties -->
<property name="crio.build.dir" value="${build.dir}/crio" />
<property name="src.crio.build.dir" value="${build.dir}/crio-src" />
<property name="crio.dist.suffix" value="-crio" />
<property name="crio.dist.filename" value="${jar-base-name}${crio.dist.suffix}${jar-suffix}.jar" />
<property name="crio.src.dist.filename" value="${jar-base-name}${crio.dist.suffix}${jar-suffix}.src.zip" />
<path id="crio.source.path">
<fileset dir="${crio.src.dir}"/>
<fileset dir="${src.dir}"/>
</path>
<!-- crio build -->
<target name="build-crio">
<delete dir="${crio.build.dir}" />
<mkdir dir="${src.crio.build.dir}" />
<copy todir="${src.crio.build.dir}">
<path refid="crio.source.path" />
</copy>
<mkdir dir="${build.dir}/crio-resources/META-INF"/>
<manifest file="${build.dir}/crio-resources/META-INF/MANIFEST.MF">
<attribute name="Build-Number" value="${BUILD_NUMBER}"/>
<attribute name="Built-On" value="${BUILD_ID}"/>
<attribute name="Built-From" value="SVN r${SVN_REVISION}"/>
<attribute name="Build-Type" value="${BUILD_TYPE}"/>
<attribute name="Build-Target" value="cRIO"/>
</manifest>
<ant antfile="${sunspot.home}/build.xml">
<property name="src.dir" value="${src.crio.build.dir}"/>
<property name="resources.dir" value="${build.dir}/crio-resources"/>
<property name="build.dir" value="${crio.build.dir}"/>
<property name="app.jar.file" value="${dist.dir}/lib/${crio.dist.filename}"/>
<property name="app.src.zip.file" value="${dist.dir}/lib/${crio.src.dist.filename}"/>
<property name="preverify.exclude.library.jars" value="true"/>
<property name="alternate.networktables.archive" value=""/>
<target name="jar"/>
<target name="archive-source"/>
</ant>
</target>
</project>

View File

@@ -1,51 +0,0 @@
<project name="Network_Tables_2.0 Desktop">
<!-- desktop build properties -->
<property name="desktop.build.dir" value="${build.dir}/desktop" />
<property name="src.desktop.build.dir" value="${desktop.build.dir}/src" />
<property name="classes.desktop.build.dir" value="${desktop.build.dir}/classes" />
<property name="desktop.dist.suffix" value="-desktop" />
<property name="desktop.dist.filename" value="${jar-base-name}${desktop.dist.suffix}${jar-suffix}.jar" />
<property name="desktop.dist.jar.file" value="${dist.dir}/desktop-lib/${desktop.dist.filename}" />
<property name="desktop.src.dist.filename" value="${jar-base-name}${desktop.dist.suffix}${jar-suffix}.src.zip" />
<path id="desktop.source.path">
<fileset dir="${desktop.src.dir}"/>
<fileset dir="${src.dir}"/>
</path>
<!-- desktop build -->
<target name="build-desktop">
<!-- copy source -->
<mkdir dir="${src.desktop.build.dir}" />
<copy todir="${src.desktop.build.dir}">
<path refid="desktop.source.path" />
</copy>
<zip destfile="${dist.dir}/desktop-lib/${desktop.src.dist.filename}" basedir="${src.desktop.build.dir}"/>
<!-- compile source -->
<mkdir dir="${classes.desktop.build.dir}" />
<javac target="1.6" source="1.6" srcdir="${src.desktop.build.dir}" destdir="${classes.desktop.build.dir}" includeAntRuntime="false" >
<compilerarg value="-Xlint"/>
<compilerarg line="-Xlint:-serial"/>
<compilerarg line="-Xlint:-rawtypes"/>
</javac>
<!-- build desktop jar -->
<jar destfile="${desktop.dist.jar.file}" basedir="${classes.desktop.build.dir}" >
<manifest>
<attribute name="Build-Number" value="${BUILD_NUMBER}"/>
<attribute name="Built-On" value="${BUILD_ID}"/>
<attribute name="Built-From" value="SVN r${SVN_REVISION}"/>
<attribute name="Build-Type" value="${BUILD_TYPE}"/>
<attribute name="Build-Target" value="Desktop"/>
</manifest>
</jar>
</target>
</project>

View File

@@ -1,18 +0,0 @@
<project name="Network_Tables_2.0 Javadoc">
<!-- javadoc build properties -->
<property name="javadoc.dir" value="${desktop.build.dir}/javadoc" />
<target name="javadoc">
<mkdir dir="${javadoc.dir}" />
<javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" author="true" version="true" use="true" windowtitle="Network Tables 2.0">
<doctitle>
<![CDATA[
<h1>Network Tables 2.0</h1>
]]>
</doctitle>
</javadoc>
<zip destfile="${dist.dir}/desktop-lib/networktables-desktop.javadoc.zip" basedir="${javadoc.dir}" />
</target>
</project>

View File

@@ -1,47 +0,0 @@
<project name="Network_Tables_2.0 Test">
<!-- test build properties -->
<property name="test.build.dir" value="${build.dir}/test" />
<property name="classes.test.dir" value="${test.build.dir}/classes" />
<!-- test build -->
<target name="compile-test" depends="build-crio,build-desktop">
<mkdir dir="${classes.test.dir}" />
<javac target="1.6" source="1.6" srcdir="" destdir="${classes.test.dir}" includeAntRuntime="false" debug="true" >
<src path="${desktop.src.dir}"/>
<src path="${src.dir}"/>
</javac>
</target>
<target name="test" depends="compile-test">
<path path="${classes.test.dir}" id="tested-desktop-classpath"/>
<ant antfile="${sunspot.home}/test.xml">
<property name="sunspot.home" value="${sunspot.home}" />
<property name="crio.test.alternate.networktables.archive" value="${dist.dir}/lib/${crio.dist.filename}" />
<property name="test.build.dir" value="${test.build.dir}" />
<reference refid="tested-desktop-classpath"/>
<target name="test"/>
</ant>
</target>
<target name="test-desktop" depends="compile-test">
<path path="${classes.test.dir}" id="tested-desktop-classpath"/>
<ant antfile="${sunspot.home}/test.xml">
<property name="sunspot.home" value="${sunspot.home}" />
<property name="test.build.dir" value="${test.build.dir}" />
<reference refid="tested-desktop-classpath"/>
<target name="test-desktop"/>
</ant>
</target>
<target name="dist-tests">
<mkdir dir="${dist.dir}/tests" />
<zip destfile="${dist.dir}/tests/networktables.tests.zip">
<fileset dir="." includes="desktop-test/**"/>
<fileset dir="." includes="crio-test/**"/>
</zip>
</target>
</project>

View File

@@ -1,90 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Network Tables 2.0 Build script
by Mitchell Wills
mwills@wpi.edu
clean: clean
all: build everything
dist: just build the desktop and crio jars
desktop: build the desktop jar
crio: build the crio jar
javadoc: build the javadoc
test: run the junit test and instrument them with emma
-->
<project basedir="." name="Network_Tables_2.0" default="all">
<property file="${user.home}/.sunspotfrc.properties"/>
<target name="all" depends="clean,dist,test,javadoc" />
<target name="dist" depends="clean,build-desktop,build-crio,dist-tests" />
<!-- input folders -->
<property name="src.dir" value="src/common" />
<property name="crio.src.dir" value="src/crio" />
<property name="desktop.src.dir" value="src/desktop" />
<property name="test.dir" value="test" />
<property name="lib.dir" value="lib" />
<!-- output folders -->
<property name="build.dir" value="build" />
<property name="dist.dir" value="dist" />
<property name="jar-base-name" value="networktables" />
<property name="jar-suffix" value="" />
<import file="ant/crio.xml"/>
<import file="ant/desktop.xml"/>
<import file="ant/test.xml"/>
<import file="ant/javadoc.xml"/>
<!-- Import enviornment properties and set defaults -->
<property environment="env"/>
<condition property="BUILD_NUMBER" value="${env.BUILD_NUMBER}" else="LOCAL">
<isset property="env.BUILD_NUMBER"/>
</condition>
<tstamp>
<format property="BUILD_START" pattern="yyyy-MM-dd_hh-mm-ss" locale="en,US"/>
</tstamp>
<condition property="BUILD_ID" value="${env.BUILD_ID}" else="${BUILD_START}">
<isset property="env.BUILD_ID"/>
</condition>
<condition property="SVN_REVISION" value="${env.SVN_REVISION}" else="LOCAL">
<isset property="env.SVN_REVISION"/>
</condition>
<condition property="BUILD_TYPE" value="${env.BUILD_TYPE}" else="CUSTOM">
<isset property="env.BUILD_TYPE"/>
</condition>
<echo>Building NetworkTables 2.0</echo>
<echo>Build Number: ${BUILD_NUMBER}</echo>
<echo>Build Time: ${BUILD_ID}</echo>
<echo>SVN Revision: ${SVN_REVISION}</echo>
<echo>Build Type: ${BUILD_TYPE}</echo>
<!-- build targets -->
<target name="clean">
<delete dir="${build.dir}" />
<delete dir="${dist.dir}" />
</target>
</project>

View File

@@ -1,167 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- Generated dist files for the sunspotfrcsdk directory -->
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>dist-old</artifactId>
<packaging>pom</packaging>
<version>0.1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<!-- Fetch the dependencies needed to build the cpp.zip file. -->
<execution>
<id>fetch-sunspotfrcsdk-dependencies</id>
<phase>compile</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
<destFileName>networktables-crio.jar</destFileName>
<outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>javadoc</type>
<destFileName>networktables-crio-javadoc.jar</destFileName>
<outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<version>0.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
<destFileName>networktables-crio-sources.jar</destFileName>
<outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
<destFileName>networktables-desktop.jar</destFileName>
<outputDirectory>${project.build.directory}/dist/desktop-lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>javadoc</type>
<destFileName>networktables-desktop-javadoc.jar</destFileName>
<outputDirectory>${project.build.directory}/dist/desktop-lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
<destFileName>networktables-desktop-sources.jar</destFileName>
<outputDirectory>${project.build.directory}/dist/desktop-lib</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<!-- Add fake dependencies to inform Maven of the correct
order it should build projects in during a multi-module build.
This list should match the list in the invocation of
maven-dependency-plugin:copy above.
It may be possible to avoid this duplication by using the
maven-assembly-plugin instead.-->
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>javadoc</type>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTablesAzalea</artifactId>
<version>0.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>javadoc</type>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
<classifier>sources</classifier>
</dependency>
</dependencies>
<properties>
<!-- local-repository>C:/Users/wpilibj-buildmaster/maven-repository</local-repository-->
</properties>
<profiles>
<profile>
<id>jenkins</id>
<distributionManagement>
<repository>
<id>myrepository</id>
<url>file:${local-repository}</url>
</repository>
</distributionManagement>
</profile>
</profiles>
</project>

Binary file not shown.

View File

@@ -1,52 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wpi.first.wpilib.networktables</groupId>
<artifactId>java</artifactId>
<packaging>pom</packaging>
<version>0.1.0-SNAPSHOT</version>
<properties>
<!-- local-repository>C:/Users/wpilibj-buildmaster/maven-repository</local-repository-->
</properties>
<modules>
<module>Athena</module>
</modules>
<profiles>
<profile>
<id>jenkins</id>
<distributionManagement>
<repository>
<id>myrepository</id>
<url>file:${local-repository}</url>
</repository>
</distributionManagement>
</profile>
<profile>
<id>desktop</id>
<profile>
<id>desktop</id>
<activation>
<activeByDefault>true</activeByDefault>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>Athena</module>
</modules>
</profile>
<profile>
<id>athena</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>Athena</module>
</modules>
</profile>
<profile>
<id>azalea</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>Azalea</module>
<module>dist-old</module>
</modules>
</profile>
<modules>
<module>Athena</module>
</modules>
</profile>
</profiles>
</project>