Author: prabhat.jha(a)jboss.com Date: 2007-02-16 16:18:32 -0500 (Fri, 16 Feb 2007) New Revision: 6325 Modified: trunk/build/distrib.xml Log: break package target into four subtargets for packaging 4 distros Modified: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-02-16 21:16:53 UTC (rev 6324) +++ trunk/build/distrib.xml 2007-02-16 21:18:32 UTC (rev 6325) @@ -85,60 +85,65 @@ <target name="build" depends="source.build,doc.build"> </target> - <macrodef name="package-doc"> - <attribute name="todir"/> + <target name="package-doc"> <sequential> - <mkdir dir="@{todir}"/> - <mkdir dir="@{todir}/referenceGuide"/> - <copy todir="@{todir}/referenceGuide"> + <mkdir dir="${todir}"/> + <mkdir dir="${todir}/referenceGuide"/> + <copy todir="${todir}/referenceGuide"> <fileset dir="${source.dir}-docs/referenceGuide/build/en/"/> </copy> - <mkdir dir="@{todir}/userGuide"/> - <copy todir="@{todir}/userGuide"> + <mkdir dir="${todir}/userGuide"/> + <copy todir="${todir}/userGuide"> <fileset dir="${source.dir}-docs/userGuide/build/en/"/> </copy> - <mkdir dir="@{todir}/quickstartuser"/> - <copy todir="@{todir}/quickstartuser"> + <mkdir dir="${todir}/quickstartuser"/> + <copy todir="${todir}/quickstartuser"> <fileset dir="${source.dir}-docs/quickstartuser/build/en/"/> </copy> </sequential> - </macrodef> + </target> - <macrodef name="package-ds"> - <attribute name="todir"/> + <target name="package-ds"> <sequential> - <mkdir dir="@{todir}"/> - <copy todir="@{todir}"> + <mkdir dir="${todir}"/> + <copy todir="${todir}"> <fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/> </copy> </sequential> - </macrodef> + </target> - <macrodef name="package-bin"> - <attribute name="todir"/> + <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc--> + <target name="package-bin" unless="no-doc"> <sequential> - <mkdir dir="@{todir}"/> - <package-doc todir="@{todir}/docs"/> - <package-ds todir="@{todir}/setup"/> - <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="@{todir}"/> - <copy todir="@{todir}/docs/portal/licenses"> + <mkdir dir="${todir}"/> + <antcall target="package-doc"> + <param name="todir" value="${todir}/docs"/> + </antcall> + <antcall target="package-ds"> + <param name="todir" value="${todir}/setup"/> + </antcall> + <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> + <copy todir="${todir}/docs/portal/licenses"> <fileset dir="output/docs/licenses"/> </copy> </sequential> - </macrodef> + </target> - <macrodef name="package-bundled"> - <attribute name="todir"/> + <target name="package-bundled" unless="no-doc"> <sequential> - <mkdir dir="@{todir}"/> - <package-doc todir="@{todir}/docs/portal"/> - <package-ds todir="@{todir}/setup"/> - <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="@{todir}"/> - <copy todir="@{todir}/docs/portal/licenses"> + <mkdir dir="${todir}"/> + <antcall target="package-doc"> + <param name="todir" value="${todir}/docs/portal"/> + </antcall> + <antcall target="package-ds"> + <param name="todir" value="${todir}/setup"/> + </antcall> + <copy file="${source.dir}-docs/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> + <copy todir="${todir}/docs/portal/licenses"> <fileset dir="output/docs/licenses"/> </copy> </sequential> - </macrodef> + </target> <!-- --> <target name="package" if="jboss.home"> @@ -151,66 +156,91 @@ --> <mkdir dir="${portal.build.src}"/> - <package-doc todir="${portal.build.src}/docs"/> + <antcall target="package-doc"> + <param name="todir" value="${portal.build.src}/docs"/> + </antcall> <copy file="${source.dir}-docs/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/> <copy todir="${portal.build.src}"> <fileset dir="${source.dir}" includes="**/*" excludes="*/output/**,**/CVS/*,**/build.log,build/local.properties,forums/**,thirdparty/**"/> </copy> <copy todir="${portal.build.src}/docs/portal/licenses"> <fileset dir="output/docs/licenses"/> - </copy> + </copy> <fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/> <fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/> <!-- | JBoss Portal binaries distribution - --> - + --> + + <antcall target="package-normal"/> + <antcall target="package-ha"/> + <antcall target="package-normal-bundled"/> + <antcall target="package-ha-bundled"/> + + </target> + + <!-- + | JBoss Portal binary distribution + --> + + <target name="package-normal" description="package jboss-portal.sar"> <mkdir dir="${portal.build.normal.bin}"/> - <package-bin todir="${portal.build.normal.bin}"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar"> - <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/> - <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/> - </copy> - <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> - <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> - </copy> + <antcall target="package-bin"> + <param name="todir" value="${portal.build.normal.bin}"/> + </antcall> + <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> + <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/> + </copy> + <copy todir="${portal.build.ha.bin}/jboss-portal.sar/portal-cms.sar"> + <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/> + </copy> + <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/> + <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> + <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/> + </copy> + <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> + <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> + <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> + </copy> + </target> + <!-- | JBoss Portal ha binaries distribution --> - <mkdir dir="${portal.build.ha.bin}"/> - <package-bin todir="${portal.build.ha.bin}"/> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> + <target name="package-ha" description="package jboss-portal-ha.sar"> + <mkdir dir="${portal.build.ha.bin}"/> + <antcall target="package-bin"> + <param name="todir" value="${portal.build.ha.bin}"/> + </antcall> + <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar"> + </copy> + <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar"> <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> + </copy> + <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/> - </copy> - <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> + </copy> + <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> + <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> - </copy> - <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> + </copy> + <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> + </target> <!-- | JBoss Portal bundled distribution --> + <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with jboss AS "> <mkdir dir="${portal.build.normal.bundled}"/> - <package-bundled todir="${portal.build.normal.bundled}"/> + <antcall target="package-bundled"> + <param name="todir" value="${portal.build.normal.bundled}"/> + </antcall> <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar"> <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/> </copy> @@ -226,13 +256,17 @@ <include name="server/default/**"/> </fileset> </copy> + </target> <!-- | JBoss Portal ha bundled distribution --> + <target name="package-ha-bundled" depends="package-ha" if="jboss.home" description="package jboss-portal-ha bundled with jboss AS "> <mkdir dir="${portal.build.ha.bundled}"/> - <package-bundled todir="${portal.build.ha.bundled}"/> + <antcall target="package-bundled"> + <param name="todir" value="${portal.build.ha.bundled}"/> + </antcall> <copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar"> <fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/> </copy> @@ -246,8 +280,7 @@ </fileset> </copy> <copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/> - - </target> + </target> <!-- Create packages --> <target name="zip"> @@ -290,6 +323,6 @@ </target> <!-- Build and compress everything --> - <target name="main" depends="licenses,build,package,zip"> + <target name="main" depends="licenses,build,package,zip" description="do the whole shebang - build source, doc, distro"> </target> </project>