Amelioration du code ant

etherpad_to_opale/etherpad_to_opale.ant

 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." name="myantce" default="main">
-    <property file="etherpad_to_hdoc.properties"/>
+    <property file="etherpad_to_opale.properties"/>    
+    <!-- CHECK FOR WINDOWS FAMILY OS -->
+    <condition property="is_windows">
+        <os family="windows"/>
+    </condition>
     
-    <target name="to_hdoc">
+    <condition property="is_unix">
+        <os family="unix"/>
+    </condition>
+
+    <target name="to_hdoc_windows" if="${is_windows}">
         <delete>
-            <fileset dir="../etherpad_to_hdoc/input">
+            <fileset dir="${eth_in}">
                 <include name="*.html"/>
             </fileset>
         </delete>
-        <copy file="input/pad.html" todir="../etherpad_to_hdoc/input"/>
+        <copy file="input/pad.html" todir="${eth_in}"/>
         <exec dir="../etherpad_to_hdoc" executable="run.bat"/>
     </target>
     
-    <target name="to_opale">
+    <target name="to_hdoc_sh" if="${is_unix}">
+        <delete>
+            <fileset dir="${eth_in}">
+                <include name="*.html"/>
+            </fileset>
+        </delete>
+        <copy file="input/pad.html" todir="${eth_in}"/>
+        <exec dir="../etherpad_to_hdoc" executable="run.sh"/>
+    </target>
+    
+    <target name="to_opale_sh" if="${is_unix}">
+        <delete>
+            <fileset dir="${opa_in}">
+                <include name="*.hdoc"/>
+            </fileset>
+        </delete>
+        <copy file="${eth_out}/output.hdoc" todir="${opa_in}"/>
+        <exec dir="../hdoc_to_opale" executable="run.sh"/>
+        <copy file="${opa_out}/*.scar" todir="output"/>        
+    </target>
+    
+    <target name="to_opale_windows" if="${is_windows}">
         <delete>
-            <fileset dir="../hdoc_to_opale/input">
+            <fileset dir="${opa_in}">
                 <include name="*.hdoc"/>
             </fileset>
         </delete>
-        <copy file="../etherpad_to_hdoc/output/output.hdoc" todir="../hdoc_to_opale/input"/>
+        <copy file="${eth_out}/output.hdoc" todir="${opa_in}"/>
         <exec dir="../hdoc_to_opale" executable="run.bat"/>
-        <copy file="../hdoc_to_opale/output/*.scar" todir="output"/>        
+        <copy file="${opa_out}/*.scar" todir="output"/>        
     </target>
         
     <target name="main">
-        <antcall target="to_hdoc"/>
-        <antcall target="to_opale"/>
+        <antcall target="to_hdoc_sh"/>
+        <antcall target="to_hdoc_windows"/>
+        <antcall target="to_opale_sh"/>        
+        <antcall target="to_opale_windows"/>        
     </target>
     
 </project>
\ No newline at end of file

etherpad_to_opale/etherpad_to_opale.properties

@@ -5,4 +5,8 @@ xsl = ${basedir}/xsl
 lib = ${basedir}/lib
 log = ${basedir}/log
 
+eth_in = ../etherpad_to_hdoc/input
+eth_out = ../etherpad_to_hdoc/output
+opa_in = ../hdoc_to_opale/input
+opa_out = ../hdoc_to_opale/output
 rootfilename = content.xml
\ No newline at end of file