CVS update of fractal-pool (.cvsignore build.xml)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Tuesday, June 28, 2005 @ 10:20:32
  Author: rouvoy
    Path: /cvsroot/gotm/fractal-pool

Modified: .cvsignore build.xml

* updating the pool example.
* updating the ant build.xml file.


------------+
 .cvsignore |    2 +
 build.xml  |  111 +++++++++++++++++++++++++++--------------------------------
 2 files changed, 54 insertions(+), 59 deletions(-)


Index: fractal-pool/.cvsignore
diff -u fractal-pool/.cvsignore:1.2 fractal-pool/.cvsignore:1.3
--- fractal-pool/.cvsignore:1.2 Fri Feb  4 17:13:09 2005
+++ fractal-pool/.cvsignore     Tue Jun 28 10:20:32 2005
@@ -1,2 +1,4 @@
 build
 output
+alias.xml
+build.properties
Index: fractal-pool/build.xml
diff -u fractal-pool/build.xml:1.5 fractal-pool/build.xml:1.6
--- fractal-pool/build.xml:1.5  Wed Mar  2 16:25:15 2005
+++ fractal-pool/build.xml      Tue Jun 28 10:20:32 2005
@@ -21,111 +21,104 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.5 2005/03/02 15:25:15 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.6 2005/06/28 08:20:32 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="Fractal Pool" default="all">
   <description>GoTM Project [gotm.objectweb.org] - Fractal Pool 
package</description>
 
+  
   <!-- ==================== -->
   <!-- PROPERTY DEFINITIONS -->
   <!-- ==================== -->
-  <import file="${basedir}/../fractal-import/build.xml"/>
-  <property name="pool.jar" value="fractal-pool.jar" />
-  <property name="pool.version" value="0.1" />
-  <property name="pool.dist" value="FractalPool" />
+  
+  <import file="${basedir}/../fractal-import/build.xml" optional="on"/>
+  <property name="fcpool.jar" value="fractal-pool.jar" />
+  <property name="fcpool.version" value="0.1" />
+  <property name="fcpool.dist" value="FractalPool" />
+
+  <property name="dist-src" value="${fcpool.dist}-${fcpool.version}-src" />
+  <property name="dist-bin" value="${fcpool.dist}-${fcpool.version}-bin" />
+
+  <property name="dist-src.dir" value="${dist.dir}/${dist-src}" />
+  <property name="dist-bin.dir" value="${dist.dir}/${dist-bin}" />
 
+  
   <!-- ================ -->
   <!-- PATH DEFINITIONS -->
   <!-- ================ -->
+
   <path id="classpath">
-    <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar" />
+    <fileset dir="${basedir}" includes="${lib.dir}/**/*.jar"/>
+    <fileset dir="${build.dir}" includes="${lib.dir}/**/*.jar"/>
   </path>
 
-  <!-- ================== -->
-  <!-- TARGET DEFINITIONS -->
-  <!-- ================== -->
+  
+  <!-- ======================= -->
+  <!-- MAIN TARGET DEFINITIONS -->
+  <!-- ======================= -->
+
   <target name="all" description="clean + import">
     <antcall target="clean" />
     <antcall target="import" />
   </target>
 
-  <target name="-prepare" depends="-fractal.template">
+  <target name="import" depends="pool-build,clear" 
+   description="Imports the Fractal Pool module."/>
+
+  <target name="export" depends="-pool-prepare"
+          description="Exports the module into the ${dist.dir} directory">
+    <mkdir dir="${dist-src.dir}" />
+    <copy todir="${dist-src.dir}">
+      <fileset dir="${basedir}" includes="**/*.*" excludes="output/**"/>
+      <fileset dir="${build.dir}" includes="**/*.*"/>
+    </copy>
+  </target>
+
+  <target name="distrib"
+          depends="pool-dist-src,pool-dist-bin"
+          description="build all distributions" />
+
+  
+  <!-- ====================== -->
+  <!-- SUB TARGET DEFINITIONS -->
+  <!-- ====================== -->
+
+  <target name="-pool-prepare" depends="copy-alias,-fractal.template">
     <copy todir="${build.dir}/${cfg.dir}" failonerror="false">
       <fileset dir="${basedir}/${src.dir}/${cfg.dir}" includes="**/*.cfg" />
     </copy>
   </target>
 
