You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/10/05 07:46:33 UTC
cvs commit: jakarta-slide build.xml
remm 00/10/04 22:46:33
Modified: . build.xml
Log:
- Updated the build file to the latest Ant
Revision Changes Path
1.50 +130 -75 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- build.xml 2000/10/04 09:20:34 1.49
+++ build.xml 2000/10/05 05:46:33 1.50
@@ -111,8 +111,8 @@
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
</javac>
- <copydir src="src/share" dest="${slide.build}/classes"
- includes="**/*.properties" excludes="**/CVS/**" />
+ <copy file="src/share/org/apache/slide/slide.properties"
+ tofile="${slide.build}/classes/org/apache/slide/slide.properties" />
<echo message="Building Standard Stores" />
<javac srcdir="src/stores" destdir="${slide.build}/classes"
@@ -131,12 +131,24 @@
<!-- Build documentation -->
<!-- =================================================================== -->
<target name="doc" depends="prepare">
+
<style basedir="src/doc" destdir="${slide.build}/doc"
extension=".html" style="style/slide.xsl" includes="*.xml" />
- <copydir src="src/doc" dest="${slide.build}/doc"
- includes="**/*.gif,**/*.png,**/*.css,**/*.sample" />
- <copydir src="src/schema" dest="${slide.build}/doc/schema"
- includes="**/*.xsd,**/*.dtd" />
+ <copy todir="${slide.build}/doc">
+ <fileset dir="src/doc">
+ <include name="**/*.gif" />
+ <include name="**/*.png" />
+ <include name="**/*.css" />
+ <include name="**/*.sample" />
+ </fileset>
+ </copy>
+ <copy todir="${slide.build}/doc/schema">
+ <fileset dir="src/schema">
+ <include name="**/*.xsd" />
+ <include name="**/*.dtd" />
+ </fileset>
+ </copy>
+
</target>
@@ -152,8 +164,8 @@
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
</javac>
- <copydir src="src/share" dest="${slide.build}/classes"
- includes="**/*.properties" excludes="**/CVS/**" />
+ <copy file="src/share/org/apache/slide/slide.properties"
+ tofile="${slide.build}/classes/org/apache/slide/slide.properties" />
<echo message="Building Standard Stores" />
<javac srcdir="src/stores" destdir="${slide.build}/classes"
@@ -189,8 +201,13 @@
destdir="${webdavclient.build}/classes"
debug="on" deprecation="on"
excludes="**/CVS/**,**/package.html" />
- <copydir src="src/clients/webdav/bin" dest="${webdavclient.build}"
- includes="*.bat,*.sh" />
+ <copy todir="${webdavclient.build}"
+ includes="*.bat,*.sh">
+ <fileset dir="src/clients/webdav/bin">
+ <include name="*.bat" />
+ <include name="*.sh" />
+ </fileset>
+ </copy>
</target>
@@ -209,8 +226,8 @@
<!-- Clean build and distribution directories of the DAV client -->
<!-- =================================================================== -->
<target name="webdav-client-clean">
- <deltree dir="${webdavclient.build}"/>
- <deltree dir="${webdavclient.dist}"/>
+ <delete dir="${webdavclient.build}"/>
+ <delete dir="${webdavclient.dist}"/>
</target>
@@ -238,8 +255,8 @@
doctitle="Slide WebDAV Client JavaDoc" public="true"
noindex="false" author="true"
packagenames="org.apache.webdav.lib.*" />
- <copydir src="${webdavclient.build}/doc/javadoc"
- dest="${slide.dist}/doc/client/doc/javadoc" />
+ <copy dir="${webdavclient.build}/doc/javadoc"
+ todir="${slide.dist}/doc/client/doc/javadoc" />
</target>
@@ -250,8 +267,8 @@
depends="webdav-client-no-debug, webdav-client-dist-prepare,
webdav-client-javadoc">
- <copyfile src="src/etc/MANIFEST.MF"
- dest="${webdavclient.build}/classes/MANIFEST.MF" />
+ <copy file="src/etc/MANIFEST.MF"
+ tofile="${webdavclient.build}/classes/MANIFEST.MF" />
<replace file="${webdavclient.build}/classes/MANIFEST.MF"
token="$$VERSION$$" value="${version}" />
@@ -268,8 +285,7 @@
includes="LICENSE,README,CHANGELOG,org/apache/webdav/**" />
<echo message="Copying documentation" />
- <copydir src="${webdavclient.build}/doc"
- dest="${webdavclient.dist}/doc" />
+ <copy dir="${webdavclient.build}/doc" todir="${webdavclient.dist}/doc" />
</target>
@@ -281,8 +297,12 @@
<javac srcdir="src/examples" destdir="${slide.build}/examples"
debug="on" deprecation="on" excludes="**/CVS/**"
classpath="${slide.build}/classes" />
- <copydir src="src/examples" dest="${slide.build}/examples"
- excludes="**/CVS/**,**/*.java" />
+ <copy todir="${slide.build}/examples">
+ <fileset dir="src/examples">
+ <exclude name="**/CVS/**" />
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
</target>
@@ -290,9 +310,9 @@
<!-- Clean build and distribution directories -->
<!-- =================================================================== -->
<target name="clean">
- <deltree dir="${slide.build}"/>
- <deltree dir="${slide.dist}"/>
- <deltree dir="${dav.dist}"/>
+ <delete dir="${slide.build}"/>
+ <delete dir="${slide.dist}"/>
+ <delete dir="${dav.dist}"/>
</target>
@@ -327,13 +347,17 @@
<target name="dist" depends="no-debug, examples, prepare-dist, doc,
javadoc">
- <copyfile src="src/etc/MANIFEST.MF"
- dest="${slide.build}/classes/MANIFEST.MF" />
+ <copy file="src/etc/MANIFEST.MF"
+ tofile="${slide.build}/classes/MANIFEST.MF" />
<replace file="${slide.build}/classes/MANIFEST.MF"
token="$$VERSION$$" value="${version}" />
- <copydir src="src/etc"
- dest="${slide.build}/classes"
- includes="LICENSE,README,CHANGELOG" />
+ <copy todir="${slide.build}/classes">
+ <fileset dir="src/etc">
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="CHANGELOG" />
+ </fileset>
+ </copy>
<echo message="Building Slide main JAR file" />
<jar jarfile="${slide.dist}/lib/slide.jar"
@@ -355,13 +379,21 @@
includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**" />
<echo message="Copying documentation" />
- <copydir src="${slide.build}/doc" dest="${slide.dist}/doc" />
- <copydir src="." dest="${slide.dist}"
- includes="LICENSE,README,CHANGELOG,RELEASE-INFO,RELEASE-PLAN,STATUS.html"
- />
+ <copy dir="${slide.build}/doc" todir="${slide.dist}/doc" />
+ <copy todir="${slide.dist}">
+ <fileset dir=".">
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="CHANGELOG" />
+ <include name="RELEASE-INFO" />
+ <include name="RELEASE-PLAN" />
+ <include name="STATUS.html" />
+ </fileset>
+ </copy>
<echo message="Copying examples" />
- <copydir src="${slide.build}/examples" dest="${slide.dist}/examples" />
+ <copy dir="${slide.build}/examples" todir="${slide.dist}/examples" />
+
</target>
@@ -414,13 +446,17 @@
includes="**/org/apache/catalina/**"
excludes="**/CVS/**"
classpath="${slide.build}/classes:${catalina.build}/classes" />
- <copyfile src="src/etc/MANIFEST.MF"
- dest="${slide.build}/classes/MANIFEST.MF" />
- <replace file="${slide.build}/classes/MANIFEST.MF"
+ <copy file="src/etc/MANIFEST.MF"
+ tofile="${slide.build}/classes/MANIFEST.MF" />
+ <replace file="${slide.build}/classes/MANIFEST.MF"
token="$$VERSION$$" value="${version}" />
- <copydir src="src/etc"
- dest="${slide.build}/classes"
- includes="LICENSE,README,CHANGELOG" />
+ <copy todir="${slide.build}/classes">
+ <fileset dir="src/etc">
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="CHANGELOG" />
+ </fileset>
+ </copy>
</target>
@@ -443,13 +479,17 @@
includes="**/org/apache/catalina/**"
excludes="**/CVS/**"
classpath="${slide.build}/classes:${catalina.build}/classes" />
- <copyfile src="src/etc/MANIFEST.MF"
- dest="${slide.build}/classes/MANIFEST.MF" />
+ <copy file="src/etc/MANIFEST.MF"
+ tofile="${slide.build}/classes/MANIFEST.MF" />
<replace file="${slide.build}/classes/MANIFEST.MF"
token="$$VERSION$$" value="${version}" />
- <copydir src="src/etc"
- dest="${slide.build}/classes"
- includes="LICENSE,README,CHANGELOG" />
+ <copy todir="${slide.build}/classes">
+ <fileset dir="src/etc">
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="CHANGELOG" />
+ </fileset>
+ </copy>
<jar jarfile="${dav.dist}/lib/slide.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
@@ -467,28 +507,34 @@
includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**" />
<echo message="Update distribution configuration" />
- <copydir src="src/conf/catalina/standalone"
- dest="${dav.dist}"
- excludes="**/bin/**,**/CVS/**" />
- <copydir src="src/conf/dist"
- dest="${dav.dist}/bin"
- includes="*.bat,*.sh" />
+ <copy todir="${dav.dist}">
+ <fileset dir="src/conf/catalina/standalone">
+ <exclude name="**/bin/**" />
+ <exclude name="**/CVS/**" />
+ </fileset>
+ </copy>
+ <copy todir="${dav.dist}/bin">
+ <fileset dir="src/conf/dist">
+ <include name="*.bat" />
+ <exclude name="*.sh" />
+ </fileset>
+ </copy>
<echo message="Copying libraries" />
- <copydir src="${slide.build}/lib"
- dest="${dav.dist}/lib" />
- <copyfile src="${servlet.jar}"
- dest="${dav.dist}/lib/servlet.jar" />
- <copyfile src="${jaxp.home}/jaxp.jar"
- dest="${dav.dist}/lib/jaxp.jar"/>
- <copyfile src="${jaxp.home}/parser.jar"
- dest="${dav.dist}/lib/parser.jar"/>
- <copyfile src="${regexp.jar}"
- dest="${dav.dist}/lib/regexp.jar"/>
+ <copy dir="${slide.build}/lib"
+ todir="${dav.dist}/lib" />
+ <copy file="${servlet.jar}"
+ tofile="${dav.dist}/lib/servlet.jar" />
+ <copy file="${jaxp.home}/jaxp.jar"
+ tofile="${dav.dist}/lib/jaxp.jar"/>
+ <copy file="${jaxp.home}/parser.jar"
+ tofile="${dav.dist}/lib/parser.jar"/>
+ <copy file="${regexp.jar}"
+ tofile="${dav.dist}/lib/regexp.jar"/>
<echo message="Copying documentation" />
- <copydir src="${slide.build}/doc"
- dest="${dav.dist}/doc" />
+ <copy dir="${slide.build}/doc"
+ todir="${dav.dist}/doc" />
</target>
@@ -569,7 +615,7 @@
<!-- Release Clean -->
<!-- =================================================================== -->
<target name="release-clean">
- <deltree dir="${slide.release}" />
+ <delete dir="${slide.release}" />
</target>
@@ -592,18 +638,27 @@
<target name="release" depends="full-dist, release-prepare">
<!--copydir src="${avalon.dist}"
dest="${slide.release}/avalon" /-->
- <copydir src="${webdavclient.dist}" dest="${slide.release}/client" />
- <copydir src="${slide.dist}" dest="${slide.release}/slide">
- <exclude name="client/**" />
- <exclude name="webapp/**" />
- </copydir>
- <copyfile src="${webapp.dist}/slide.war"
- dest="${slide.release}/webapp/slide.war" />
- <copyfile src="${webapp.dist}/slidedoc.war"
- dest="${slide.release}/webapp/slidedoc.war" />
- <copydir src="." dest="${slide.release}"
- includes="LICENSE,README,CHANGELOG,RELEASE-INFO,RELEASE-PLAN,STATUS.html"
- />
+ <copy dir="${webdavclient.dist}" todir="${slide.release}/client" />
+ <copy todir="${slide.release}/slide">
+ <fileset dir="${slide.dist}">
+ <exclude name="client/**" />
+ <exclude name="webapp/**" />
+ </fileset>
+ </copy>
+ <copy file="${webapp.dist}/slide.war"
+ tofile="${slide.release}/webapp/slide.war" />
+ <copy file="${webapp.dist}/slidedoc.war"
+ tofile="${slide.release}/webapp/slidedoc.war" />
+ <copy todir="${slide.release}">
+ <fileset dir=".">
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="CHANGELOG" />
+ <include name="RELEASE-INFO" />
+ <include name="RELEASE-PLAN" />
+ <include name="STATUS.html" />
+ </fileset>
+ </copy>
<jar jarfile="${slide.release}/catalina/catalinautil.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"