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

Merge branch 'master' of ssh://charris@usfirst.collab.net:29418/allwpilib

Browse Source
This commit is contained in:
charris
2014-01-20 16:27:07 -05:00
parent 28848553a6 6a87f90574
commit f2746b7d41
9 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/Athena/pom.xml
View File

@@ -10,7 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.athena</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../maven-utilities/athena/static-library</relativePath>
<relativePath>../../maven-utilities/athena/static-library/pom.xml</relativePath>
</parent>
<repositories>

1
hal/AthenaXX/pom.xml
View File

@@ -10,6 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.athena</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../maven-utilities/Athena/static-library/pom.xml</relativePath>
</parent>
<repositories>

2
hal/Azalea/pom.xml
View File

@@ -10,7 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.azalea</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../maven-utilities/azalea/static-library</relativePath>
<relativePath>../../maven-utilities/azalea/static-library/pom.xml</relativePath>
</parent>
<repositories>

2
networktables/cpp/Athena/pom.xml
View File

@@ -10,7 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.athena</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../maven-utilities/athena/static-library</relativePath>
<relativePath>../../maven-utilities/athena/static-library/pom.xml</relativePath>
</parent>
<repositories>

1
networktables/cpp/Azalea/pom.xml
View File

@@ -10,6 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.azalea</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../../maven-utilities/azalea/static-library/pom.xml</relativePath>
</parent>
<repositories>

1
networktables/cpp/include/pom.xml
View File

@@ -10,6 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates</groupId>
<artifactId>include</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../../maven-utilities/include</relativePath>
</parent>
<repositories>

1
wpilibc/Athena/pom.xml
View File

@@ -10,6 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.athena</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../maven-utilities/athena/static-library/pom.xml</relativePath>
</parent>
<repositories>

1
wpilibc/Azalea/pom.xml
View File

@@ -10,6 +10,7 @@
<groupId>edu.wpi.first.wpilib.templates.azalea</groupId>
<artifactId>static-library</artifactId>
<version>0.1.0-SNAPSHOT</version>
<relativePath>../../maven-utilities/Azalea/static-library/pom.xml</relativePath>
</parent>
<repositories>

27
wpilibj/wpilibJavaJNI/pom.xml
View File

@@ -50,6 +50,31 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>
<execution>
<id>enforce-property</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireProperty>
<property>edu.wpi.first.wpilibj.wpilibJavaJNI.embeddedJDKIncludePath</property>
<message>Property 'edu.wpi.first.wpilibj.wpilibJavaJNI.embeddedJDKIncludePath' must be set
to the /include folder of a jdk-7u45-linux-arm-vfp-sflt JDK. You must use Java 7 u45.
This JDK for 'Linux ARM v6/v7 Soft Float ABI' may be downloaded from
http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-7u45-oth-JPR</message>
</requireProperty>
</rules>
<fail>true</fail>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId>
@@ -57,7 +82,7 @@
<extensions>true</extensions>
<configuration>
<javahOS>linux</javahOS>
<jdkIncludePath>C:\Users/charris/embeddedJDK/jdk-7u45-linux-arm-vfp-sflt/jdk1.7.0_45/include</jdkIncludePath>
<jdkIncludePath>${edu.wpi.first.wpilibj.wpilibJavaJNI.embeddedJDKIncludePath}</jdkIncludePath>
<sources>
<source>
<directory>src/main/native</directory>