remm 00/11/11 17:10:50
Modified: jasper build.xml
Log:
- Update the buildfiles to the new Ant 1.2
Revision Changes Path
1.12 +42 -29 jakarta-tomcat-4.0/jasper/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2000/10/12 23:34:11 1.11
+++ build.xml 2000/11/12 01:10:50 1.12
@@ -28,7 +28,9 @@
<target name="build-static" depends="build-prepare,copy-jaxp-jar">
<!-- Executable Commands -->
- <copydir src="src/bin" dest="${jasper.build}/bin"/>
+ <copy todir="${jasper.build}/bin">
+ <fileset dir="src/bin" />
+ </copy>
<fixcrlf srcdir="${jasper.build}/bin" includes="*.sh" cr="remove"/>
<fixcrlf srcdir="${jasper.build}/bin" includes="*.bat" cr="add"/>
<chmod perm="+x" file="${jasper.build}/bin/jasper.sh"/>
@@ -36,54 +38,57 @@
<!-- Shared Extensions -->
<!-- Jasper needs the servlet API classes -->
- <copyfile src="${servlet.jar}" dest="${jasper.build}/bin/servlet.jar"/>
+ <copy file="${servlet.jar}" tofile="${jasper.build}/bin/servlet.jar"/>
<!-- Jasper needs JAXP1.0/SAX2.0 compliant parser -->
- <copyfile src="${parser.jar}"
dest="${jasper.build}/lib/${jasper.jaxp.parser.jar}"/>
+ <copy file="${parser.jar}"
+ tofile="${jasper.build}/lib/${jasper.jaxp.parser.jar}"/>
</target>
<target name="copy-jaxp-jar" if="jaxp.jar.present" >
- <copyfile src="${jaxp.jar}" dest="${jasper.build}/lib/jaxp.jar"/>
- </target>
+ <copy file="${jaxp.jar}" tofile="${jasper.build}/lib/jaxp.jar"/>
+ </target>
<!-- ================= BUILD: Compile Server Components ================= -->
<target name="build-main" depends="build-static">
<!-- Compile internal server components -->
- <javac srcdir="src/share" destdir="${jasper.build}/classes"
- classpath="${parser.jar}:${jaxp.jar}:${servlet.jar}"
- deprecation="off" debug="on" optimize="off"
- excludes="**/CVS/**"/>
+ <javac srcdir="src/share" destdir="${jasper.build}/classes"
+ classpath="${parser.jar}:${jaxp.jar}:${servlet.jar}"
+ deprecation="off" debug="on" optimize="off"
+ excludes="**/CVS/**"/>
<!-- Copy static resource files -->
- <copydir src="src/share" dest="${jasper.build}/classes">
- <include name="**/*.properties"/>
- <include name="**/*.dtd"/>
- </copydir>
+ <copy todir="${jasper.build}/classes">
+ <fileset dir="src/share">
+ <include name="**/*.properties"/>
+ <include name="**/*.dtd"/>
+ </fileset>
+ </copy>
</target>
<!-- ================ BUILD: Create Jasper Javadocs ===================== -->
<target name="javadoc" depends="build-main">
- <deltree dir="${jasper.build}/javadoc"/>
+ <delete dir="${jasper.build}/javadoc"/>
<mkdir dir="${jasper.build}/javadoc"/>
<javadoc packagenames="org.apache.jasper.*"
-
classpath="${tools.jar}:${parser.jar}:${jaxp.jar}:${servlet.jar}:${jasper.build}/classes"
- sourcepath="src/share"
- destdir="${jasper.build}/javadoc"
- author="true"
- version="true"
- windowtitle="Jasper Internal API Documentation"
- doctitle="Jasper API"
- bottom="Copyright © 2000 Apache Software Foundation. All
Rights Reserved."
+
classpath="${tools.jar}:${parser.jar}:${jaxp.jar}:${servlet.jar}:${jasper.build}/classes"
+ sourcepath="src/share"
+ destdir="${jasper.build}/javadoc"
+ author="true"
+ version="true"
+ windowtitle="Jasper Internal API Documentation"
+ doctitle="Jasper API"
+ bottom="Copyright © 2000 Apache Software Foundation. All Rights
Reserved."
/>
</target>
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <deltree dir="${jasper.build}"/>
+ <delete dir="${jasper.build}"/>
</target>
@@ -103,14 +108,18 @@
<target name="deploy-static" depends="build-main,deploy-prepare">
<!-- Executable Commands -->
- <copydir src="${jasper.build}/bin" dest="${jasper.deploy}/bin"/>
+ <copy todir="${jasper.deploy}/bin">
+ <fileset dir="${jasper.build}/bin" />
+ </copy>
<fixcrlf srcdir="${jasper.deploy}/bin" includes="*.sh" cr="remove"/>
<fixcrlf srcdir="${jasper.deploy}/bin" includes="*.bat" cr="add"/>
<chmod perm="+x" file="${jasper.deploy}/bin/jasper.sh"/>
<chmod perm="+x" file="${jasper.deploy}/bin/jspc.sh"/>
<!-- Shared Extensions -->
- <copydir src="${jasper.build}/lib" dest="${jasper.deploy}/lib"/>
+ <copy todir="${jasper.deploy}/lib">
+ <fileset dir="${jasper.build}/lib" />
+ </copy>
</target>
@@ -128,7 +137,7 @@
<!-- ====================== DEPLOY: Clean Directories =================== -->
<target name="deploy-clean">
- <deltree dir="${jasper.deploy}"/>
+ <delete dir="${jasper.deploy}"/>
</target>
@@ -136,14 +145,18 @@
<target name="dist" depends="build-main">
<mkdir dir="${jasper.dist}/bin"/>
- <copydir src="${jasper.build}/bin" dest="${jasper.dist}/bin"/>
+ <copy dest="${jasper.dist}/bin">
+ <fileset dir="${jasper.build}/bin" />
+ </copy>
<fixcrlf srcdir="${jasper.dist}/bin" includes="*.sh" cr="remove"/>
<fixcrlf srcdir="${jasper.dist}/bin" includes="*.bat" cr="add"/>
<chmod perm="+x" file="${jasper.dist}/bin/jasper.sh"/>
<chmod perm="+x" file="${jasper.dist}/bin/jspc.sh"/>
<mkdir dir="${jasper.dist}/lib"/>
- <copydir src="${jasper.build}/lib" dest="${jasper.dist}/lib"/>
+ <copy todir="${jasper.dist}/lib">
+ <fileset dir="${jasper.build}/lib" />
+ </copy>
<jar jarfile="${jasper.dist}/lib/jasper.jar"
basedir="${jasper.build}/classes"/>
@@ -152,7 +165,7 @@
<!-- ======================== DIST: Clean Directory ===================== -->
<target name="dist-clean">
- <deltree dir="${jasper.dist}"/>
+ <delete dir="${jasper.dist}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
