projects / sixth-3d.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9fd4e40)
Restored JavaDoc support
authorSvjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Wed, 29 Jan 2020 21:31:15 +0000 (23:31 +0200)
committerSvjatoslav Agejenko <svjatoslav@svjatoslav.eu>
Wed, 29 Jan 2020 21:31:15 +0000 (23:31 +0200)
doc/index.html patch | blob | history
doc/index.org patch | blob | history
pom.xml patch | blob | history
tools/update web site patch | blob | history

diff --git a/doc/index.html b/doc/index.html
index 61695d4..04e076c 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <title>Sixth 3D - 3D engine</title>
-<!-- 2020-01-29 K 21:36 -->
+<!-- 2020-01-29 K 22:58 -->
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="generator" content="Org-mode">
@@ -242,6 +242,9 @@ git clone https://www2.svjatoslav.eu/git/sixth-3d.git
 
 </pre>
 </li>
+
+<li>See <a href="https://www3.svjatoslav.eu/projects/sixth-3d/apidocs/">JavaDoc</a>.
+</li>
 </ul>
 </div>
 </div>
@@ -340,6 +343,11 @@ operating systems.
 <div id="outline-container-sec-3" class="outline-2">
 <h2 id="sec-3"><span class="section-number-2">3</span> API documentation</h2>
 <div class="outline-text-2" id="text-3">
+<ul class="org-ul">
+<li>See <a href="https://www3.svjatoslav.eu/projects/sixth-3d/apidocs/">JavaDoc</a>.
+</li>
+</ul>
+
 <p>
 Note: due to a lack of time, there is still big room for improvement
 on documentation.
@@ -502,7 +510,7 @@ becomes visible.
 </div></div></div>
 <footer id="postamble" class="">
 <div><p class="author">Author: Svjatoslav Agejenko</p>
-<p class="date">Created: 2020-01-29 K 21:36</p>
+<p class="date">Created: 2020-01-29 K 22:58</p>
 <p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 26.1 (<a href="http://orgmode.org">Org-mode</a> 9.1.9)</p>
 </div>
 </footer>
diff --git a/doc/index.org b/doc/index.org
index 3176521..dddde5a 100644 (file)
--- a/doc/index.org
+++ b/doc/index.org
@@ -33,6 +33,8 @@
 - Clone Git repository using command:
   : git clone https://www2.svjatoslav.eu/git/sixth-3d.git
 
+- See [[https://www3.svjatoslav.eu/projects/sixth-3d/apidocs/][JavaDoc]].
+
 * Project description
 + See: [[https://www3.svjatoslav.eu/projects/sixth-3d-demos/][demos of current 3D engine capabilities]]
 
@@ -84,6 +86,8 @@ pixel.
   operating systems.
 
 * API documentation
+- See [[https://www3.svjatoslav.eu/projects/sixth-3d/apidocs/][JavaDoc]].
+
 Note: due to a lack of time, there is still big room for improvement
 on documentation.
 
diff --git a/pom.xml b/pom.xml
index e683361..00dc50e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,9 @@
     <description>3D engine</description>
 
     <properties>
+        <java.version>1.8</java.version>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -38,7 +41,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -61,6 +64,31 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.4</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- workaround for https://bugs.openjdk.java.net/browse/JDK-8212233 -->
+                    <javaApiLinks>
+                        <property>
+                            <name>foo</name>
+                            <value>bar</value>
+                        </property>
+                    </javaApiLinks>
+                    <!-- Workaround for https://stackoverflow.com/questions/49472783/maven-is-unable-to-find-javadoc-command -->
+                    <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/tools/update web site b/tools/update web site
index 14853a0..1c90821 100755 (executable)
--- a/tools/update web site
+++ b/tools/update web site
@@ -14,8 +14,8 @@ javainspect -j target/sixth-3d-*-SNAPSHOT.jar -d doc/graphs/ -n "raster engine"
 
 meviz index -w doc/graphs/ -t "Sixth 3D classes"
 
-#rm -rf doc/apidocs/
-#cp -r target/apidocs/ doc/
+rm -rf doc/apidocs/
+cp -r target/apidocs/ doc/
 
 rsync -avz --delete  -e 'ssh -p 10006' doc/ n0@www3.svjatoslav.eu:/mnt/big/projects/sixth-3d/
 
Unnamed repository; edit this file 'description' to name the repository.