From 86c5b3bce04cda687a004e5e13532c111fe0ddf8 Mon Sep 17 00:00:00 2001 From: Michael Lipp Date: Fri, 4 Mar 2016 13:42:06 +0100 Subject: [PATCH 1/3] Synchronized with origin --- .../resources/com/neuronrobotics/nrjavaserial/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties b/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties index 9a34e767..dd1c83e5 100644 --- a/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties +++ b/src/main/resources/com/neuronrobotics/nrjavaserial/build.properties @@ -1,3 +1,3 @@ app.name = nrjavaserial -app.version = 3.11.0 +app.version = 3.12.0 app.javac.version = 1.6 From c4f6b07466cc66b575f425e09c82709818df4dad Mon Sep 17 00:00:00 2001 From: Michael Lipp Date: Fri, 4 Mar 2016 14:05:18 +0100 Subject: [PATCH 2/3] Fixed ARM library order. Fixes https://github.com/NeuronRobotics/nrjavaserial/issues/47. --- src/main/java/gnu/io/NativeResource.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/gnu/io/NativeResource.java b/src/main/java/gnu/io/NativeResource.java index f2e5cfdd..440913f2 100644 --- a/src/main/java/gnu/io/NativeResource.java +++ b/src/main/java/gnu/io/NativeResource.java @@ -40,7 +40,7 @@ private void inJarLoad(String name)throws UnsatisfiedLinkError, NativeResourceEx loadResource(resourceLocation); testNativeCode(); } - private String[] armLibs = {"libNRJavaSerialv5","libNRJavaSerialv6_HF","libNRJavaSerialv6","libNRJavaSerial_HF","libNRJavaSerial"}; + private String[] armLibs = {"libNRJavaSerial_HF","libNRJavaSerial","libNRJavaSerialv6_HF","libNRJavaSerialv6","libNRJavaSerialv5"}; private void loadLib(String name) throws NativeResourceException { String libName = name.substring(name.indexOf("lib")+3); @@ -139,7 +139,21 @@ private void loadResource(File resource) { if(!resource.canRead()) throw new RuntimeException("Cant open JNI file: "+resource.getAbsolutePath()); //System.out.println("Loading: "+resource.getAbsolutePath()); + try { + System.out.println("Going to load " + resource + ". Hit return..."); + System.in.read(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } System.load(resource.getAbsolutePath()); + try { + System.out.println("Loaded successfully, hit return..."); + System.in.read(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } private void copyResource(InputStream io, File file) throws IOException { From b14e40d9eddbea40ef8936c755a0586ae6f863a5 Mon Sep 17 00:00:00 2001 From: Michael Lipp Date: Fri, 4 Mar 2016 14:57:15 +0100 Subject: [PATCH 3/3] Removed debug output. --- src/main/java/gnu/io/NativeResource.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/java/gnu/io/NativeResource.java b/src/main/java/gnu/io/NativeResource.java index 440913f2..93cba441 100644 --- a/src/main/java/gnu/io/NativeResource.java +++ b/src/main/java/gnu/io/NativeResource.java @@ -139,21 +139,7 @@ private void loadResource(File resource) { if(!resource.canRead()) throw new RuntimeException("Cant open JNI file: "+resource.getAbsolutePath()); //System.out.println("Loading: "+resource.getAbsolutePath()); - try { - System.out.println("Going to load " + resource + ". Hit return..."); - System.in.read(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } System.load(resource.getAbsolutePath()); - try { - System.out.println("Loaded successfully, hit return..."); - System.in.read(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } } private void copyResource(InputStream io, File file) throws IOException {