CVS update of aokell (build.xml test/build.xml)

[Lionel Seinturier <seintur@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Tuesday, February 28, 2006 @ 09:06:40
  Author: seintur
    Path: /cvsroot/fractal/aokell

Modified: build.xml test/build.xml

Compile-time generated interfaces: build process for tests fixed.


----------------+
 build.xml      |    2 +-
 test/build.xml |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)


Index: aokell/build.xml
diff -u aokell/build.xml:1.3 aokell/build.xml:1.4
--- aokell/build.xml:1.3        Sat Feb 25 22:19:41 2006
+++ aokell/build.xml    Tue Feb 28 09:06:39 2006
@@ -201,7 +201,7 @@
        <!-- ==========      TEST     ========== -->
        <!-- =================================== -->
 
-       <target name="test" depends="compile" unless="feature.fcinterface.ct">
+       <target name="test" depends="compile">
                <ant antfile="${test}/build.xml" target="test" 
inheritall="true">
             <reference refid="srcpath" torefid="sp" />
             <reference refid="classpath" torefid="cp" />
Index: aokell/test/build.xml
diff -u aokell/test/build.xml:1.2 aokell/test/build.xml:1.3
--- aokell/test/build.xml:1.2   Mon Feb 20 04:49:47 2006
+++ aokell/test/build.xml       Tue Feb 28 09:06:40 2006
@@ -47,7 +47,42 @@
 
   <target name="compile">
     <ant antfile="${feature.glue}/glue.xml" inheritrefs="true" 
inheritall="true" />
+    <antcall target="compile.fcinterface.ct" inheritrefs="true" />
   </target>
+ 
+    <!-- Post-compilation target for compile-time generated interfaces -->
+    <target name="compile.fcinterface.ct" if="feature.fcinterface.ct">
+
+        <mkdir dir="${out.generated}" />
+        
+        <!-- Check whether the interfaces must be re-generated -->
+        <uptodate property="compile.fcinterface.notrequired"
+                  
targetfile="${out.generated}/fcinterface/ct/aokell/generated/org/objectweb/fractal/julia/conform/components/CAttributesImplementedInterface.java"
 >
+            <srcfiles dir="${test.conform}" includes="**/*.java" />
+        </uptodate>
+     
+        <antcall target="compile.fcinterface.required" inheritrefs="true" />
+    </target>
+ 
+    <target name="compile.fcinterface.required" 
unless="compile.fcinterface.notrequired">
+     
+        <!-- Generate the Java implementations of the Fractal interfaces -->
+        <java 
classname="org.objectweb.fractal.aokell.tools.interf.InterfaceGenerator" 
fork="yes">
+            <classpath refid="classpath" />
+            <arg value="-d" />
+            <arg value="${out.generated}/fcinterface/ct" />
+            <arg 
value="org.objectweb.fractal.julia.conform.components.CAttributes" />
+            <arg value="org.objectweb.fractal.julia.conform.components.I" />
+            <arg value="org.objectweb.fractal.julia.conform.components.J" />
+            <arg value="org.objectweb.fractal.julia.perf.components.I" />
+        </java>        
+        
+        <!-- Compile the generated Java code -->
+        <javac destdir="${out.build}">
+            <src path="${out.generated}/fcinterface/ct" />
+            <classpath refid="classpath" />
+        </javac>
+    </target>
     
   <!-- ============================= -->
   <!-- =========== TEST ============ -->