[portal-commits] JBoss Portal SVN: r6996 - trunk/build.

Author: julien(a)jboss.com Date: 2007-04-18 04:40:28 -0400 (Wed, 18 Apr 2007) New Revision: 6996 Modified: trunk/build/distrib.xml Log: improved a bit the distrib build file Modified: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-04-18 00:15:31 UTC (rev 6995) +++ trunk/build/distrib.xml 2007-04-18 08:40:28 UTC (rev 6996) @@ -1,7 +1,7 @@ <project default="main" name="JBoss Portal"> <property name="source.dir" value="../../jboss-portal-2.6"/> - <property name="release.version" value="2.6-BETA1"/> + <property name="release.version" value="2.6-CR1"/> <!-- --> <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> @@ -147,7 +147,7 @@ </target> <!-- --> - <target name="package" if="jboss.home"> + <target name="package"> <!-- Create the output directory --> <mkdir dir="output"/> @@ -176,11 +176,11 @@ <antcall target="package-normal"/> <antcall target="package-ha"/> - <antcall target="package-normal-bundled"/> + <antcall target="package-normal"/> <antcall target="package-ha-bundled"/> </target> - + <!-- | JBoss Portal binary distribution --> @@ -197,16 +197,15 @@ <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}/widget/output/resources" includes="widget.war/**"/> <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.sar/**"/> </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> <!-- @@ -224,23 +223,22 @@ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/> </copy> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> + <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> <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.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}"/> </target> <!-- | JBoss Portal bundled distribution --> - <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with jboss AS "> + <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}"/> <antcall target="package-bundled"> <param name="todir" value="${portal.build.normal.bundled}"/> @@ -266,7 +264,7 @@ | 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 "> + <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}"/> <antcall target="package-bundled"> <param name="todir" value="${portal.build.ha.bundled}"/>