Author: costin
Date: Sat Jun 14 09:06:06 2008
New Revision: 667826
URL: http://svn.apache.org/viewvc?rev=667826&view=rev
Log:
Changed the build file, 2 self-running jars are generated, one bundling jasper
and one with only precompiled-jsp support.
Modified:
tomcat/sandbox/tomcat-lite/build.xml
Modified: tomcat/sandbox/tomcat-lite/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-lite/build.xml?rev=667826&r1=667825&r2=667826&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-lite/build.xml (original)
+++ tomcat/sandbox/tomcat-lite/build.xml Sat Jun 14 09:06:06 2008
@@ -20,7 +20,7 @@
<!-- Used for 'download', to pack the dependent jars -->
<property name="tc.base" location="../.." />
- <property name="tc6.src" value="${tc.base}/tomcat6"/>
+ <property name="tc6.src" value="../../tomcat6"/>
<property name="tc6.classes" location="${tc6.src}/output/classes"/>
<property name="tc6.home" location="${tc6.src}/output/build"/>
<property name="classes" location="output/classes"/>
@@ -71,6 +71,7 @@
<include name ="org/apache/tomcat/servlets/file/**" />
<include name ="org/apache/tomcat/servlets/log/**" />
<include name ="org/apache/tomcat/servlets/sec/**" />
+ <include name ="org/apache/tomcat/servlets/jsp/**" />
<include name ="org/apache/tomcat/servlets/session/**" />
</javac>
@@ -115,7 +116,6 @@
deprecation="false"
debug="false" >
<src path="coyote-extensions" />
- <exclude name="**/SelectorThreadApr.java" />
<include name ="**" />
</javac>
@@ -142,8 +142,8 @@
includeJavaRuntime="false"
deprecation="false"
debug="false" >
- <src path="java" />
- <include name ="org/apache/tomcat/lite/**" />
+ <src path="webapps/addons-jasper/WEB-INF/src" />
+ <include name ="org/apache/tomcat/**" />
<classpath>
<pathelement path="webapps/addons-jasper/WEB-INF/lib/jsp-api.jar"/>
<pathelement path="webapps/addons-jasper/WEB-INF/lib/el-api.jar"/>
@@ -158,7 +158,6 @@
<delete dir="${classes}" includes="**"/>
</target>
-
<target name="tomcat-lite.jar" depends="compile,pack_tomcat-lite.jar"/>
<target name="pack_tomcat-lite.jar" >
@@ -182,30 +181,23 @@
</jar>
</target>
- <target name="jsp" depends="pack_tomcat-lite-jasper.jar"/>
+ <target name="jsp" depends="pack_tomcat-lite-jsp.jar"/>
- <target name="pack_tomcat-lite-jasper.jar" depends="compile.jsp">
+ <target name="pack_tomcat-lite-jsp.jar" depends="compile.jsp">
<jar destfile="output/tomcat-lite-jsp.jar"
manifest="resources/tomcat-lite.MF">
<zipfileset src="output/tomcat-lite.jar"/>
<zipfileset src="webapps/addons-jasper/WEB-INF/lib/jsp-api.jar"/>
<zipfileset src="webapps/addons-jasper/WEB-INF/lib/el-api.jar"/>
<zipfileset src="webapps/addons-jasper/WEB-INF/lib/jasper-el.jar"/>
- </jar>
- <jar destfile="output/tomcat-lite-jsp-compiler.jar"
manifest="resources/tomcat-lite.MF">
- <fileset dir="${classes}" >
- <include name ="org/apache/tomcat/servlets/jsp/Jsp**" />
- <include name ="org/apache/tomcat/servlets/jsp/Jasper**" />
- </fileset>
- <zipfileset src="output/tomcat-lite.jar"/>
- <zipfileset src="webapps/addons-jasper/WEB-INF/lib/jsp-api.jar"/>
- <zipfileset src="webapps/addons-jasper/WEB-INF/lib/el-api.jar"/>
- <zipfileset src="webapps/addons-jasper/WEB-INF/lib/jasper-el.jar"/>
<zipfileset src="webapps/addons-jasper/WEB-INF/lib/jasper.jar"/>
<zipfileset src="webapps/addons-jasper/WEB-INF/lib/jasper-jdt.jar"/>
+ <fileset dir="${classes}" >
+ <include name ="org/apache/tomcat/servlets/jsp/Jasper*" />
+ </fileset>
</jar>
</target>
- <target name="all" depends="tomcat-lite.jar" />
+ <target name="all" depends="tomcat-lite.jar,jsp" />
<!-- ============ Download targets for deps ================ -->
<target name="download"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
