CVS update of ow-transaction (.classpath .cvsignore build.xml)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Wednesday, February 23, 2005 @ 18:39:50
  Author: rouvoy
    Path: /cvsroot/gotm/ow-transaction

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  |   73 ++++++++++++++++++++++++++++++++---------------------------
 3 files changed, 42 insertions(+), 34 deletions(-)


Index: ow-transaction/.classpath
diff -u ow-transaction/.classpath:1.4 ow-transaction/.classpath:1.5
--- ow-transaction/.classpath:1.4       Mon Dec 20 18:23:52 2004
+++ ow-transaction/.classpath   Wed Feb 23 18:39:50 2005
@@ -2,5 +2,5 @@
 <classpath>
        <classpathentry kind="src" path="src/java"/>
        <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="output" path="build/class"/>
+       <classpathentry kind="output" path="output/eclipse"/>
 </classpath>
Index: ow-transaction/.cvsignore
diff -u ow-transaction/.cvsignore:1.1 ow-transaction/.cvsignore:1.2
--- ow-transaction/.cvsignore:1.1       Tue Mar 23 13:54:25 2004
+++ ow-transaction/.cvsignore   Wed Feb 23 18:39:50 2005
@@ -1,2 +1,3 @@
 build
 distrib
+output
Index: ow-transaction/build.xml
diff -u ow-transaction/build.xml:1.6 ow-transaction/build.xml:1.7
--- ow-transaction/build.xml:1.6        Fri Jan 14 17:51:32 2005
+++ ow-transaction/build.xml    Wed Feb 23 18:39:50 2005
@@ -21,54 +21,63 @@
 <!-- Initial developer(s): Romain Rouvoy.                                 -->
 <!-- Contributor(s): ______________________________________.              -->
 
-<!-- $Id: build.xml,v 1.6 2005/01/14 16:51:32 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.7 2005/02/23 17:39:50 rouvoy Exp $ -->
 <!-- ==================================================================== -->
 
-<project name="transaction" default="tx-all">
+<project name="OW Transaction" default="tx-all">
   <description>ObjectWeb Working Group - Transaction API</description>
 
+  <!-- ==================== -->
+  <!-- PROPERTY DEFINITIONS -->
+  <!-- ==================== -->
+
   <property name="src.dir"     value="src"/>
-  <property name="java.dir"    value="${src.dir}/java"/>
-  <property name="idl.dir"     value="${src.dir}/idl"/>
+  <property name="java.dir"    value="java"/>
   <property name="doc.dir"     value="doc"/>
-
   <property name="class.dir"   value="class"/>
   <property name="lib.dir"     value="lib"/>
-  <property name="fractal.dir" value="fractal"/>
   <property name="ant.dir"     value="ant"/> 
   
-  <property name="build.dir" value="${basedir}/build"/>
-  <property name="dist.dir"  value="${basedir}/distrib"/>
+  <property name="out.dir"   value="${basedir}/output"/>
+  <property name="build.dir" value="${out.dir}/build"/>
+  <property name="dist.dir"  value="${out.dir}/dist"/>
+
+  <property name="owtx.api"     value="ow-transaction-api.jar"/>
+  <property name="owtx.lib"     value="ow-transaction-lib.jar"/>
+  <property name="owtx.dist"    value="TransactionWorkingGroup"/>
+  <property name="owtx.version" value="0.2"/>
 
-  <property name="api.jar.name" value="ow-transaction-api.jar"/>
-  <property name="lib.jar.name" value="ow-transaction-lib.jar"/>
-  <property name="dist.name"    value="TransactionWorkingGroup"/>
   
-  <property name="tx.version" value="0.1b"/>
+  <!-- ================ -->
+  <!-- PATH DEFINITIONS -->
+  <!-- ================ -->
 
-  
   <path id="classpath">
     <pathelement location="${build.dir}/${class.dir}"/>
   </path>
 
 
+  <!-- ================== -->
+  <!-- TARGET DEFINITIONS -->
+  <!-- ================== -->
+
   <target name="tx-all" description="tx-clean + tx-distrib">
     <antcall target="tx-clean"/>
     <antcall target="tx-distrib"/>
   </target>
 
 
-  <target name="tx-jdoc" description="build the javadoc">
+  <target name="tx-jdoc" description="Builds the javadoc.">
     <javadoc destdir="${build.dir}/${doc.dir}" 
               author="true" version="true"
                  use="true" private="true"
          windowtitle="Transaction Working Group API"
             overview="${doc.dir}/overview.html">
