Author: thomas.diesler(a)jboss.com Date: 2006-11-22 16:59:26 -0500 (Wed, 22 Nov 2006) New Revision: 1507 Added: trunk/src/ant/build-release.xml trunk/src/main/resources/samples/common/build-thirdparty.xml trunk/src/main/resources/samples/version.properties Modified: trunk/build.xml Log: Add release instructions Automate release steps Samples use thirdparty get Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-11-22 21:19:18 UTC (rev 1506) +++ trunk/build.xml 2006-11-22 21:59:26 UTC (rev 1507) @@ -15,6 +15,7 @@ <import file="${basedir}/src/ant/build-thirdparty.xml"/> <import file="${basedir}/src/ant/build-samples.xml"/> + <import file="${basedir}/src/ant/build-release.xml"/> <!-- ================================================================== --> <!-- Setup --> @@ -65,13 +66,17 @@ <target name="prepare"> - <echo message="jboss.home = ${jboss.home}"/> + <echo message="jboss.jdk15.home = ${jboss.jdk15.home}"/> + <echo message="jboss.jdk14.home = ${jboss.jdk14.home}"/> <echo message="tomcat.home = ${tomcat.home}"/> <echo/> - <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> <available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/> <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/> + <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> + <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/> <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <checksum file="version.properties" fileext=".md5"/> @@ -431,40 +436,14 @@ <delete dir="${build.lib.dir}/build"/> </target> - <!-- ================================================================== --> - <!-- Release --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to the server specified like this: -Dserver=default --> - <target name="release" depends="all" description="Release to jboss.local.repository"> - - <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> - <mkdir dir="${jbossws.dir}/lib"/> - <copy todir="${jbossws.dir}/lib" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws.sar"/> - <include name="jbossws-client.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <!-- Clean up all build output --> <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}"/> </target> + <target name="build-docs" description="Build the documentation"> + <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> + </target> + <target name="main" description="Executes the default target (most)." depends="most"/> <target name="most" description="Builds almost everything." depends="jars"/> @@ -472,96 +451,5 @@ <target name="all" description="Create a distribution zip file" depends="build-bin-dist,build-src-dist"> </target> - - <!-- Build the documentation --> - <target name="build-docs" description="Build the documentation"> - <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> - </target> - - <!-- Build the bin dist --> - <target name="build-bin-dist" description="Build the binary distribution" - depends="main,jbossws-thirdparty-jar,build-samples,build-docs"> - - <mkdir dir="${build.bin.dist}"/> - <mkdir dir="${build.bin.dist}/bin"/> - <mkdir dir="${build.bin.dist}/samples"/> - <mkdir dir="${build.bin.dist}/docs/html"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> - - <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> - <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> - <fileset dir="${src.dist.dir}"/> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> - <copy todir="${build.bin.dist}/bin"> - <fileset dir="${src.etc.dir}"> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - <!-- samples --> - <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> - - <!-- documentation --> - <copy todir="${build.bin.dist}/docs/html" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/html"/> - </copy> - <copy todir="${build.bin.dist}/docs" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/pdf"/> - </copy> - - <!-- lib/jdk1.5 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> - </copy> - - <!-- lib/tomcat --> - <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="serializer.jar"/> - <include name="xalan.jar"/> - <include name="xercesImpl.jar"/> - </fileset> - </copy> - <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="activation.jar"/> - <include name="log4j.jar"/> - <include name="mailapi.jar"/> - </fileset> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-core.jar"/> - <include name="jbossws-tomcat-integration.jar"/> - <include name="jbossws-thirdparty.jar"/> - </fileset> - </copy> - <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws.war"/> - </copy> - - <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> - </target> - - <!-- Build the src dist --> - <target name="build-src-dist" description="Build the source distribution"> - <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/> - <copy todir="${build.src.dist}/jbossws-${version.id}-src"> - <fileset dir="${basedir}"> - <include name="ant.properties.example"/> - <include name="version.properties"/> - <include name="build.xml"/> - <include name="src/**"/> - </fileset> - </copy> - <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}" - includes="jbossws-${version.id}/**"/> - </target> - </project> Copied: trunk/src/ant/build-release.xml (from rev 1442, branches/jbossws-1.0/src/ant/build-release.xml) Copied: trunk/src/main/resources/samples/common/build-thirdparty.xml (from rev 1442, branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml) Copied: trunk/src/main/resources/samples/version.properties (from rev 1442, branches/jbossws-1.0/src/main/resources/samples/version.properties)