masonjm 2004/10/20 23:35:09
Modified: testsuite build.xml
webdavclient build.xml
. build.xml
Log:
- Patch for bug #31693
- Updated version number for testsuite
- Added release targets to webdavclient build
Revision Changes Path
1.30 +1 -1 jakarta-slide/testsuite/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/testsuite/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build.xml 13 Oct 2004 12:09:08 -0000 1.29
+++ build.xml 21 Oct 2004 06:35:08 -0000 1.30
@@ -3,7 +3,7 @@
<property name="src" value="${basedir}/testsuite/junit/src" />
<property name="debug" value="${basedir}/testsuite/junit/debug" />
<property name="lib" value="${basedir}/lib" />
- <property name="version" value="2.1b1" />
+ <property name="version" value="2.2pre1" />
<property name="slideclientlib" value="${basedir}/../webdavclient/dist/lib" />
<property name="slideclientextlib" value="${basedir}/../webdavclient/lib" />
<property name="dist" value="${basedir}/dist" />
1.28 +82 -0 jakarta-slide/webdavclient/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 19 Oct 2004 06:08:58 -0000 1.27
+++ build.xml 21 Oct 2004 06:35:08 -0000 1.28
@@ -531,5 +531,87 @@
description="Package binary distribution as ZIP and TAR-GZIP">
<delete dir="${slide.dist}/${archive.bin.name}"/>
</target>
+ <!-- =================================================================== -->
+ <!-- Copy all files for the jca bin archive -->
+ <!-- =================================================================== -->
+ <target name="package-jca-prepare" depends="dist-jca">
+ <mkdir dir="${slide.dist}/${archive.jca.name}"/>
+ <copy todir="${slide.dist}/${archive.jca.name}">
+ <fileset dir="${jca.dist}"/>
+ </copy>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages jca bin dist as ZIP -->
+ <!-- =================================================================== -->
+ <target name="package-jca-zip" depends="package-jca-prepare">
+ <zip zipfile="${slide.dist}/${archive.jca.name}.zip">
+ <zipfileset dir="${slide.dist}/${archive.jca.name}"
+ prefix="${archive.jca.name}" includes="**"/>
+ </zip>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages jca bin dist as TAR-GZIP -->
+ <!-- =================================================================== -->
+ <target name="package-jca-tgz" depends="package-jca-prepare">
+ <tar tarfile="${slide.dist}/${archive.jca.name}.tar" longfile="gnu">
+ <tarfileset dir="${slide.dist}">
+ <include name="${archive.jca.name}/**"/>
+ </tarfileset>
+ </tar>
+ <gzip zipfile="${slide.dist}/${archive.jca.name}.tar.gz"
+ src="${slide.dist}/${archive.jca.name}.tar"/>
+ <delete file="${slide.dist}/${archive.jca.name}.tar"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages jca bin with ZIP and TAR-GZIP -->
+ <!-- =================================================================== -->
+ <target name="package-jca-all" depends="package-jca-zip, package-jca-tgz"
+ description="Package binary jca distribution as ZIP and TAR-GZIP">
+ <delete dir="${slide.dist}/${archive.jca.name}"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Copy all files for the ant bin archive -->
+ <!-- =================================================================== -->
+ <target name="package-ant-prepare" depends="dist-ant">
+ <mkdir dir="${slide.dist}/${archive.ant.name}"/>
+ <copy todir="${slide.dist}/${archive.ant.name}">
+ <fileset dir="${ant.dist}"/>
+ </copy>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages ant bin dist as ZIP -->
+ <!-- =================================================================== -->
+ <target name="package-ant-zip" depends="package-ant-prepare">
+ <zip zipfile="${slide.dist}/${archive.ant.name}.zip">
+ <zipfileset dir="${slide.dist}/${archive.ant.name}"
+ prefix="${archive.ant.name}" includes="**"/>
+ </zip>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages ant bin dist as TAR-GZIP -->
+ <!-- =================================================================== -->
+ <target name="package-ant-tgz" depends="package-ant-prepare">
+ <tar tarfile="${slide.dist}/${archive.ant.name}.tar" longfile="gnu">
+ <tarfileset dir="${slide.dist}">
+ <include name="${archive.ant.name}/**"/>
+ </tarfileset>
+ </tar>
+ <gzip zipfile="${slide.dist}/${archive.ant.name}.tar.gz"
+ src="${slide.dist}/${archive.ant.name}.tar"/>
+ <delete file="${slide.dist}/${archive.ant.name}.tar"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages ant bin with ZIP and TAR-GZIP -->
+ <!-- =================================================================== -->
+ <target name="package-ant-all" depends="package-ant-zip, package-ant-tgz"
+ description="Package binary ant distribution as ZIP and TAR-GZIP">
+ <delete dir="${slide.dist}/${archive.ant.name}"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages jca, ant and client distributions with ZIP and TAR-GZIP -->
+ <!-- =================================================================== -->
+ <target name="release"
+ depends="package-ant-all, package-jca-all, package-src-all, package-bin-all"
+ description="Packages ant, jca and client distributions with ZIP and
TAR-GZIP"/>
</project>
1.240 +3 -3 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -r1.239 -r1.240
--- build.xml 19 Oct 2004 06:11:22 -0000 1.239
+++ build.xml 21 Oct 2004 06:35:08 -0000 1.240
@@ -621,8 +621,8 @@
<mkdir dir="${testsuite.dist}"/>
</target>
<target name="testsuite-dist" depends="testsuite-dist-prepare">
- <ant dir="webdavclient"/>
- <ant dir="testsuite"/>
+ <ant dir="webdavclient" inheritall="false"/>
+ <ant dir="testsuite" inheritall="false"/>
<copy todir="${testsuite.dist}">
<fileset dir="${basedir}/testsuite"
excludes="**/dist/**,**/CVS/**,**/testCasesResults.xml,**/testErrorsReport.txt"/>
</copy>
@@ -730,7 +730,7 @@
</fileset>
</move>
<!-- move client releases -->
- <ant antfile="build.xml" dir="webdavclient" target="release"/>
+ <ant antfile="build.xml" dir="webdavclient" target="release"
inheritall="false"/>
<move todir="${slide.release.bin}">
<fileset dir="${slide.clientlib.dist}">
<patternset refid="slide.packages.bin"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
