adding more version-related variables

modules/java/generator/gen_java.py

@@ -739,8 +739,9 @@ public class %(jc)s {
             #    version_suffix = version_suffix[0 : -1]
             self.classes[class_name].imports.add("java.lang.String")
             self.java_code[class_name]["j_code"].write("""
-    public static final String VERSION = "%(v)s", VERSION_SUFFIX = "%(vs)s";
+    public static final String VERSION = "%(v)s", NATIVE_LIBRARY_NAME = "opencv_java%(vs)s";
-""" % { 'v' : version_str, 'vs' : version_suffix } )
+    public static final int VERSION_EPOCH = %(ep)s, VERSION_MAJOR = %(ma)s, VERSION_MINOR = %(mi)s, VERSION_PATCH = %(pa)s;
+""" % { 'v' : version_str, 'vs' : version_suffix, 'ep' : epoch, 'ma' : major, 'mi' : minor, 'pa' : patch } )
 
 
     def add_class(self, decl):

samples/java/ant/src/SimpleSample.java

@@ -5,7 +5,7 @@ import org.opencv.core.Scalar;
 
 class SimpleSample {
 
-  static{ System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX); }
+  static{ System.loadLibrary(Core.NATIVE_LIBRARY_NAME); }
 
   public static void main(String[] args) {
     System.out.println("Welcome to OpenCV " + Core.VERSION);

samples/java/eclipse/HelloCV/src/Main.java

@@ -6,7 +6,7 @@ public class Main {
 
     public static void main(String[] args) {
         System.out.println("Welcome to OpenCV " + Core.VERSION);
-        System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX);
+        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
         Mat m  = Mat.eye(3, 3, CvType.CV_8UC1);
         System.out.println("m = " + m.dump());
     }

samples/java/sbt/src/main/scala/Main.scala

@@ -15,7 +15,7 @@ object Main extends App {
   // We must load the native library before using any OpenCV functions.
   // You must load this library _exactly once_ per Java invocation.
   // If you load it more than once, you will get a java.lang.UnsatisfiedLinkError.
-  System.loadLibrary("opencv_java" + Core.VERSION_SUFFIX)
+  System.loadLibrary(Core.NATIVE_LIBRARY_NAME)
 
   ScalaCorrespondenceMatchingDemo.run()
   ScalaDetectFaceDemo.run()