CVS update of gotm-jts/examples/benchmark (.cvsignore build.xml)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Monday, December 19, 2005 @ 17:13:45
  Author: rouvoy
    Path: /cvsroot/gotm/gotm-jts/examples/benchmark

Modified: .cvsignore build.xml


------------+
 .cvsignore |    1 +
 build.xml  |   54 +++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 36 insertions(+), 19 deletions(-)


Index: gotm-jts/examples/benchmark/.cvsignore
diff -u gotm-jts/examples/benchmark/.cvsignore:1.4 
gotm-jts/examples/benchmark/.cvsignore:1.5
--- gotm-jts/examples/benchmark/.cvsignore:1.4  Fri Dec 16 17:03:28 2005
+++ gotm-jts/examples/benchmark/.cvsignore      Mon Dec 19 17:13:44 2005
@@ -1,4 +1,5 @@
 output
 bench-apc.txt
 benchmark-jts.txt
+arjunajts-properties.xml
 tmp
Index: gotm-jts/examples/benchmark/build.xml
diff -u gotm-jts/examples/benchmark/build.xml:1.7 
gotm-jts/examples/benchmark/build.xml:1.8
--- gotm-jts/examples/benchmark/build.xml:1.7   Mon Nov  7 09:50:23 2005
+++ gotm-jts/examples/benchmark/build.xml       Mon Dec 19 17:13:44 2005
@@ -21,7 +21,7 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.7 2005/11/07 08:50:23 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.8 2005/12/19 16:13:44 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
 <project name="JTS Benchmark" default="all">
@@ -40,6 +40,7 @@
   <!-- ================ -->
   <path id="classpath">
     <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
+       <fileset dir="/home/rouvoy/arjuna/ats4.0/lib" includes="**/*.jar"/>
   </path>
 
   <!-- ================== -->
@@ -58,31 +59,34 @@
   </target>
 
   <target name="bench-compile" depends="-bench-prepare">
-    <mkdir dir="${build.dir}/${class.dir}"/>
-    <java.c srcdir="${basedir}/${src.dir}/${java.dir}"/>
-    <copy todir="${build.dir}/${class.dir}">
-      <fileset dir="${build.dir}/${lib.dir}" includes="**/*.properties"/>
+    <fractalc javadir="${build.gen}" fractaldir="${build.cls}">
+      <javaset>
+        <fileset dir="${basedir}/${src.java}" includes="**/*.java" />
+        <fileset dir="${build.gen}" includes="**/*.java" />
+      </javaset>
+    </fractalc>
+    <copy todir="${build.cls}" failonerror="no">
+      <fileset dir="${basedir}/${src.frac}" excludes="**/*.java"/>
     </copy>
+    <copy todir="${build.cls}" failonerror="no">
+      <fileset dir="${basedir}/src" includes="**/*.properties"/>
+    </copy>
+    <javar destfile="${build.lib}/${examples.jar}"
+           javadir="${basedir}/${src.java}:${build.gen}" 
+           classdir="${build.cls}" libraries="classpath"/>
   </target>
 
-  <target name="bench-build" depends="bench-compile,fractal-adl">
-    <copy todir="${build.dir}/${class.dir}" file="src/monolog.properties" 
overwrite="yes"/>
-    <jar destfile="${build.dir}/${lib.dir}/${examples.jar}">
-      <fileset dir="${build.dir}/${class.dir}" includes="**/*"/>
-    </jar>
-  </target>
-
-  <target name="import" depends="bench-build,clear" unless="imported"/>
+  <target name="import" depends="bench-compile,clear" unless="imported"/>
   
   <target name="execute" depends="import"
    description="execute All Benchmarks">
     <property name="imported" value="true"/>
-    <antcall target="execute-apc"/>
-    <antcall target="execute-2pc"/>
     <antcall target="execute-jts"/>
+    <antcall target="execute-2pc"/>
+    <antcall target="execute-apc"/>
   </target>
   
-  <target name="execute-jts" depends="import"
+  <target name="execute-jts"
    description="execute JTS Benchmark">
 <!--    <property name="julia.cfg" 
value="${build.dir}/${lib.dir}/julia.cfg"/>
     <property name="cache.cfg"  
value="${build.dir}/${lib.dir}/cache.cfg"/>-->
@@ -91,7 +95,7 @@
                fork="yes"
         failonerror="yes">
        <sysproperty key="fractal.provider"
-                  value="aokell.AspectjProvider"/>
+                  value="aokell.AOKell"/>
 <!--   <sysproperty key="fractal.provider"
                   value="org.objectweb.fractal.julia.Julia"/>
        <sysproperty key="julia.loader"
@@ -111,7 +115,7 @@
                fork="yes"
         failonerror="yes">
        <sysproperty key="fractal.provider"
-                  value="aokell.AspectjProvider"/>
+                  value="aokell.AOKell"/>
 <!--   <sysproperty key="fractal.provider"
                   value="org.objectweb.fractal.julia.Julia"/>
        <sysproperty key="julia.loader"
@@ -131,7 +135,7 @@
                fork="yes"
         failonerror="yes">
        <sysproperty key="fractal.provider"
-                  value="aokell.AspectjProvider"/>
+                  value="aokell.AOKell"/>
 <!--   <sysproperty key="fractal.provider"
                   value="org.objectweb.fractal.julia.Julia"/>
        <sysproperty key="julia.loader"
@@ -141,4 +145,16 @@
        <arg line=" -fractal org.objectweb.benchmark.FcBenchmarkAPC r"/>
     </java>
   </target>
+
+  <target name="execute-thread"
+   description="execute Concurrent Transactions Benchmark">
+    <java classname="org.objectweb.fractal.adl.Launcher"
+       classpathref="classpath"
+               fork="yes"
+        failonerror="yes">
+       <sysproperty key="fractal.provider"
+                  value="aokell.AOKell"/>
+       <arg line=" -fractal org.objectweb.benchmark.FcBenchmarkThread r"/>
+    </java>
+  </target>
 </project>
\ No newline at end of file