jumal 2003/01/26 06:35:27
Modified: . build.xml
Log:
Better support for jvm 1.4.
Does not copy xml parsers during dists when jvm 1.4 is present.
Revision Changes Path
1.178 +12 -5 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- build.xml 15 Jan 2003 16:36:54 -0000 1.177
+++ build.xml 26 Jan 2003 14:35:27 -0000 1.178
@@ -244,6 +244,9 @@
<available property="naming.present"
classname="org.apache.naming.NamingEntry" classpath="${naming.jar}"/>
<available property="resources.present"
classname="org.apache.naming.resources.Resource" classpath="${resources.jar}"/>
<available property="jdbc20ext.present" classname="javax.sql.DataSource"
classpath="${jdbc20ext.jar}"/>
+ <condition property="jvm14.present">
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
+ </condition>
<echo message="+-------------------------------------------------------"/>
<echo message="| Build environment for ${name} ${version}"/>
<echo message="| "/>
@@ -518,7 +521,7 @@
<!-- =================================================================== -->
<!-- Build a DAV client distribution -->
<!-- =================================================================== -->
- <target name="webdav-client-dist" depends="webdav-client,
webdav-client-dist-prepare,webdav-client-javadoc" description="Build the WebDAV client
library and command-line application">
+ <target name="webdav-client-dist" depends="webdav-client,
webdav-client-dist-prepare,webdav-client-javadoc,webdav-client-dist-xml"
description="Build the WebDAV client library and command-line application">
<copy todir="${webdavclient.dist}/bin">
<fileset dir="${webdavclient.build}/bin">
<include name="**/*.bat"/>
@@ -529,8 +532,6 @@
<replace file="${webdavclient.build}/classes/MANIFEST.MF"
token="$$VERSION$$" value="${version}"/>
<echo message="Copying libraries"/>
<copy todir="${webdavclient.dist}/lib" file="${antlr.jar}"/>
- <copy todir="${webdavclient.dist}/lib" file="${jaxp.jar}"/>
- <copy todir="${webdavclient.dist}/lib" file="${xmlapi.jar}"/>
<copy todir="${webdavclient.dist}/lib" file="${commons-httpclient.jar}"/>
<jar jarfile="${webdavclient.dist}/lib/commons-httpclient.jar"
basedir="${webdavclient.build}/classes"
manifest="${webdavclient.build}/classes/MANIFEST.MF"
includes="org/apache/commons/httpclient/**">
<metainf dir=".">
@@ -562,6 +563,10 @@
</metainf>
</jar>
</target>
+ <target name="webdav-client-dist-xml" unless="jvm14.present">
+ <copy todir="${webdavclient.dist}/lib" file="${jaxp.jar}"/>
+ <copy todir="${webdavclient.dist}/lib" file="${xmlapi.jar}"/>
+ </target>
<!-- =================================================================== -->
<!-- Build some examples -->
<!-- =================================================================== -->
@@ -628,7 +633,7 @@
<!-- =================================================================== -->
<!-- Build a Slide distribution -->
<!-- =================================================================== -->
- <target name="dist" depends="main, examples, tests, prepare-dist, doc,javadoc"
description="Make distribution of core components">
+ <target name="dist"
depends="main,examples,tests,prepare-dist,doc,javadoc,dist-xml" description="Make
distribution of core components">
<copy file="src/etc/MANIFEST.MF"
tofile="${slide.build}/classes/MANIFEST.MF"/>
<replace file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$"
value="${version}"/>
<copy todir="${slide.build}/classes">
@@ -673,10 +678,12 @@
<fileset dir="${slide.build}/lib"/>
</copy>
<copy todir="${slide.dist}/slide/lib" file="${jta.jar}"/>
+ <copy todir="${slide.dist}/slide/lib" file="${jdom.jar}"/>
+ </target>
+ <target name="dist-xml" unless="jvm14.present">
<copy todir="${slide.dist}/slide/lib" file="${jaxp.jar}"/>
<copy todir="${slide.dist}/slide/lib" file="${xmlapi.jar}"/>
<copy todir="${slide.dist}/slide/lib" file="${xmlparser.jar}"/>
- <copy todir="${slide.dist}/slide/lib" file="${jdom.jar}"/>
</target>
<!-- =================================================================== -->
<!-- Build a Slide distribution packaged as a web application -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
