You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/06/16 15:12:45 UTC
svn commit: r1602860 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: markt
Date: Mon Jun 16 13:12:45 2014
New Revision: 1602860
URL: http://svn.apache.org/r1602860
Log:
Make sure tests for classes in the examples webapp can be run from the command line
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1602858
Modified: tomcat/tc7.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1602860&r1=1602859&r2=1602860&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Mon Jun 16 13:12:45 2014
@@ -949,7 +949,7 @@
</xslt>
</target>
- <target name="deploy" depends="package,build-docs"
+ <target name="deploy" depends="package,build-docs,compile-webapp-examples"
description="Default. Builds a working Tomcat instance">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
@@ -1008,7 +1008,28 @@
<filterset refid="version.filters"/>
</copy>
+ <!-- Add sources for examples -->
+ <antcall target="examples-sources" />
+
+ <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
+ failonerror="false"/>
+ <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
+
+ <!-- build the jdbc-pool jar and source jar-->
+ <echo message="Building Tomcat JDBC pool libraries"/>
+ <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+ inheritall="false" target="build">
+ <property name="tomcat.pool" value="${tomcat.pool}" />
+ <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
+ <property name="skip.download" value="set"/>
+ </ant>
+ <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+ </target>
+
+ <target name="compile-webapp-examples" >
+
<!-- Build classes for examples webapp -->
+ <mkdir dir="${tomcat.build}/webapps/examples/WEB-INF/classes"/>
<javac srcdir="webapps/examples/WEB-INF/classes"
destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"
debug="${compile.debug}" deprecation="${compile.deprecation}"
@@ -1020,6 +1041,7 @@
includeantruntime="false">
</javac>
+ <mkdir dir="${tomcat.build}/webapps/examples/jsp/plugin/applet"/>
<javac srcdir="webapps/examples/jsp/plugin/applet"
destdir="${tomcat.build}/webapps/examples/jsp/plugin/applet"
debug="${compile.debug}" deprecation="${compile.deprecation}"
@@ -1030,23 +1052,6 @@
encoding="ISO-8859-1"
includeantruntime="false">
</javac>
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-
- <!-- build the jdbc-pool jar and source jar-->
- <echo message="Building Tomcat JDBC pool libraries"/>
- <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
- inheritall="false" target="build">
- <property name="tomcat.pool" value="${tomcat.pool}" />
- <property name="tomcat.juli.jar" value="${tomcat-juli.jar}" />
- <property name="skip.download" value="set"/>
- </ant>
- <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
</target>
<target name="build-tomcat-jdbc-src">
@@ -1254,18 +1259,20 @@
</target>
- <target name="test-compile" depends="compile,download-test-compile" >
+ <target name="test-compile" depends="compile,download-test-compile,compile-webapp-examples" >
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
+ target="${compile.target}"
encoding="ISO-8859-1"
includeantruntime="false">
<classpath refid="tomcat.test.classpath" />
<include name="org/apache/**" />
<include name="javax/**" />
+ <include name="util/**" />
<exclude unless="java.7.home" name="org/apache/catalina/websocket/**" />
<exclude unless="java.7.home" name="org/apache/tomcat/websocket/**" />
</javac>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org