[FOray-commit] SF.net SVN: foray: [8251] trunk/foray/scripts/build.xml

Revision: 8251
          http://svn.sourceforge.net/foray/?rev=8251&view=rev
Author:   victormote
Date:     2006-09-29 18:11:25 -0700 (Fri, 29 Sep 2006)

Log Message:
-----------
Make each zip file unzip into a directory that corresponds to its own name.

Modified Paths:
--------------
    trunk/foray/scripts/build.xml

Modified: trunk/foray/scripts/build.xml
===================================================================
--- trunk/foray/scripts/build.xml	2006-09-30 00:24:17 UTC (rev 8250)
+++ trunk/foray/scripts/build.xml	2006-09-30 01:11:25 UTC (rev 8251)
@@ -201,22 +201,25 @@
   -->
   <target name="dist-bin" depends="package-all, dist-prepare">
     <echo message="Building the binary distribution files"/>
+    <property name="binary.dist.name"
+        value="${name.lowercase}-${version}-bin-all"/>
 
     <!-- Creating a staging directory in which to copy all of the needed
     pieces of this zip file. -->
     <property name="bin.staging.dir" location="${distrib.dir}/bin-staging"/>
-    <mkdir dir="${bin.staging.dir}/lib"/>
+    <property name="bin.staging.lib.dir"
+        location="${bin.staging.dir}/${binary.dist.name}/lib"/>
+    <mkdir dir="${bin.staging.lib.dir}"/>
 
     <!-- Copy the FOray jar file and the lib directory into the staging area.
     -->
-    <copy todir="${bin.staging.dir}/lib">
+    <copy todir="${bin.staging.lib.dir}">
       <fileset dir="${build.dir}" includes="foray*.jar"/>
       <fileset dir="${lib.dir}" includes="**"/>
     </copy>
 
     <!-- Create the zip file from the staging directory. -->
-    <property name="binary.zip.name" value="${name.lowercase}-${version}-bin-all.zip"/>
-    <zip zipfile="${distrib.dir}/${binary.zip.name}">
+    <zip zipfile="${distrib.dir}/${binary.dist.name}.zip">
       <fileset dir="${bin.staging.dir}"/>
     </zip>
 
@@ -233,15 +236,19 @@
   -->
   <target name="dist-modules" depends="package-all, dist-prepare">
     <echo message="Building the binary module distribution files"/>
+    <property name="module.dist.name"
+        value="${name.lowercase}-${version}-bin-modules"/>
 
     <!-- Creating a staging directory in which to copy all of the needed
     pieces of this zip file. -->
     <property name="module.staging.dir" location="${distrib.dir}/module-staging"/>
-    <mkdir dir="${module.staging.dir}/lib"/>
+    <property name="module.staging.lib.dir"
+        location="${module.staging.dir}/${module.dist.name}/lib"/>
+    <mkdir dir="${module.staging.lib.dir}"/>
 
     <!-- Copy the FOray module jar files and the lib directory into the staging
     area. -->
-    <copy todir="${module.staging.dir}/lib">
+    <copy todir="${module.staging.lib.dir}">
       <fileset dir="${foray.home}/foray-app/build/ant" includes="foray*.jar"/>
       <fileset dir="${foray.home}/foray-areatree/build/ant" includes="foray*.jar"/>
       <fileset dir="${foray.home}/foray-common/build/ant" includes="foray*.jar"/>
@@ -264,8 +271,7 @@
     </copy>
 
     <!-- Create the zip file from the staging directory. -->
-    <property name="module.zip.name" value="${name.lowercase}-${version}-bin-modules.zip"/>
-    <zip zipfile="${distrib.dir}/${module.zip.name}">
+    <zip zipfile="${distrib.dir}/${module.dist.name}.zip">
       <fileset dir="${module.staging.dir}"/>
     </zip>
 
@@ -281,12 +287,28 @@
   -->
   <target name="dist-src" depends="package-all, dist-prepare">
     <echo message="Building the source distribution files"/>
+    <property name="source.dist.name"
+        value="${name.lowercase}-${version}-src"/>
 
+    <!-- Creating a staging directory in which to copy all of the needed
+    pieces of this zip file. -->
+    <property name="source.staging.dir" location="${distrib.dir}/source-staging"/>
+    <property name="source.staging.root"
+        location="${source.staging.dir}/${source.dist.name}"/>
+    <mkdir dir="${source.staging.root}"/>
+
+    <!-- Copy the source directory to the staging area. -->
+    <copy todir="${source.staging.root}">
+      <fileset dir="${foray.home}" excludes="build/**"/>
+    </copy>
+
     <!-- Create zip file containing the source code. -->
-    <property name="source.zip.name" value="${name.lowercase}-${version}-src.zip"/>
-    <zip zipfile="${distrib.dir}/${source.zip.name}">
-      <fileset dir="${foray.home}" excludes="build/**"/>
+    <zip zipfile="${distrib.dir}/${source.dist.name}.zip">
+      <fileset dir="${source.staging.dir}"/>
     </zip>
+
+    <!-- Blow away the staging directory. -->
+    <delete dir="${source.staging.dir}"/>
   </target>
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.