[jboss-svn-commits] JBossWS SVN: r1140 - branches/tdiesler/jbossws-1.0

[jboss-svn-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-10-04 17:27:12 -0400 (Wed, 04 Oct 2006)
New Revision: 1140

Modified:
   branches/tdiesler/jbossws-1.0/build.xml
   branches/tdiesler/jbossws-1.0/version.properties
Log:
[JBWS-1200] Provide source download for GA release

Modified: branches/tdiesler/jbossws-1.0/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/build.xml	2006-10-04 21:17:46 UTC (rev 1139)
+++ branches/tdiesler/jbossws-1.0/build.xml	2006-10-04 21:27:12 UTC (rev 1140)
@@ -31,7 +31,8 @@
   <property name="build.lib.dir" value="${build.dir}/lib"/>
   <property name="build.resources.dir" value="${build.dir}/resources"/>
   <property name="build.samples.dir" value="${build.dir}/samples"/>
-  <property name="build.dist.dir" value="${build.dir}/dist"/>
+  <property name="build.bin.dist" value="${build.dir}/bin-dist"/>
+  <property name="build.src.dist" value="${build.dir}/src-dist"/>
   <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/>
   <property name="src.dir" value="${basedir}/src/main"/>
   <property name="src.etc.dir" value="${src.dir}/etc"/>
@@ -617,25 +618,35 @@
   
   <target name="most" description="Builds almost everything." depends="jars"/>
   
-  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
+  <target name="all" description="Create a distribution zip file" 
+    depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs,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">
     
-    <mkdir dir="${build.dist.dir}"/>
-    <mkdir dir="${build.dist.dir}/bin"/>
-    <mkdir dir="${build.dist.dir}/samples"/>
-    <mkdir dir="${build.dist.dir}/docs/html"/>
-    <mkdir dir="${build.dist.dir}/lib/jboss-jdk1.5"/>
-    <mkdir dir="${build.dist.dir}/lib/jboss-jdk1.4"/>
-    <mkdir dir="${build.dist.dir}/lib/tomcat/common/endorsed"/>
-    <mkdir dir="${build.dist.dir}/lib/tomcat/common/lib"/>
-    <mkdir dir="${build.dist.dir}/lib/tomcat/webapps"/>
+    <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.dist.dir}" filtering="true" 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.dist.dir}/bin">
+    <copy todir="${build.bin.dist}/bin">
       <fileset dir="${src.etc.dir}">
         <include name="wstools.bat"/>
         <include name="wstools.sh"/>
@@ -643,35 +654,35 @@
     </copy>
     
     <!-- samples -->
-    <copy todir="${build.dist.dir}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
+    <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/>
     
     <!-- documentation -->
-    <copy todir="${build.dist.dir}/docs/html" overwrite="true">
+    <copy todir="${build.bin.dist}/docs/html" overwrite="true">
       <fileset dir="${docs.userguide.dir}/build/en/html"/>
     </copy>
-    <copy todir="${build.dist.dir}/docs" overwrite="true">
+    <copy todir="${build.bin.dist}/docs" overwrite="true">
       <fileset dir="${docs.userguide.dir}/build/en/pdf"/>
     </copy>
     
     <!-- lib/jdk1.5 -->
-    <copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true">
+    <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
     </copy>
     
     <!-- lib/jdk1.4 -->
-    <copy todir="${build.dist.dir}/lib/jboss-jdk1.4" overwrite="true">
+    <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
     </copy>
     
     <!-- lib/tomcat -->
-    <copy todir="${build.dist.dir}/lib/tomcat/common/endorsed" overwrite="true">
+    <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.dist.dir}/lib/tomcat/common/lib" overwrite="true">
+    <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true">
       <fileset dir="${thirdparty.dir}">
         <include name="activation.jar"/>
         <include name="log4j.jar"/>
@@ -683,22 +694,26 @@
         <include name="jbossws-thirdparty.jar"/>
       </fileset>
     </copy>
-    <copy todir="${build.dist.dir}/lib/tomcat/webapps" overwrite="true">
+    <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws.war"/>
     </copy>
     
-    <!-- zip it -->
-    <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.dist.dir}"/>
+    <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/>
   </target>
   
-  <target name="build-source-zip" description="Build the source distribution">
-    <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${basedir}"
-      includes="src/**">
-    </zip>
+  <!-- Build the src dist -->
+  <target name="build-src-dist" description="Build the source distribution">
+    <mkdir dir="${build.src.dist}/jbossws-${version.id}"/>
+    <copy todir="${build.src.dist}/jbossws-${version.id}">
+      <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>
   
-  <target name="build-docs" description="build the documentation">
-    <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/>
-  </target>
-  
 </project>

Modified: branches/tdiesler/jbossws-1.0/version.properties
===================================================================
--- branches/tdiesler/jbossws-1.0/version.properties	2006-10-04 21:17:46 UTC (rev 1139)
+++ branches/tdiesler/jbossws-1.0/version.properties	2006-10-04 21:27:12 UTC (rev 1140)
@@ -3,7 +3,7 @@
 specification.vendor=JBoss (http://www.jboss.org)
 specification.version=jbossws-1.0
 
-version.id=1.0.4.GA
+version.id=1.0.4.DEV
 repository.id=snapshot
 
 implementation.title=JBoss Web Services (JBossWS)