masonjm 2004/10/17 13:21:33
Modified: . Tag: SLIDE_2_1_RELEASE_BRANCH build.xml
Log:
- Updated package targets for testsuite distribution to allow for a release
- "release" target now creates an entire release under dist/release/${version}
(including client packages)
- Source package target now packages all files necessary for a source release
Revision Changes Path
No revision
No revision
1.229.2.9 +93 -28 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.229.2.8
retrieving revision 1.229.2.9
diff -u -r1.229.2.8 -r1.229.2.9
--- build.xml 6 Oct 2004 13:35:02 -0000 1.229.2.8
+++ build.xml 17 Oct 2004 20:21:33 -0000 1.229.2.9
@@ -23,8 +23,8 @@
<property name="version" value="2.1b2"/>
<property name="release-notes" value="RELEASE-NOTES-2.1-BETA2"/>
<property name="project" value="jakarta-slide"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="final-src.name" value="${project}-src-${version}"/>
+ <property name="final.name" value="${project}-server-bin-${version}"/>
+ <property name="final-src.name" value="${project}-server-src-${version}"/>
<property name="testsuite.name" value="${project}-webdav-testsuite-${version}"/>
<!-- =================================================================== -->
<!-- Dependencies Properties -->
@@ -68,6 +68,7 @@
<!-- =================================================================== -->
<property name="slide.build" value="./build"/>
<property name="slide.dist" value="./dist"/>
+ <property name="slide.clientlib.dist" value="webdavclient/${slide.dist}"/>
<property name="testsuite.dist" value="${slide.dist}/webdav-testsuite"/>
<property name="webapp.dist" value="${slide.dist}/slide/webapp"/>
<property name="slide.archive" value="./${final.name}"/>
@@ -623,12 +624,25 @@
<copy todir="${testsuite.dist}">
<fileset dir="${basedir}/testsuite"
excludes="**/dist/**,**/CVS/**,**/testCasesResults.xml,**/testErrorsReport.txt"/>
</copy>
+ <copy todir="${testsuite.dist}">
+ <fileset dir="${slide.dist}">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </fileset>
+ </copy>
</target>
<target name="package-testsuite-zip" depends="testsuite-dist">
<zip zipfile="${slide.dist}/${testsuite.archive}.zip">
<zipfileset dir="${testsuite.dist}" prefix="${testsuite.name}"/>
</zip>
</target>
+ <target name="package-testsuite-tgz" depends="testsuite-dist">
+ <tar tarfile="${slide.dist}/${testsuite.archive}.tar" longfile="gnu">
+ <tarfileset dir="${testsuite.dist}" mode="755"
prefix="${testsuite.name}"/>
+ </tar>
+ <gzip zipfile="${slide.dist}/${testsuite.archive}.tar.gz"
src="${slide.dist}/${testsuite.archive}.tar"/>
+ <delete file="${slide.dist}/${testsuite.archive}.tar"/>
+ </target>
<!-- =================================================================== -->
<!-- Full distribution -->
<!-- =================================================================== -->
@@ -689,29 +703,56 @@
<!-- =================================================================== -->
<!-- Packages the distribution with ZIP and TAR-GZIP -->
<!-- =================================================================== -->
- <target name="release" depends="package-zip, package-tgz,
package-src-all,package-testsuite-zip" description="Packages the distribution with ZIP
and TAR-GZIP">
+ <target name="release" depends="package-zip, package-tgz,
package-src-all,package-testsuite-zip,package-testsuite-tgz" description="Packages the
distribution with ZIP and TAR-GZIP">
+ <property name="slide.release.bin"
value="${slide.dist}/release/${version}/bin"/>
+ <property name="slide.release.src"
value="${slide.dist}/release/${version}/src"/>
+ <patternset id="slide.packages.bin">
+ <include name="*-bin-*"/>
+ <include name="*-testsuite-*"/>
+ </patternset>
+ <patternset id="slide.packages.src">
+ <include name="*-src-*"/>
+ </patternset>
+ <!-- create release directories -->
+ <mkdir dir="${slide.release.bin}"/>
+ <mkdir dir="${slide.release.src}"/>
+ <!-- move server releases -->
+ <move todir="${slide.release.bin}">
+ <fileset dir="${slide.dist}">
+ <patternset refid="slide.packages.bin"/>
+ </fileset>
+ </move>
+ <move todir="${slide.release.src}">
+ <fileset dir="${slide.dist}">
+ <patternset refid="slide.packages.src"/>
+ </fileset>
+ </move>
+ <!-- move client releases -->
+ <ant antfile="build.xml" dir="webdavclient" target="release"/>
+ <move todir="${slide.release.bin}">
+ <fileset dir="${slide.clientlib.dist}">
+ <patternset refid="slide.packages.bin"/>
+ </fileset>
+ </move>
+ <move todir="${slide.release.src}">
+ <fileset dir="${slide.clientlib.dist}">
+ <patternset refid="slide.packages.src"/>
+ </fileset>
+ </move>
</target>
<!-- =================================================================== -->
- <!-- Packages the source code with ZIP -->
- <!-- =================================================================== -->
- <target name="package-src-zip">
- <zip zipfile="${slide.dist}/${slide-src.archive}.zip">
- <zipfileset dir="." prefix="${final.name}" includes="src/**"/>
- <zipfileset dir="." prefix="${final.name}" includes="LICENSE"/>
- <zipfileset dir="." prefix="${final.name}" includes="NOTICE"/>
- <zipfileset dir="." prefix="${final.name}" includes="RUNNING.txt"/>
- <zipfileset dir="." prefix="${final.name}" includes="README"/>
- <zipfileset dir="." prefix="${final.name}" includes="${release-notes}"/>
- </zip>
- </target>
+ <!-- Prepares a source distribution for packaging -->
<!-- =================================================================== -->
- <!-- Packages the source code with TAR-GZIP -->
- <!-- =================================================================== -->
- <target name="package-src-tgz">
- <mkdir dir="${slide.dist}/${final.name}"/>
- <copy todir="${slide.dist}/${final.name}">
+ <target name="package-src-prepare" depends="dist">
+ <echo message="Preparing source distribution"/>
+ <mkdir dir="${slide.dist}/${slide-src.archive}"/>
+ <copy todir="${slide.dist}/${slide-src.archive}">
<fileset dir=".">
+ <include name="lib/**"/>
<include name="src/**"/>
+ <include name="projector/**"/>
+ <include name="build.xml"/>
+ <include name="build.properties.sample"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
<include name="README"/>
@@ -719,18 +760,42 @@
<include name="${release-notes}"/>
</fileset>
</copy>
- <tar tarfile="${slide.dist}/${slide-src.archive}.tar" longfile="gnu">
- <tarfileset dir="${slide.dist}">
- <include name="${final.name}/**"/>
+ <copy todir="${slide.dist}/${slide-src.archive}">
+ <fileset dir="${slide.dist}">
+ <include name="doc/**"/>
+ </fileset>
+ </copy>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages the source code with ZIP -->
+ <!-- =================================================================== -->
+ <target name="package-src-zip" depends="package-src-prepare">
+ <zip zipfile="${slide.dist}/${slide-src.archive}.zip">
+ <zipfileset file="${slide.dist}/${slide-src.archive}"/>
+ </zip>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Packages the source code with TAR-GZIP -->
+ <!-- =================================================================== -->
+ <target name="package-src-tgz" depends="package-src-prepare">
+ <!-- guarantee that the <tar> task notices that the files have changed -->
+ <copy todir="${slide.dist}/temp">
+ <fileset dir="${slide.dist}/${slide-src.archive}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ <tar tarfile="${slide.dist}/${slide-src.archive}.tar.gz" longfile="gnu"
compression="gzip">
+ <tarfileset dir="${slide.dist}/temp" prefix="${slide-src.archive}">
+ <include name="**"/>
</tarfileset>
</tar>
- <delete dir="${slide.dist}/${final.name}"/>
- <gzip zipfile="${slide.dist}/${slide-src.archive}.tar.gz"
src="${slide.dist}/${slide-src.archive}.tar"/>
- <delete file="${slide.dist}/${slide-src.archive}.tar"/>
+ <delete dir="${slide.dist}/temp"/>
</target>
<!-- =================================================================== -->
<!-- Packages the source code with ZIP and TAG-GZIP -->
<!-- =================================================================== -->
- <target name="package-src-all" depends="package-src-zip, package-src-tgz">
- </target>
+ <target name="package-src-all" depends="package-src-prepare, package-src-zip,
package-src-tgz">
+ <!-- cleanup -->
+ <delete dir="${slide.dist}/${slide-src.archive}"/>
+ </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