-  <target name="pool-compile" depends="-prepare">
+  <target name="pool-compile" depends="-pool-prepare">
     <mkdir dir="${build.dir}/${class.dir}" />
     <java.c srcdir="${basedir}/${src.dir}/${java.dir}"/>
   </target>
 
   <target name="pool-build"
-       depends="pool-compile,fractal-adl"
-   description="Builds Fractal framework.">
-    <jar destfile="${build.dir}/${lib.dir}/${pool.jar}">
+       depends="pool-compile,fractal-adl">
+    <jar destfile="${build.dir}/${lib.dir}/${fcpool.jar}">
       <fileset dir="${build.dir}/${class.dir}" includes="**/*" />
     </jar>
   </target>
   
-  <target name="import" depends="pool-build,clear" 
-   description="Imports the Fractal Pool module."/>
-
   <target name="pool-jdoc"
-          depends="-prepare"
+          depends="-pool-prepare"
           description="Generates the javadoc.">
     <java.doc/>
   </target>
 
-  <target name="pool-dist-src" description="Builds the source distribution.">
-    <property name="dist-src" value="${pool.dist}-${pool.version}-src" />
-    <property name="dist-src.dir" value="${dist.dir}/${dist-src}" />
-    <mkdir dir="${dist-src.dir}" />
-    <copy todir="${dist-src.dir}" file="${basedir}/build.xml" />
-    <mkdir dir="${dist-src.dir}/${src.dir}" />
-    <copy todir="${dist-src.dir}/${src.dir}">
-      <fileset dir="${basedir}/${src.dir}" includes="**/*" />
-    </copy>
-    <mkdir dir="${dist-src.dir}/${doc.dir}" />
-    <copy todir="${dist-src.dir}/${doc.dir}">
-      <fileset dir="${basedir}/${doc.dir}" includes="**/*" />
-    </copy>
-    <zip zipfile="${dist.dir}/${dist-src}.zip">
-      <fileset dir="${dist.dir}" includes="${dist-src}/**/*" />
-    </zip>
-    <tar destfile="${dist.dir}/${dist-src}.tar" longfile="gnu">
-      <tarfileset dir="${dist.dir}" includes="${dist-src}/**/*" />
-    </tar>
-    <gzip src="${dist.dir}/${dist-src}.tar"
-          zipfile="${dist.dir}/${dist-src}.tar.gz" />
-    <bzip2 src="${dist.dir}/${dist-src}.tar"
-           zipfile="${dist.dir}/${dist-src}.tar.bz2" />
+  <target name="pool-dist-src" depends="export">
+    <archive dir="${dist.dir}" includes="${dist-src}"/>
   </target>
 
   <target name="pool-dist-bin"
-          depends="pool-build,pool-jdoc"
-          description="Builds the binary distribution.">
-    <property name="dist-bin" value="${pool.dist}-${pool.version}-bin" />
-    <property name="dist-bin.dir" value="${dist.dir}/${dist-bin}" />
+          depends="pool-build,pool-jdoc">
     <mkdir dir="${dist-bin.dir}" />
     <copy todir="${dist-bin.dir}">
       <fileset dir="${build.dir}" includes="${doc.dir}/**/*" />
       <fileset dir="${build.dir}" includes="${lib.dir}/**/*" />
     </copy>
-    <zip zipfile="${dist.dir}/${dist-bin}.zip">
-      <fileset dir="${dist.dir}" includes="${dist-bin}/**/*" />
-    </zip>
-    <tar destfile="${dist.dir}/${dist-bin}.tar" longfile="gnu">
-      <tarfileset dir="${dist.dir}" includes="${dist-bin}/**/*" />
-    </tar>
-    <gzip src="${dist.dir}/${dist-bin}.tar"
-          zipfile="${dist.dir}/${dist-bin}.tar.gz" />
-    <bzip2 src="${dist.dir}/${dist-bin}.tar"
-           zipfile="${dist.dir}/${dist-bin}.tar.bz2" />
+    <archive dir="${dist.dir}" includes="${dist-bin}"/>
   </target>
-
-  <target name="pool-dist"
-          depends="pool-dist-src,pool-dist-bin"
-          description="build all distributions" />
 </project>