Added javadoc generation

diff --git a/modules/core/misc/java/src/java/core+DMatch.java b/modules/core/misc/java/src/java/core+DMatch.java
index 12bd86e..db44d9a 100644 (file)
--- a/modules/core/misc/java/src/java/core+DMatch.java
+++ b/modules/core/misc/java/src/java/core+DMatch.java
@@ -45,9 +45,6 @@ public class DMatch {
         distance = _distance;
     }
 
-    /**
-     * Less is better.
-     */
     public boolean lessThan(DMatch it) {
         return distance < it.distance;
     }

diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index ed92e05..7994332 100644 (file)
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -345,7 +345,7 @@ else(ANDROID)
   list(APPEND step3_depends "${OpenCV_BINARY_DIR}/build.xml")
 
   add_custom_command(OUTPUT "${JAR_FILE}" "${JAR_FILE}.dephelper"
-                     COMMAND ${ANT_EXECUTABLE} -q -noinput -k jar
+                     COMMAND ${ANT_EXECUTABLE} -q -noinput -k jar javadoc
                      COMMAND ${CMAKE_COMMAND} -E touch "${JAR_FILE}.dephelper"
                      WORKING_DIRECTORY "${OpenCV_BINARY_DIR}"
                      DEPENDS ${step3_depends}

diff --git a/modules/java/build.xml.in b/modules/java/build.xml.in
index c1c1854..954ff62 100644 (file)
--- a/modules/java/build.xml.in
+++ b/modules/java/build.xml.in
@@ -2,6 +2,7 @@
 <!-- process, this config is used to package the autogenerated .java -->
 <!-- interface files into OpenCV.jar -->
 <project name="OpenCV">
+
   <target name="jar">
     <!-- This is to make a jar with a source attachment, for e.g. easy -->
     <!-- navigation in Eclipse. See this question: -->
@@ -10,7 +11,21 @@
       <include name="**/*.java"/>
       <compilerarg line="-encoding utf-8"/>
     </javac>
-
     <jar basedir="src" destfile="bin/@JAR_NAME@"/>
   </target>
+
+  <target name="javadoc">
+    <tstamp>
+      <format property="doctimestamp" pattern="EEE MMM d yyyy HH:mm:ss z"/>
+    </tstamp>
+    <javadoc
+      packagenames="org.opencv.*"
+      sourcepath="src"
+      destdir="doc/javadoc"
+      Windowtitle="OpenCV @OPENCV_VERSION_PLAIN@ Java documentation"
+      Doctitle="OpenCV Java documentation (@OPENCV_VERSION@)"
+      bottom="Generated on ${doctimestamp} / OpenCV @OPENCV_VCSVERSION@"
+      />
+  </target>
+
 </project>