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

Updated wpilibJavaJNI JDK include path to use default location in user's home directory

Browse Source
This commit is contained in:
Paul Malmsten
2014-01-26 13:17:00 -05:00
parent 2bdd95d722
commit 203debb460
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wpilibj/wpilibJavaJNI/pom.xml
View File

@@ -47,6 +47,11 @@
<pluginRepositories>
</pluginRepositories>
<properties>
<embeddedJDKHome>${user.home}/jdk-linux-arm-vfp-slft/jdk1.7.0_45</embeddedJDKHome>
<embeddedJDKIncludePath>${embeddedJDKHome}/include</embeddedJDKIncludePath>
</properties>
<build>
<plugins>
@@ -62,13 +67,15 @@
</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>
<requireFilesExist>
<files>
<file>${embeddedJDKIncludePath}</file>
</files>
<message>A copy of the 'Linux ARM v6/v7 Soft Float ABI' JDK must be extracted to '${embeddedJDKHome}' and
the folder '${embeddedJDKIncludePath}' must exist to build this module. You must use Java 7 u45. This JDK may be downloaded from
http://www.oracle.com/technetwork/java/javase/downloads/java-archive-downloads-javase7-521261.html#jdk-7u45-oth-JPR. To override
this default location, specify a value for the 'embeddedJDKHome' property at the command line, like 'mvn -DembeddedJDKHome=path/to/jdk'</message>
</requireFilesExist>
</rules>
<fail>true</fail>
</configuration>
@@ -82,7 +89,7 @@
<extensions>true</extensions>
<configuration>
<javahOS>linux</javahOS>
<jdkIncludePath>${edu.wpi.first.wpilibj.wpilibJavaJNI.embeddedJDKIncludePath}</jdkIncludePath>
<jdkIncludePath>${embeddedJDKIncludePath}</jdkIncludePath>
<sources>
<source>
<directory>src/main/native</directory>