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 2005/12/04 19:29:27 UTC
svn commit: r353881 - /tomcat/container/branches/tc4.1.x/build.xml
Author: markt
Date: Sun Dec 4 10:29:25 2005
New Revision: 353881
URL: http://svn.apache.org/viewcvs?rev=353881&view=rev
Log:
Update to remove all references to Jasper 1.
Modified:
tomcat/container/branches/tc4.1.x/build.xml
Modified: tomcat/container/branches/tc4.1.x/build.xml
URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/build.xml?rev=353881&r1=353880&r2=353881&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Sun Dec 4 10:29:25 2005
@@ -21,9 +21,13 @@
<property name="jtc.final-src.name" value="${jtc.project}-${version}-src" />
<property name="servlet.doc" value="${servlet.home}/docs/api" />
+ <!-- Source dependencies -->
+ <property name="jasper.home" value="${basedir}/../jasper/jasper2"/>
+ <property name="jtc.home" value="${basedir}/../connectors"/>
+
<!-- Build Defaults -->
<property name="catalina.build" value="${basedir}/catalina/build"/>
- <property name="jasper.build" value="${basedir}/jasper/build"/>
+ <property name="jasper.build" value="${jasper.home}/build"/>
<property name="javaservice.home" value="../javaservice"/>
<property name="nsis.home" value="c:\program files\nsis"/>
<property name="servlet.home" value="${basedir}/../servletapi/dist"/>
@@ -33,11 +37,6 @@
<property name="webapps.dist" value="${basedir}/webapps/dist"/>
- <!-- Source dependencies -->
- <property name="jasper.home" value="${basedir}/../jasper/jasper2"/>
- <property name="jtc.home" value="${basedir}/../connectors"/>
-
-
<!-- =================== DETECT: Display configuration ================== -->
<target name="detect"
description="Display configuration and conditional compilation flags">
@@ -224,13 +223,14 @@
<fileset dir="${basedir}">
<exclude name="**/build/**"/>
<exclude name="**/dist/**"/>
- <exclude name="jasper/**"/>
<exclude name="build.properties"/>
</fileset>
</copy>
<mkdir dir="${tomcat.dist}/src/jasper"/>
<copy todir="${tomcat.dist}/src/jasper">
- <fileset dir="${jasper.home}"/>
+ <fileset dir="${jasper.home}">
+ <exclude name="**/build/**"/>
+ </fileset>
</copy>
<mkdir dir="${tomcat.dist}/jtc-src"/>
<copy todir="${tomcat.dist}/jtc-src">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org