Author: ron.sigal(a)jboss.com Date: 2012-07-25 00:03:08 -0400 (Wed, 25 Jul 2012) New Revision: 6463 Modified: remoting2/branches/2.x/build.xml Log: JBREM-1313: Updated version to 2.5.4.SP4. Modified: remoting2/branches/2.x/build.xml =================================================================== --- remoting2/branches/2.x/build.xml 2012-07-25 03:08:03 UTC (rev 6462) +++ remoting2/branches/2.x/build.xml 2012-07-25 04:03:08 UTC (rev 6463) @@ -225,9 +225,9 @@ <!-- Module name(s) & version --> <property name="module.name" value="remoting"/> <property name="module.Name" value="JBoss Remoting"/> - <property name="module.version" value="2.5.4.SP3"/> + <property name="module.version" value="2.5.4.SP4"/> <!-- extension is for the file suffix to use for dtribution build --> - <property name="module.version.extension" value="2_5_4_SP3"/> + <property name="module.version.extension" value="2_5_4_SP4"/> <property name="implementation.url" value="http://www.jboss.org/products/remoting"/> <property name="root.dir" value="${basedir}"/> @@ -2376,6 +2376,28 @@ </antcall> <!-- ******************************************************************************** --> + <!-- Current <- -> 2.5.4.SP3 --> + <antcall target="download.version"> + <param name="version" value="2.5.4.SP3-brew"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_4_SP3-client"/> + <param name="client.classpath" value="${etc.dir}/lib/2.5.4.SP3-brew/jboss-remoting.jar${extended.classpath}"/> + <param name="server.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + <param name="clientImplementsServerIdentity" value="true"/> + <param name="serverImplementsServerIdentity" value="true"/> + </antcall> + <antcall target="tests.versioning.all_transports" inheritrefs="true"> + <param name="jboss-junit-configuration" value="2_5_4_SP3-server"/> + <param name="server.classpath" value="${etc.dir}/lib/2.5.4.SP3-brew/jboss-remoting.jar${extended.classpath}"/> + <param name="client.classpath" value="${output.lib.dir}/jboss-remoting.jar${extended.classpath}"/> + <param name="check_content_type" value="true"/> + <param name="clientImplementsServerIdentity" value="true"/> + <param name="serverImplementsServerIdentity" value="true"/> + </antcall> + + <!-- ******************************************************************************** --> <!-- Current <- -> 2.5.4.SP2 --> <antcall target="download.version"> <param name="version" value="2.5.4.SP2-brew"/> @@ -4892,7 +4914,16 @@ <include name="*.pdf"/> </fileset> </move> + + <!-- calls the ant build for the userguide doc --> + <ant dir="docs/userguide"/> + <move todir="docs"> + <fileset dir="docs/userguide/build/en/pdf"> + <include name="*.pdf"/> + </fileset> + </move> + </target> <!-- ================================================================== --> @@ -4902,7 +4933,7 @@ <!-- Distribution Targets --> <target name="dist" depends="clean,most,tests,javadoc,docs.generate,dist.only"/> - <target name="dist.quick" depends="clean,most,dist.jars,javadoc,docs.generate,dist.only"/> + <target name="dist.quick" depends="clean,most,dist.jars,javadoc,dist.only"/> <target name="dist.only" depends="configure"> <delete dir="${dist.dir}"/> @@ -4935,6 +4966,17 @@ <include name="**"/> </fileset> </copy> + + <copy todir="${dist.dir}/docs/userguide/html"> + <fileset dir="${basedir}/docs/userguide/build/en/html"> + <include name="**"/> + </fileset> + </copy> + <copy todir="${dist.dir}/docs/userguide/html_single"> + <fileset dir="${basedir}/docs/userguide/build/en/html_single"> + <include name="**"/> + </fileset> + </copy> <copy todir="${dist.dir}" filtering="no"> <fileset dir="${basedir}/docs">