This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f1a0d1a Move intermediate i18n build directory to the correct place.
f1a0d1a is described below
commit f1a0d1ae79e53aee2599f3f1cfb74f86ef8f0429
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Sep 10 16:11:37 2020 +0100
Move intermediate i18n build directory to the correct place.
---
build.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/build.xml b/build.xml
index a1f5860..c593a87 100644
--- a/build.xml
+++ b/build.xml
@@ -70,6 +70,7 @@
<property name="tomcat.embed.sources"
value="${tomcat.output}/embed-src-jars"/>
<property name="tomcat.extras" value="${tomcat.output}/extras"/>
<property name="tomcat.extras.sources"
value="${tomcat.output}/extras-src-jars"/>
+ <property name="tomcat.i18n" value="${tomcat.output}/i18n"/>
<property name="tomcat.manifests" value="${tomcat.output}/manifests"/>
<property name="tomcat.release" value="${tomcat.output}/release"/>
<property name="tomcat.src.jars" value="${tomcat.output}/src-jars"/>
@@ -228,7 +229,7 @@
<path id="tomcat.test.classpath">
<pathelement location="${test.basedir}/webapps/examples/WEB-INF/classes"/>
<pathelement location="${test.classes}"/>
- <pathelement location="${tomcat.build}/i18n"/>
+ <pathelement location="${tomcat.i18n}"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${hamcrest.jar}"/>
<pathelement location="${easymock.jar}"/>
@@ -541,7 +542,6 @@
<mkdir dir="${tomcat.build}"/>
<mkdir dir="${tomcat.build}/bin"/>
<mkdir dir="${tomcat.build}/conf"/>
- <mkdir dir="${tomcat.build}/i18n"/>
<mkdir dir="${tomcat.build}/lib"/>
<mkdir dir="${tomcat.build}/logs"/>
<mkdir dir="${tomcat.build}/temp"/>
@@ -723,7 +723,7 @@
after upgrading to Java 9+ as the minimum JRE and specifying the encoding
when loading the ResourceBundles -->
<native2ascii src="java" dest="${tomcat.classes}"
includes="**/LocalStrings.properties,**/Messages*.properties" encoding="UTF-8"/>
- <native2ascii src="java" dest="${tomcat.build}/i18n"
includes="**/LocalStrings_*.properties" encoding="UTF-8"/>
+ <native2ascii src="java" dest="${tomcat.i18n}"
includes="**/LocalStrings_*.properties" encoding="UTF-8"/>
</target>
@@ -879,7 +879,7 @@
<!-- i18n JARs -->
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_de.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -889,7 +889,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_es.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -899,7 +899,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_fr.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -909,7 +909,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_ja.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -919,7 +919,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ko.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_ko.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -929,7 +929,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ru.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_ru.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
@@ -939,7 +939,7 @@
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-zh-CN.jar"
manifest="${tomcat.manifests}/default.manifest">
- <fileset dir="${tomcat.build}/i18n">
+ <fileset dir="${tomcat.i18n}">
<include name="**/LocalStrings_zh_CN.properties" />
</fileset>
<zipfileset file="${tomcat.manifests}/default.notice"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
