From 08d06bd22f58f5a68a347dd23f60e86fac7241c1 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 19 Jan 2014 19:57:48 -0500 Subject: [PATCH 1/3] Updated parent pom properties to be correct --- networktables/cpp/include/pom.xml | 1 + wpilibc/Athena/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/networktables/cpp/include/pom.xml b/networktables/cpp/include/pom.xml index 8a59aa3944..f428d04533 100644 --- a/networktables/cpp/include/pom.xml +++ b/networktables/cpp/include/pom.xml @@ -10,6 +10,7 @@ edu.wpi.first.wpilib.templates include 0.1.0-SNAPSHOT + ../../../maven-utilities/include diff --git a/wpilibc/Athena/pom.xml b/wpilibc/Athena/pom.xml index fd2b51d484..2a9b3361c6 100644 --- a/wpilibc/Athena/pom.xml +++ b/wpilibc/Athena/pom.xml @@ -10,6 +10,7 @@ edu.wpi.first.wpilib.templates.athena static-library 0.1.0-SNAPSHOT + ../../maven-utilities/athena/static-library From 155af596686a877a83e803bbdbab9928a67ff527 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 19 Jan 2014 20:00:03 -0500 Subject: [PATCH 2/3] Replaced hardcoded JDK include path with property --- wpilibj/wpilibJavaJNI/pom.xml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/wpilibj/wpilibJavaJNI/pom.xml b/wpilibj/wpilibJavaJNI/pom.xml index 6520ee338d..cd431a14ab 100644 --- a/wpilibj/wpilibJavaJNI/pom.xml +++ b/wpilibj/wpilibJavaJNI/pom.xml @@ -50,6 +50,31 @@ + + org.apache.maven.plugins + maven-enforcer-plugin + 1.3.1 + + + enforce-property + + enforce + + + + + edu.wpi.first.wpilibj.wpilibJavaJNI.embeddedJDKIncludePath + 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 + + + true + + + + org.codehaus.mojo native-maven-plugin @@ -57,7 +82,7 @@ true linux - C:\Users/charris/embeddedJDK/jdk-7u45-linux-arm-vfp-sflt/jdk1.7.0_45/include + ${edu.wpi.first.wpilibj.wpilibJavaJNI.embeddedJDKIncludePath} src/main/native From 6a87f90574d4845d49a5603b9d8ad8d15bface2b Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 19 Jan 2014 20:18:14 -0500 Subject: [PATCH 3/3] Updated references to static-library --- hal/Athena/pom.xml | 2 +- hal/AthenaXX/pom.xml | 1 + hal/Azalea/pom.xml | 2 +- networktables/cpp/Athena/pom.xml | 2 +- networktables/cpp/Azalea/pom.xml | 1 + wpilibc/Athena/pom.xml | 2 +- wpilibc/Azalea/pom.xml | 1 + 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hal/Athena/pom.xml b/hal/Athena/pom.xml index 51dc45acc5..6ed9ec6260 100644 --- a/hal/Athena/pom.xml +++ b/hal/Athena/pom.xml @@ -10,7 +10,7 @@ edu.wpi.first.wpilib.templates.athena static-library 0.1.0-SNAPSHOT - ../../maven-utilities/athena/static-library + ../../maven-utilities/athena/static-library/pom.xml diff --git a/hal/AthenaXX/pom.xml b/hal/AthenaXX/pom.xml index ea45821c8c..6aa8cb159f 100644 --- a/hal/AthenaXX/pom.xml +++ b/hal/AthenaXX/pom.xml @@ -10,6 +10,7 @@ edu.wpi.first.wpilib.templates.athena static-library 0.1.0-SNAPSHOT + ../../maven-utilities/Athena/static-library/pom.xml diff --git a/hal/Azalea/pom.xml b/hal/Azalea/pom.xml index aa36af20a3..8e12998fe1 100644 --- a/hal/Azalea/pom.xml +++ b/hal/Azalea/pom.xml @@ -10,7 +10,7 @@ edu.wpi.first.wpilib.templates.azalea static-library 0.1.0-SNAPSHOT - ../../maven-utilities/azalea/static-library + ../../maven-utilities/azalea/static-library/pom.xml diff --git a/networktables/cpp/Athena/pom.xml b/networktables/cpp/Athena/pom.xml index b2edaab052..951687464b 100644 --- a/networktables/cpp/Athena/pom.xml +++ b/networktables/cpp/Athena/pom.xml @@ -10,7 +10,7 @@ edu.wpi.first.wpilib.templates.athena static-library 0.1.0-SNAPSHOT - ../../maven-utilities/athena/static-library + ../../maven-utilities/athena/static-library/pom.xml diff --git a/networktables/cpp/Azalea/pom.xml b/networktables/cpp/Azalea/pom.xml index 814bf4ffa0..b5e90f216d 100644 --- a/networktables/cpp/Azalea/pom.xml +++ b/networktables/cpp/Azalea/pom.xml @@ -10,6 +10,7 @@ edu.wpi.first.wpilib.templates.azalea static-library 0.1.0-SNAPSHOT + ../../../maven-utilities/azalea/static-library/pom.xml diff --git a/wpilibc/Athena/pom.xml b/wpilibc/Athena/pom.xml index 2a9b3361c6..61bcb1fbbe 100644 --- a/wpilibc/Athena/pom.xml +++ b/wpilibc/Athena/pom.xml @@ -10,7 +10,7 @@ edu.wpi.first.wpilib.templates.athena static-library 0.1.0-SNAPSHOT - ../../maven-utilities/athena/static-library + ../../maven-utilities/athena/static-library/pom.xml diff --git a/wpilibc/Azalea/pom.xml b/wpilibc/Azalea/pom.xml index 6adfabcaf4..ea4e02d330 100644 --- a/wpilibc/Azalea/pom.xml +++ b/wpilibc/Azalea/pom.xml @@ -10,6 +10,7 @@ edu.wpi.first.wpilib.templates.azalea static-library 0.1.0-SNAPSHOT + ../../maven-utilities/Azalea/static-library/pom.xml