This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.2.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 69d276c1f9a02064f611865407b233c7d4b57c7d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 29 18:05:25 2022 +0100
Remove static file filtering as the static files have been removed
---
build.xml | 80 ++++++++++++---------------------------------------------------
1 file changed, 15 insertions(+), 65 deletions(-)
diff --git a/build.xml b/build.xml
index 19da1f138..daeb4cc5b 100644
--- a/build.xml
+++ b/build.xml
@@ -18,7 +18,7 @@
<!-- Build file for Tomcat Native -->
<project name="Tomcat Native" default="compile" basedir=".">
<!-- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it
+ (and without typing -D each time it compiles it)
-->
<property file="${user.home}/.ant.properties" />
<property file="${user.home}/build.properties" />
@@ -40,26 +40,24 @@
<property name="final.name" value="${project}-${version}" />
- <property name="build.dir" value="./dist"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.dest" value="${build.dir}/classes"/>
- <property name="src.dir" value="."/>
- <property name="dist.root" value="./dist"/>
- <property name="ant.home" value="."/>
+ <property name="build.dir" value="./dist"/>
+ <property name="build.dest" value="${build.dir}/classes"/>
+ <property name="src.dir" value="."/>
+ <property name="dist.root" value="./dist"/>
+ <property name="ant.home" value="."/>
- <property name="docs.src" value="./xdocs"/>
- <property name="docs.dest" value="${dist.root}/doc"/>
- <property name="docs.dest.print" value="${dist.root}/doc/printable"/>
- <property name="test.dir" value="${build.dest}/test"/>
- <property name="examples.dir" value="${build.dest}/examples"/>
+ <property name="docs.src" value="./xdocs"/>
+ <property name="docs.dest" value="${dist.root}/doc"/>
+ <property name="test.dir" value="${build.dest}/test"/>
+ <property name="examples.dir" value="${build.dest}/examples"/>
- <property name="tc.library.path" value="${basedir}/native/.libs"/>
+ <property name="tc.library.path" value="${basedir}/native/.libs"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="java"/>
+ <property name="source.home" value="java"/>
<!-- Tests To Run -->
- <property name="test.name" value="**/Test*.java"/>
+ <property name="test.name" value="**/Test*.java"/>
<!-- Build classpath -->
<path id="classpath">
@@ -204,25 +202,7 @@ limitations under the License.-->">
<target name="compile" depends="prepare" description="Compile Java
sources">
<mkdir dir="${build.dest}"/>
<mkdir dir="${build.dest}/java"/>
- <mkdir dir="${build.src}"/>
- <mkdir dir="${build.src}/java"/>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
- <!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
- <copy todir="${build.src}/java" filtering="yes" encoding="ISO-8859-1">
- <fileset dir="${src.dir}/java">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <javac srcdir="${build.src}/java"
+ <javac srcdir="${src.dir}/java"
destdir="${build.dest}/java"
source="${compile.source}"
target="${compile.target}"
@@ -233,13 +213,6 @@ limitations under the License.-->">
includeantruntime="false">
<classpath refid="classpath"/>
</javac>
-
- <copy todir="${build.dest}/java" filtering="yes" encoding="ISO-8859-1">
- <fileset dir="${build.src}/java">
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
</target>
<!-- ================================================================== -->
@@ -270,24 +243,7 @@ limitations under the License.-->">
<target name="compile-tests" depends="compile" description="Compile Java
test classes">
<mkdir dir="${build.dest}"/>
<mkdir dir="${build.dest}/test"/>
- <mkdir dir="${build.src}"/>
- <mkdir dir="${build.src}/test"/>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
- <!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
- <copy todir="${build.src}/test" filtering="yes" encoding="ISO-8859-1">
- <fileset dir="${src.dir}/test">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- <javac srcdir="${build.src}/test"
+ <javac srcdir="${src.dir}/test"
destdir="${build.dest}/test"
source="${compile.source}"
target="${compile.target}"
@@ -298,12 +254,6 @@ limitations under the License.-->">
includeantruntime="false">
<classpath refid="test.classpath"/>
</javac>
- <copy todir="${build.dest}/test" filtering="yes" encoding="ISO-8859-1">
- <fileset dir="${build.src}/test">
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
</target>
<!-- ===================================================================
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
