stefano 2003/02/26 09:50:08
Modified: . build.xml
Log:
- removed unneeded stuff from the compile-scratchpad target
- restored the original wipe-all behavior of the 'clean' target
- introduced the new 'clean-cocoon' target that will remove only the cocoon-related
part of the build, leaving the webapp intact.
Revision Changes Path
1.338 +8 -40 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -r1.337 -r1.338
--- build.xml 26 Feb 2003 16:28:31 -0000 1.337
+++ build.xml 26 Feb 2003 17:50:08 -0000 1.338
@@ -145,7 +145,6 @@
<!-- Prepare the source -->
<target name="prepare-core" depends="prepare">
- <mkdir dir="${build.src}"/>
<mkdir dir="${build.dest}"/>
<mkdir dir="${build.mocks}"/>
</target>
@@ -192,7 +191,6 @@
<src>
<!-- [FIXME] THE DEPENDENCY ON DEPRECATED SHOULD GO AWAY!!!! -->
<path location="${deprecated.src}"/>
- <path location="${build.src}"/>
<path location="${java}"/>
</src>
</javac>
@@ -204,47 +202,14 @@
<mkdir dir="${build.scratchpad.dest}"/>
<available classpathref="classpath"
- property="ifx.driver.present"
- classname="com.informix.jdbc.IfxResultSet"/>
-
- <available classpathref="classpath"
- property="servlet23.present"
- classname="javax.servlet.http.HttpServletRequestWrapper"/>
-
- <available classpathref="classpath"
- property="mail.present"
- classname="javax.mail.Flags"/>
-
- <available classpathref="classpath"
- property="jxpath.present"
- classname="org.apache.commons.jxpath.JXPathContext"/>
-
- <available classpathref="classpath"
property="activation.present"
classname="javax.activation.DataSource"/>
<copy todir="${build.scratchpad.src}" filtering="on">
<fileset dir="${scratchpad.src}">
- <exclude name="**/Ifx*.java" unless="ifx.driver.present"/>
-
- <exclude name="**/components/request/**"
unless="servlet.present"/>
- <exclude name="**/precept/**"
unless="servlet.present"/>
- <exclude name="**/reading/ByteRangeResourceReader.java"
unless="servlet.present"/>
- <exclude name="**/acting/SourceMultiAction.java"
unless="servlet.present"/>
- <exclude name="**/acting/SourceUploadAction.java"
unless="servlet.present"/>
- <exclude name="**/generation/RequestAttribute**.java"
unless="servlet.present"/>
-
- <exclude name="**/jxpath/**" unless="jxpath.present"/>
- <exclude name="**/taglib/**" unless="jxpath.present"/>
- <exclude name="**/transformation/TagTransformer.java"
unless="jxpath.present"/>
-
- <exclude name="**/servlet/*Filter*.java" unless="servlet23.present"/>
-
<exclude name="**/components/axis/**" unless="activation.present"/>
<exclude name="**/reading/AxisRPCReader.java" unless="activation.present"/>
<exclude name="**/webservices/**" unless="activation.present"/>
-
- <exclude name="**/mail/**" unless="mail.present"/>
</fileset>
</copy>
@@ -904,19 +869,22 @@
<!-- Clean Targets ========================================================= -->
- <!-- Clean the build -->
- <target name="clean" depends="init">
+ <!-- Clean -->
+ <target name="clean" depends="clean-cocoon,clean-webapp" description="Cleans the
cocoon build and the webapp"/>
+
+ <!-- Clean the cocoon build -->
+ <target name="clean-cocoon" depends="init" description="Cleans the cocoon build">
<!-- Delete the build directory -->
<delete dir="${build}"/>
</target>
<!-- Clean the webapp -->
- <target name="clean-webapp" depends="init">
+ <target name="clean-webapp" depends="init" description="Cleans the webapp">
<delete dir="${build.webapp}"/>
</target>
<!-- Clean the distribution -->
- <target name="distclean" depends="clean,clean-webapp">
+ <target name="distclean" depends="clean" description="Cleans everything and
brings back to original 'CVS checkout' state">
<delete dir="${build.root}"/>
<delete dir="${tools.tasks}"/>
<delete file="${dist}/${Name}-${version}.tar.gz"/>
