Replace the use of doxygen by standard Javadoc tools for jniwrap.

OSGeo · Apr 27, 2018 · 1c1dc40 · 1c1dc40
1 parent f477d60
commit 1c1dc40
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1,736 deletions.
diff --git a/jniwrap/Makefile.am b/jniwrap/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = build.xml doxygen.cfg README.md
+EXTRA_DIST = build.xml README.md
 
 SUBDIRS	=	org
 

diff --git a/jniwrap/README.md b/jniwrap/README.md
@@ -49,12 +49,8 @@ Beyond the ones already put by Proj, you need:
 ### Documentation
 
 The documentation is held inside the code and can be retrieved by running
-doxygen inside the folder jniwrap. This will create the HTML format
-documentation inside of jniwrap/docs
-
-The standard way to achieve this is to use an Ant target:
-
-    ant do_make_help
+`ant javadoc` inside the folder `jniwrap`. This will create the HTML format
+documentation inside of `jniwrap/out/apidocs`
 
 
 

diff --git a/jniwrap/build.xml b/jniwrap/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<project name="Java bridge to Proj.4" default="compile" basedir=".">
+<project name="Proj bridge to Java" default="compile" basedir=".">
 
     <!-- *******************************************
              Set directory paths and versions.
@@ -8,6 +8,7 @@
     <property name="src-C"    value="../src"/>
     <property name="out"      value="out"/>
     <property name="classes"  value="${out}/classes"/>
+    <property name="javadoc"  value="${out}/apidocs"/>
     <property name="version"  value="5.1"/>
 
     <!-- *******************************************
@@ -33,23 +34,18 @@
     </target>
 
     <!-- **********************************************************
-             Execute doxygen help file and source file creation.
+             Build and create documentation.
          ********************************************************** -->
-    <target name="do_make_help">
-        <echo>Creating help files...</echo>
-        <exec dir="." executable="doxygen">
-            <arg line="doxygen.cfg"/>
-        </exec>
+    <target name="javadoc" depends="compile">
+        <javadoc sourcepath="${src-java}" classpath="${classes}" destdir="${javadoc}" encoding="UTF-8"
+                 noqualifier="all" windowtitle="Proj bridge to Java" author="false"/>
     </target>
 
     <!-- *******************************************
              Clean up everything.
          ******************************************* -->
     <target name="clean">
-        <echo>Cleaning up...</echo>
-        <delete dir="${classes}"/>
         <delete dir="${out}"/>
-        <delete dir="docs"/>
     </target>
 
 </project>