CVS update of gotm-explorer (.classpath .cvsignore build.xml)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Wednesday, February 23, 2005 @ 18:39:29
  Author: rouvoy
    Path: /cvsroot/gotm/gotm-explorer

Modified: .classpath .cvsignore build.xml

* Improvement of the GoTM library.
* Benchmark example to compare GoTM with JOTM.
* Moving compilation result into an "output" directory.
* Moving eclipse compilation to an "output/eclipse" directory.
* Cosmetic updates.


------------+
 .classpath |    2 +-
 .cvsignore |    1 +
 build.xml  |   45 +++++++++++++++++++++++++++++----------------
 3 files changed, 31 insertions(+), 17 deletions(-)


Index: gotm-explorer/.classpath
diff -u gotm-explorer/.classpath:1.3 gotm-explorer/.classpath:1.4
--- gotm-explorer/.classpath:1.3        Fri Jan 14 18:10:44 2005
+++ gotm-explorer/.classpath    Wed Feb 23 18:39:29 2005
@@ -11,5 +11,5 @@
        <classpathentry kind="lib" 
path="/gotm/lib/fractal-adl/fractal-adl.jar"/>
        <classpathentry kind="lib" path="/gotm/lib/julia/julia-mixins.jar"/>
        <classpathentry kind="lib" path="/gotm/lib/julia/julia-runtime.jar"/>
-       <classpathentry kind="output" path="build/class"/>
+       <classpathentry kind="output" path="output/eclipse"/>
 </classpath>
Index: gotm-explorer/.cvsignore
diff -u gotm-explorer/.cvsignore:1.1 gotm-explorer/.cvsignore:1.2
--- gotm-explorer/.cvsignore:1.1        Wed Jun  2 11:44:26 2004
+++ gotm-explorer/.cvsignore    Wed Feb 23 18:39:29 2005
@@ -1 +1,2 @@
 build
+output
Index: gotm-explorer/build.xml
diff -u gotm-explorer/build.xml:1.3 gotm-explorer/build.xml:1.4
--- gotm-explorer/build.xml:1.3 Mon Jan 10 17:16:53 2005
+++ gotm-explorer/build.xml     Wed Feb 23 18:39:29 2005
@@ -21,26 +21,35 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.3 2005/01/10 16:16:53 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.4 2005/02/23 17:39:29 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="gotm-explorer" default="explorer-all">
        <description>GoTM Explorer - Graphical Administration 
Interface</description>
 
+  <!-- ==================== -->
+  <!-- PROPERTY DEFINITIONS -->
+  <!-- ==================== -->
+
        <property name="src.dir"  value="src"/>
-       <property name="java.dir" value="${src.dir}/java"/>
-       <property name="pics.dir" value="${src.dir}/pics"/>
-       <property name="cfg.dir"  value="${src.dir}/config"/>
+       <property name="java.dir" value="java"/>
+       <property name="pics.dir" value="pics"/>
+       <property name="cfg.dir"  value="config"/>
 
        <property name="class.dir" value="class"/>
        <property name="lib.dir"   value="lib"/>
 
-       <property name="build.dir" value="${basedir}/build"/>
+  <property name="out.dir"   value="${basedir}/output"/>
+       <property name="build.dir" value="${out.dir}/build"/>
+
+       <property name="explorer.jar"     value="ow-gotm-explorer.jar"/>
+       <property name="explorer.dist"    value="GoTM-Explorer"/>
+  <property name="explorer.version" value="0.2"/>
 
-       <property name="browser.jar"     value="ow-gotm-explorer.jar"/>
-       <property name="browser.version" value="0.1a"/>
-       <property name="dist.name"       value="GoTM-Explorer"/>
 
+  <!-- ================ -->
+  <!-- PATH DEFINITIONS -->
+  <!-- ================ -->
 
        <path id="classpath">
                <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
@@ -48,27 +57,31 @@
        </path>
 
 
+  <!-- ================== -->
+  <!-- TARGET DEFINITIONS -->
+  <!-- ================== -->
+
        <target name="explorer-all" description="explorer-clean + 
explorer-build">
                <antcall target="explorer-clean"/>
                <antcall target="explorer-build"/>
        </target>
 
-       <target name="explorer-prepare">
+       <target name="-explorer-prepare">
                <ant dir="${basedir}/../gotm" target="gotm-build"/>
                <copy todir="${build.dir}/${lib.dir}">
                        <mapper type="flatten"/>
-                       <fileset dir="${basedir}/${lib.dir}" 
includes="**/*.*"/>
+                       <fileset dir="${basedir}/${lib.dir}" 
includes="**/*.jar"/>
                </copy>
                <copy todir="${build.dir}/${class.dir}">
-                       <fileset dir="${basedir}/${cfg.dir}" includes="**/*"/>
+                       <fileset dir="${basedir}/${src.dir}/${cfg.dir}" 
includes="**/*.*"/>
                </copy>
                <copy todir="${build.dir}/${class.dir}">
-                       <fileset dir="${basedir}/${pics.dir}" 
includes="**/*"/>
+                       <fileset dir="${basedir}/${src.dir}/${pics.dir}" 
includes="**/*.*"/>
                </copy>
        </target>
 
-       <target name="explorer-compile" depends="explorer-prepare">
-               <javac srcdir="${basedir}/${java.dir}"
+       <target name="explorer-compile" depends="-explorer-prepare">
+               <javac srcdir="${basedir}/${src.dir}/${java.dir}"
           destdir="${build.dir}/${class.dir}" 
             debug="on">
                        <classpath refid="classpath"/>
@@ -79,13 +92,13 @@
        <target name="explorer-build" depends="explorer-compile" 
    description="Builds the GoTM Explorer">
                <mkdir dir="${build.dir}/${lib.dir}"/>
-               <jar destfile="${build.dir}/${lib.dir}/${browser.jar}">
+               <jar destfile="${build.dir}/${lib.dir}/${explorer.jar}">
                        <fileset dir="${build.dir}/${class.dir}" 
           includes="**/*"/>
                </jar>
        </target>
 
        <target name="explorer-clean" description="Cleans the GoTM Explorer">
-               <delete dir="${build.dir}" failonerror="no"/>
+               <delete dir="${out.dir}" failonerror="no"/>
        </target>
 </project>