-      <packageset dir="${basedir}/${java.dir}" defaultexcludes="yes">
+      <packageset dir="${basedir}/${src.dir}/${java.dir}" 
defaultexcludes="yes">
         <include name="**/*" />
       </packageset>
       <doctitle>
-        <![CDATA[<h1>Transaction Working Group - v. ${tx.version}</h1>]]>
+        <![CDATA[<h1>Transaction Working Group - v. ${owtx.version}</h1>]]>
         <![CDATA[<h2>API Specification</h2>]]>
       </doctitle>
       <tag name="todo"        scope="all" description="To do: "/>
@@ -92,18 +101,17 @@
     </copy>
   </target>
  
-  <target name="tx-compile-api"
-   description="compile the interfaces in the build directory">
+  <target name="tx-compile-api">
     <mkdir dir="${build.dir}/${class.dir}"/>
-    <javac srcdir="${basedir}/${java.dir}" 
destdir="${build.dir}/${class.dir}" debug="on">
+    <javac srcdir="${basedir}/${src.dir}/${java.dir}" 
destdir="${build.dir}/${class.dir}" debug="on">
       <classpath refid="classpath"/>
       <include name="org/objectweb/transaction/api/**/*.java"/>
     </javac>
   </target>
 
-  <target name="tx-compile-lib" depends="tx-compile-api" 
-   description="compile the classes in the build directory">
-    <javac srcdir="${basedir}/${java.dir}" 
destdir="${build.dir}/${class.dir}" debug="on">
+  <target name="tx-compile-lib" depends="tx-compile-api">
+    <javac srcdir="${basedir}/${src.dir}/${java.dir}" 
+          destdir="${build.dir}/${class.dir}">
       <classpath refid="classpath"/>
       <include name="org/objectweb/transaction/lib/**/*.java"/>
     </javac>
@@ -113,29 +121,29 @@
    description="compile the API in the build directory"/>
 
     
-  <target name="tx-build-api" depends="tx-compile-api" 
-   description="build the api archive in the lib directory">
+  <target name="tx-build-api" depends="tx-compile-api">
     <mkdir dir="${build.dir}/${lib.dir}"/>
-    <jar destfile="${build.dir}/${lib.dir}/${api.jar.name}">
+    <jar destfile="${build.dir}/${lib.dir}/${owtx.api}">
       <fileset dir="${build.dir}/${class.dir}" 
           includes="org/objectweb/transaction/api/**/*"/>
     </jar>
   </target>
 
-  <target name="tx-build-lib" depends="tx-compile-lib" 
-   description="build the library archive in the lib directory">
+  <target name="tx-build-lib" depends="tx-compile-lib">
     <mkdir dir="${build.dir}/${lib.dir}"/>
-    <jar destfile="${build.dir}/${lib.dir}/${lib.jar.name}">
+    <jar destfile="${build.dir}/${lib.dir}/${owtx.lib}">
       <fileset dir="${build.dir}/${class.dir}" 
           includes="org/objectweb/transaction/lib/**/*"/>
     </jar>
   </target>
 
   <target name="tx-build" depends="tx-build-api,tx-build-lib" 
-   description="build the archives in the lib directory"/>
+   description="Builds the archives in the ${lib.dir} directory.">
+    <delete dir="${build.dir}/${class.dir}"/> 
+  </target> 
 
   <target name="tx-distrib-src" description="build the source distribution">
-    <property name="dist-src"  value="${dist.name}-${tx.version}-src"/>
+    <property name="dist-src"  value="${owtx.dist}-${owtx.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"/>
@@ -159,7 +167,7 @@
 
   <target name="tx-distrib-bin" depends="tx-jdoc,tx-build" 
    description="build the binary distribution">
-    <property name="dist-bin"     value="${dist.name}-${tx.version}-bin"/>
+    <property name="dist-bin"     value="${owtx.dist}-${owtx.version}-bin"/>
     <property name="dist-bin.dir" value="${dist.dir}/${dist-bin}"/>
     <mkdir dir="${dist-bin.dir}"/>
     <copy todir="${dist-bin.dir}">
@@ -180,7 +188,6 @@
    description="build all distributions"/>
 
   <target name="tx-clean" description="clean the directory">
-    <delete dir="${build.dir}" failonerror="no"/>
-    <delete dir="${dist.dir}"  failonerror="no"/>
+    <delete dir="${out.dir}" failonerror="no"/>
   </target>
 </project>