DERBY-7028: Put module diagrams in different directories, depending on whether the javadoc is being built by JDK 11 or pre JDK 11; commit derby-7028-01-aa-jdkSpecificImageLocations.diff.
git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1851719 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index a64b68b..3c215be 100644
--- a/build.xml
+++ b/build.xml
@@ -117,6 +117,7 @@
<property file="${state.file}"/>
<property file="${properties.dir}/sane${sanity}.properties"/>
<antcall target="setissane"/>
+ <available property="atLeastJava11" classname="java.lang.invoke.ConstantBootstraps"/>
<property name="init.done" value="true"/>
</target>
@@ -1120,12 +1121,45 @@
todir="${public.api.dir}/resources"/>
<!-- Copy the module diagrams used by the overview -->
- <copy todir="${public.api.dir}/resources">
- <fileset dir="${javadoctools.dir}/moduleDiagrams"/>
- </copy>
+ <antcall target="copyJava9ModuleDiagrams"><param name="svg.dir" value="${public.api.dir}"/></antcall>
+ <antcall target="copyJava11ModuleDiagrams"><param name="svg.dir" value="${public.api.dir}"/></antcall>
</target>
+ <!-- Copy module diagrams to the correct place for Java 9 and Java 10 -->
+ <target name="copyJava9ModuleDiagrams" unless="atLeastJava11">
+ <copy todir="${svg.dir}">
+ <fileset dir="${javadoctools.dir}/moduleDiagrams"/>
+ </copy>
+ </target>
+
+ <!-- Copy module diagrams to the correct place for Java 11 -->
+ <target name="copyJava11ModuleDiagrams" if="atLeastJava11">
+ <copy file="${javadoctools.dir}/moduleDiagrams/client.svg"
+ todir="${svg.dir}/org.apache.derby.client"/>
+ <copy file="${javadoctools.dir}/moduleDiagrams/commons.svg"
+ todir="${svg.dir}/org.apache.derby.commons"/>
+ <copy file="${javadoctools.dir}/moduleDiagrams/engine.svg"
+ todir="${svg.dir}/org.apache.derby.engine"/>
+ <copy file="${javadoctools.dir}/moduleDiagrams/optionaltools.svg"
+ todir="${svg.dir}/org.apache.derby.optionaltools"/>
+ <copy file="${javadoctools.dir}/moduleDiagrams/runner.svg"
+ todir="${svg.dir}/org.apache.derby.runner"/>
+ <copy file="${javadoctools.dir}/moduleDiagrams/server.svg"
+ todir="${svg.dir}/org.apache.derby.server"/>
+ <copy file="${javadoctools.dir}/moduleDiagrams/tools.svg"
+ todir="${svg.dir}/org.apache.derby.tools"/>
+
+ <available property="test.javadoc.exists" file="${svg.dir}/org.apache.derby.tests"/>
+ <antcall target="copyJava11testModuleDiagram"/>
+
+ </target>
+
+ <!-- Copy module diagram for the tests module to the correct place for Java 11 -->
+ <target name="copyJava11testModuleDiagram" if="test.javadoc.exists">
+ <copy file="${javadoctools.dir}/moduleDiagrams/tests.svg"
+ todir="${svg.dir}/org.apache.derby.tests"/>
+ </target>
<target name="derbydocs" depends="initjars,set-doclint">
@@ -1156,9 +1190,12 @@
</exec>
<!-- Copy the module diagrams used by the module overviews -->
- <copy todir="${out.javadoc.dir}/engine/resources">
- <fileset dir="${javadoctools.dir}/moduleDiagrams"/>
- </copy>
+ <antcall target="copyJava9ModuleDiagrams">
+ <param name="svg.dir" value="${out.javadoc.dir}/engine"/>
+ </antcall>
+ <antcall target="copyJava11ModuleDiagrams">
+ <param name="svg.dir" value="${out.javadoc.dir}/engine"/>
+ </antcall>
</target>
diff --git a/java/org.apache.derby.client/module-info.java b/java/org.apache.derby.client/module-info.java
index 7a0b04d..b07f821 100644
--- a/java/org.apache.derby.client/module-info.java
+++ b/java/org.apache.derby.client/module-info.java
@@ -39,7 +39,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/client.svg"
+ * src="client.svg"
* alt="module diagram for org.apache.derby.client"
* border="2"
* />
diff --git a/java/org.apache.derby.commons/module-info.java b/java/org.apache.derby.commons/module-info.java
index a854bb9..a1dd4ae 100644
--- a/java/org.apache.derby.commons/module-info.java
+++ b/java/org.apache.derby.commons/module-info.java
@@ -28,7 +28,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/commons.svg"
+ * src="commons.svg"
* alt="module diagram for org.apache.derby.commons"
* border="2"
* />
diff --git a/java/org.apache.derby.engine/module-info.java b/java/org.apache.derby.engine/module-info.java
index 10ecec3..a38897a 100644
--- a/java/org.apache.derby.engine/module-info.java
+++ b/java/org.apache.derby.engine/module-info.java
@@ -48,7 +48,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/engine.svg"
+ * src="engine.svg"
* alt="module diagram for org.apache.derby.engine"
* border="2"
* />
diff --git a/java/org.apache.derby.optionaltools/module-info.java b/java/org.apache.derby.optionaltools/module-info.java
index efd055b..f59eb8f 100644
--- a/java/org.apache.derby.optionaltools/module-info.java
+++ b/java/org.apache.derby.optionaltools/module-info.java
@@ -50,7 +50,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/optionaltools.svg"
+ * src="optionaltools.svg"
* alt="module diagram for org.apache.derby.optionaltools"
* border="2"
* />
diff --git a/java/org.apache.derby.runner/module-info.java b/java/org.apache.derby.runner/module-info.java
index ebf941a..bd83b62 100644
--- a/java/org.apache.derby.runner/module-info.java
+++ b/java/org.apache.derby.runner/module-info.java
@@ -36,7 +36,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/runner.svg"
+ * src="runner.svg"
* alt="module diagram for org.apache.derby.runner"
* border="2"
* />
diff --git a/java/org.apache.derby.server/module-info.java b/java/org.apache.derby.server/module-info.java
index 9236d74..e3c9ddb 100644
--- a/java/org.apache.derby.server/module-info.java
+++ b/java/org.apache.derby.server/module-info.java
@@ -31,7 +31,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/server.svg"
+ * src="server.svg"
* alt="module diagram for org.apache.derby.server"
* border="2"
* />
diff --git a/java/org.apache.derby.tests/module-info.java b/java/org.apache.derby.tests/module-info.java
index d80dcfb..25da44e 100644
--- a/java/org.apache.derby.tests/module-info.java
+++ b/java/org.apache.derby.tests/module-info.java
@@ -28,7 +28,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/tests.svg"
+ * src="tests.svg"
* alt="module diagram for org.apache.derby.tests"
* border="2"
* />
diff --git a/java/org.apache.derby.tools/module-info.java b/java/org.apache.derby.tools/module-info.java
index 1287086..82790ce 100644
--- a/java/org.apache.derby.tools/module-info.java
+++ b/java/org.apache.derby.tools/module-info.java
@@ -46,7 +46,7 @@
*
* <div style="text-align:center;">
* <img
- * src="resources/tools.svg"
+ * src="tools.svg"
* alt="module diagram for org.apache.derby.tools"
* border="2"
* />
