vgritsenko 02/04/13 21:14:57
Modified: . Tag: cocoon_2_0_3_branch build.xml
Log:
speed up webapp-local target
Revision Changes Path
No revision
No revision
1.196.2.1 +11 -9 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.196
retrieving revision 1.196.2.1
diff -u -r1.196 -r1.196.2.1
--- build.xml 28 Mar 2002 15:03:58 -0000 1.196
+++ build.xml 14 Apr 2002 04:14:57 -0000 1.196.2.1
@@ -1118,7 +1118,6 @@
configuration="${build.war}/WEB-INF/cocoon.xconf"/>
<!-- copy scratchpad webapp samples -->
- <mkdir dir="${build.war}"/>
<copy todir="${build.war}" filtering="on">
<fileset dir="${scratchpad.webapp}">
<exclude name="**/*.gif"/>
@@ -1133,7 +1132,6 @@
<include name="**/*.png"/>
</fileset>
</copy>
-
</target>
<!-- =================================================================== -->
@@ -1159,7 +1157,7 @@
<!-- =================================================================== -->
<!-- Prepares the libraries for the war package -->
<!-- =================================================================== -->
- <target name="prepare-webapp-libs" depends="package,prepare-tools-lib"
if="include.webapp.libs">
+ <target name="copy-webapp-libs" depends="copy-tools-lib" if="include.webapp.libs">
<copy todir="${build.war}/WEB-INF/lib">
<fileset dir="${lib.dir}/core">
<include name="*.jar"/>
@@ -1172,28 +1170,32 @@
<exclude name="servlet*.jar"/>
</fileset>
</copy>
+ </target>
+ <target name="prepare-webapp-libs" depends="package, copy-webapp-libs"
if="include.webapp.libs">
<copy file="${build.dir}/${name}.jar"
tofile="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
</target>
<!-- =================================================================== -->
<!-- Prepares the scratchpad libraries for the war package -->
<!-- =================================================================== -->
- <target name="prepare-scratchpad-libs" depends="prepare-webapp-libs"
if="include.scratchpad.libs">
+ <target name="copy-scratchpad-libs" depends="copy-webapp-libs"
if="include.scratchpad.libs">
<copy todir="${build.war}/WEB-INF/lib">
<fileset dir="${scratchpad.lib}">
<include name="*.jar"/>
<exclude name="servlet*.jar"/>
</fileset>
</copy>
+ </target>
+ <target name="prepare-scratchpad-libs" depends="copy-scratchpad-libs,
prepare-webapp-libs" if="include.scratchpad.libs">
<copy file="${build.dir}/${scratchpad.name}.jar"
tofile="${build.war}/WEB-INF/lib/${scratchpad.name}.jar"/>
</target>
<!-- =================================================================== -->
<!-- Copies the tools.jar to javac.jar in web-inf/lib -->
<!-- =================================================================== -->
- <target name="prepare-tools-lib" depends="package" if="tools.jar.present"
unless="pizza.present">
+ <target name="copy-tools-lib" depends="copy-webapp" if="tools.jar.present"
unless="pizza.present">
<!-- NOTE: java.home is normally set by the JVM to the /jre directory -->
<copy file="${tools.jar}" tofile="${build.war}/WEB-INF/lib/javac.jar"/>
</target>
@@ -1206,17 +1208,17 @@
<taskdef name="manifest-tool" classname="ManifestToolTask"
classpath="${tools.dir}/anttasks"/>
- <manifest-tool directory="${build.war}/WEB-INF/lib"
manifest="${build.war}/WEB-INF/Manifest.mf"/>
+ <manifest-tool directory="${build.war}/WEB-INF/lib"
+ manifest="${build.war}/WEB-INF/Manifest.mf"/>
+
<jar jarfile="${build.dir}/${name}.war" basedir="${build.war}" includes="**"
manifest="${build.war}/WEB-INF/Manifest.mf"/>
</target>
<!-- =================================================================== -->
<!-- Creates a local webapp directly useable as a servlet context -->
<!-- =================================================================== -->
- <target name="webapp-local" depends="prepare-webapp, prepare-webapp-scratchpad,
prepare-webapp-libs, prepare-scratchpad-libs"
+ <target name="webapp-local" depends="prepare-webapp, prepare-webapp-scratchpad,
copy-webapp-libs, copy-scratchpad-libs"
description="Generates a local webapp directory usable as servlet context for
quicker turn around">
- <delete file="${build.war}/WEB-INF/lib/${name}-${version}.jar"/>
- <delete file="${build.war}/WEB-INF/lib/${scratchpad.name}.jar"/>
<copy todir="${build.war}/WEB-INF/classes">
<fileset dir="${build.dest}"/>
<fileset dir="${build.scratchpad.dest}"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
