From d2bbfe376da661498c1a1224309ab4fec85910b9 Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Fri, 24 Mar 2017 16:33:22 +0200 Subject: [PATCH] java: bypass version check for packages that don't have version specified Signed-off-by: Stefan Andritoiu Signed-off-by: Brendan Le Foll --- src/java/mraajava.i | 49 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/java/mraajava.i b/src/java/mraajava.i index 52d8e5f..36d8b62 100644 --- a/src/java/mraajava.i +++ b/src/java/mraajava.i @@ -97,33 +97,36 @@ class Spi; System.exit(1); } - String javaAPIVersion = mraa.class.getPackage().getSpecificationVersion(); - String nativeAPIVersion = mraa.getVersion().substring(1); + if((mraa.class.getPackage().getSpecificationVersion() != null) + && (mraa.getVersion() != null)){ + String javaAPIVersion = mraa.class.getPackage().getSpecificationVersion(); + String nativeAPIVersion = mraa.getVersion().substring(1); - String javaMajor = javaAPIVersion.substring(0, javaAPIVersion.indexOf('.')); - String nativeMajor = nativeAPIVersion.substring(0, nativeAPIVersion.indexOf('.')); + String javaMajor = javaAPIVersion.substring(0, javaAPIVersion.indexOf('.')); + String nativeMajor = nativeAPIVersion.substring(0, nativeAPIVersion.indexOf('.')); - if(Integer.parseInt(javaMajor) < Integer.parseInt(nativeMajor)){ - System.err.println("Java library is out of date. Please update the Java library."); - System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); - System.exit(1); - } - if(Integer.parseInt(javaMajor) > Integer.parseInt(nativeMajor)){ - System.err.println("Native library is out of date. Please update the Native library."); - System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); - System.exit(1); - } + if(Integer.parseInt(javaMajor) < Integer.parseInt(nativeMajor)){ + System.err.println("Java library is out of date. Please update the Java library."); + System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); + System.exit(1); + } + if(Integer.parseInt(javaMajor) > Integer.parseInt(nativeMajor)){ + System.err.println("Native library is out of date. Please update the Native library."); + System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); + System.exit(1); + } - String javaMinor = javaAPIVersion.substring(javaMajor.length() + 1, javaAPIVersion.indexOf('.', javaMajor.length() + 1)); - String nativeMinor = nativeAPIVersion.substring(nativeMajor.length() + 1, nativeAPIVersion.indexOf('.', nativeMajor.length() + 1)); + String javaMinor = javaAPIVersion.substring(javaMajor.length() + 1, javaAPIVersion.indexOf('.', javaMajor.length() + 1)); + String nativeMinor = nativeAPIVersion.substring(nativeMajor.length() + 1, nativeAPIVersion.indexOf('.', nativeMajor.length() + 1)); - if(Integer.parseInt(javaMinor) < Integer.parseInt(nativeMinor)){ - System.err.println("Java library is out of date. Please consider updating the Java library."); - System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); - } - if(Integer.parseInt(javaMinor) > Integer.parseInt(nativeMinor)){ - System.err.println("Native library is out of date. Please consider updating the Native library."); - System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); + if(Integer.parseInt(javaMinor) < Integer.parseInt(nativeMinor)){ + System.err.println("Java library is out of date. Please consider updating the Java library."); + System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); + } + if(Integer.parseInt(javaMinor) > Integer.parseInt(nativeMinor)){ + System.err.println("Native library is out of date. Please consider updating the Native library."); + System.err.println("Native library version is " + nativeAPIVersion + ". Java library version is " + javaAPIVersion + "."); + } } } %}