Author: markt
Date: Thu Sep 12 08:56:49 2013
New Revision: 1522492
URL: http://svn.apache.org/r1522492
Log:
Ensure that only the web socket implementation classes are compiled with Java
7. This is done by making sure everything else is compiled first with Java 6.
Modified:
tomcat/tc7.0.x/trunk/build.xml
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1522492&r1=1522491&r2=1522492&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Sep 12 08:56:49 2013
@@ -572,8 +572,10 @@
</copy>
</target>
- <target name="compile"
-
depends="build-prepare,download-compile,compile-prepare,validate,compile-java7">
+ <target name="compile" depends="compile-java6,compile-java7" />
+
+ <target name="compile-java6"
+ depends="build-prepare,download-compile,compile-prepare,validate">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
@@ -604,10 +606,8 @@
</target>
- <target name="compile-java7"
- depends="build-prepare,download-compile,compile-prepare,validate"
- if="java.7.home" >
- <javac srcdir="java" destdir="${tomcat.classes}"
+ <target name="compile-java7" depends="compile-java6" if="java.7.home" >
+ <javac sourcepath="" srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
