User: user57 Date: 01/10/02 17:14:52 Modified: . build.xml Log: o removed -${build.number} from snaps, as it will just make it hard to put a preatty face on top of them. o some currently unused context config... Revision Changes Path 1.19 +51 -45 newsite/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/newsite/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- build.xml 2001/10/02 22:33:02 1.18 +++ build.xml 2001/10/03 00:14:52 1.19 @@ -10,7 +10,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.18 2001/10/02 22:33:02 user57 Exp $ --> +<!-- $Id: build.xml,v 1.19 2001/10/03 00:14:52 user57 Exp $ --> <project default="main" name="JBoss Website/Website"> @@ -185,6 +185,7 @@ <property name="build.bin" value="${module.output}/bin"/> <property name="build.metadata" value="${module.output}/metadata"/> <property name="build.snapshots" value="${module.output}/snapshots"/> + <property name="build.snapshots.tmp" value="${build.snapshots}/tmp"/> <property name="build.docs" value="${module.output}/docs"/> <property name="build.xdocs" value="${module.output}/xdocs"/> <property name="build.stylesheets" value="${module.output}/stylesheets"/> @@ -236,6 +237,9 @@ <!-- Controls for the compile-snapshot target --> <property name="snapshot.cvsroot" value=":pserver:[EMAIL PROTECTED]:/cvsroot/jboss"/> + + <property name="snapshot.modules" + value="jboss-all jboss-mq jboss-plugins"/> </target> @@ -301,11 +305,12 @@ </fileset> </chmod> </target> - - <!-- Compile cvs source snapshots --> - <target name="compile-snapshots" depends="init" unless="snapshot.bypass"> - <mkdir dir="${build.snapshots}"/> + <!-- Export the cvs modules for snapshots --> + <target name="_compile-snapshots-export-cvs" + depends="init" + unless="snapshot-export-cvs.bypass"> + <mkdir dir="${build.snapshots.tmp}"/> <echo>Exporting CVS modules for snaphots...</echo> <!-- Make sure there is an entry for this cvsroot --> @@ -313,56 +318,63 @@ <cvs cvsroot="${snapshot.cvsroot}" command="-Q -r -f -z3 export" date="TODAY" - package="jboss-all jboss-mq jboss-docs" - dest="${build.snapshots}"/> + package="${snapshot.modules}" + dest="${build.snapshots.tmp}"/> + </target> - <!-- to keep this simple, these jars task live here --> - <mkdir dir="${build.lib}"/> + <!-- Compile cvs source snapshots --> + <target name="compile-snapshots" + unless="snapshot.bypass" + depends="init, _compile-snapshots-export-cvs"> + <mkdir dir="${build.snapshots}"/> - <!-- build jboss-all-xxx.zip --> - <zip zipfile="${build.lib}/jboss-all-${build.number}.zip"> - <fileset dir="${build.snapshots}"> + <!-- build jboss-all.zip --> + <zip zipfile="${build.snapshots}/jboss-all.zip"> + <fileset dir="${build.snapshots.tmp}"> <include name="jboss-all/**"/> </fileset> </zip> - <!-- build jboss-all-xxx.tgz --> - <tar tarfile="${build.lib}/jboss-all-${build.number}.tar" longfile="gnu" - basedir="${build.snapshots}" + <!-- build jboss-all.tgz --> + <tar tarfile="${build.snapshots}/jboss-all.tar" + longfile="gnu" + basedir="${build.snapshots.tmp}" includes="jboss-all/**"> </tar> - <gzip src="${build.lib}/jboss-all-${build.number}.tar" - zipfile="${build.lib}/jboss-all-${build.number}.tgz"/> + <gzip src="${build.snapshots}/jboss-all.tar" + zipfile="${build.snapshots}/jboss-all.tgz"/> - <!-- build jboss-mq-xxx.zip --> - <zip zipfile="${build.lib}/jboss-mq-${build.number}.zip"> - <fileset dir="${build.snapshots}"> + <!-- build jboss-mq.zip --> + <zip zipfile="${build.snapshots}/jboss-mq.zip"> + <fileset dir="${build.snapshots.tmp}"> <include name="jboss-mq/**"/> </fileset> </zip> - <!-- build jboss-mq-xxx.tgz --> - <tar tarfile="${build.lib}/jboss-mq-${build.number}.tar" longfile="gnu" - basedir="${build.snapshots}" + <!-- build jboss-mq.tgz --> + <tar tarfile="${build.snapshots}/jboss-mq.tar" + longfile="gnu" + basedir="${build.snapshots.tmp}" includes="jboss-mq/**"> </tar> - <gzip src="${build.lib}/jboss-mq-${build.number}.tar" - zipfile="${build.lib}/jboss-mq-${build.number}.tgz"/> + <gzip src="${build.snapshots}/jboss-mq.tar" + zipfile="${build.snapshots}/jboss-mq.tgz"/> - <!-- build jboss-docs-xxx.zip --> - <zip zipfile="${build.lib}/jboss-docs-${build.number}.zip"> - <fileset dir="${build.snapshots}"> - <include name="jboss-docs/**"/> + <!-- build jboss-plugins.zip --> + <zip zipfile="${build.snapshots}/jboss-plugins.zip"> + <fileset dir="${build.snapshots.tmp}"> + <include name="jboss-plugins/**"/> </fileset> </zip> - <!-- build jboss-docs-xxx.tgz --> - <tar tarfile="${build.lib}/jboss-docs-${build.number}.tar" longfile="gnu" - basedir="${build.snapshots}" - includes="jboss-docs/**"> + <!-- build jboss-plugins.tgz --> + <tar tarfile="${build.snapshots}/jboss-plugins.tar" + longfile="gnu" + basedir="${build.snapshots.tmp}" + includes="jboss-plugins/**"> </tar> - <gzip src="${build.lib}/jboss-docs-${build.number}.tar" - zipfile="${build.lib}/jboss-docs-${build.number}.tgz"/> + <gzip src="${build.snapshots}/jboss-plugins.tar" + zipfile="${build.snapshots}/jboss-plugins.tgz"/> <!-- ================================================= --> <!-- HACK Make the JBoss DTDs available under j2ee/dtd --> @@ -376,7 +388,7 @@ <mkdir dir="${build.docs}/j2ee/dtd"/> <copy todir="${build.docs}/j2ee/dtd" filtering="no"> - <fileset dir="${build.snapshots}/jboss-all/server/src/resources/org/jboss/metadata"> + <fileset dir="${build.snapshots.tmp}/jboss-all/server/src/resources/org/jboss/metadata"> <include name="*.dtd"/> </fileset> </copy> @@ -410,14 +422,9 @@ <war warfile="${build.lib}/snapshots.war" webxml="${build.metadata}/snapshots-web.xml"> - <!-- the development/unstable sources --> - <fileset dir="${build.lib}"> - <include name="jboss-all-${build.number}.zip"/> - <include name="jboss-all-${build.number}.tgz"/> - <include name="jboss-docs-${build.number}.zip"/> - <include name="jboss-docs-${build.number}.tgz"/> - <include name="jboss-mq-${build.number}.zip"/> - <include name="jboss-mq-${build.number}.tgz"/> + <fileset dir="${build.snapshots}"> + <include name="*.zip"/> + <include name="*.tgz"/> </fileset> </war> @@ -427,7 +434,6 @@ <include name="website.war"/> <include name="jbossgroup.war"/> <include name="snapshots.war"/> - <!-- the manual is currently added by another ear --> </fileset> </ear>
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development