You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2021/05/13 12:11:38 UTC
svn commit: r1889840 - /poi/trunk/build.xml
Author: centic
Date: Thu May 13 12:11:38 2021
New Revision: 1889840
URL: http://svn.apache.org/viewvc?rev=1889840&view=rev
Log:
Use proper module-name without "poi-" prefix when compiling module-java with Java 9+
Modified:
poi/trunk/build.xml
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1889840&r1=1889839&r2=1889840&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu May 13 12:11:38 2021
@@ -1059,14 +1059,22 @@ under the License.
</classpath>
</javac>
- <!-- compile jigsaw files to sources, so we don't forget to update/provide them for Java 8 builds -->
+ <local name="module-name"/>
+ <loadresource property="module-name">
+ <string>@{module}</string>
+ <filterchain>
+ <replacestring from="poi-" to=""/>
+ </filterchain>
+ </loadresource>
+
+ <!-- compile jigsaw files to sources, so we don't forget to update/provide them for Java 8 builds -->
<javac release="9"
srcdir="${basedir}/@{module}/src/main/java9"
destdir="${basedir}/@{module}/src/main/java9"
includeantruntime="false"
fork="true"
unless:true="${isJava8}">
- <compilerarg line="--patch-module org.apache.poi.@{module}=@{classes}"/>
+ <compilerarg line="--patch-module org.apache.poi.${module-name}=@{classes}"/>
<modulepath>
<lib/>
</modulepath>
@@ -1125,7 +1133,7 @@ under the License.
includeantruntime="false"
fork="true"
unless:true="${isJava8}" unless:blank="@{test}">
- <compilerarg line="--patch-module org.apache.poi.@{module}=${merged}"/>
+ <compilerarg line="--patch-module org.apache.poi.${module-name}=${merged}"/>
<modulepath>
<lib/>
</modulepath>
@@ -2185,6 +2193,14 @@ under the License.
<mkdir dir="@{src}/META-INF/versions/9"/>
+ <local name="module-name"/>
+ <loadresource property="module-name">
+ <string>@{module}</string>
+ <filterchain>
+ <replacestring from="poi-" to=""/>
+ </filterchain>
+ </loadresource>
+
<javac release="9"
srcdir="${basedir}/@{module}/src/main/java9"
destdir="@{src}/META-INF/versions/9"
@@ -2192,7 +2208,7 @@ under the License.
fork="true"
modulepath="${main.lib}"
unless:true="${isJava8}">
- <compilerarg line="--patch-module org.apache.poi.@{module}=@{src}"/>
+ <compilerarg line="--patch-module org.apache.poi.${module-name}=@{src}"/>
<elements/>
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org