etherpad to opale : multi file and refactoring

etherpad_to_opale/etherpad_to_opale.ant

@@ -9,54 +9,62 @@
         <os family="unix"/>
     </condition>
 
-    <target name="to_hdoc_windows" if="${is_windows}">
+    <target name="to_hdoc_init">
         <delete>
             <fileset dir="${eth_in}">
                 <include name="*.html"/>
             </fileset>
         </delete>
-        <copy file="input/pad.html" todir="${eth_in}"/>
+        <copy todir="${eth_in}">
+            <fileset dir="${in}">
+                <include name="*.html"/>
+            </fileset>
+        </copy>      
+    </target>
+
+    <target name="to_hdoc_windows" if="${is_windows}">
         <exec dir="../etherpad_to_hdoc" executable="run.bat"/>
     </target>
     
     <target name="to_hdoc_unix" 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_unix" if="${is_unix}">
+    <target name="to_opale_init">
         <delete>
             <fileset dir="${opa_in}">
                 <include name="*.hdoc"/>
             </fileset>
         </delete>
-        <copy file="${eth_out}/output.hdoc" todir="${opa_in}"/>
+        <copy todir="${opa_in}">
+            <fileset dir="${eth_out}"/>
+        </copy>
+    </target>
+    
+    <target name="to_opale_unix" if="${is_unix}">
         <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="${opa_in}">
-                <include name="*.hdoc"/>
-            </fileset>
-        </delete>
-        <copy file="${eth_out}/output.hdoc" todir="${opa_in}"/>
         <exec dir="../hdoc_to_opale" executable="run.bat"/>
-        <mkdir dir="output"/>
-        <copy file="${opa_out}/output.scar" todir="output"/>
+    </target>
+    
+    <target name="to_opale_end">
+        <copy todir="${out}">
+            <fileset dir="${opa_out}"/>
+        </copy>
     </target>
         
     <target name="main">
+        <delete dir="${out}" failonerror="false"/>
+        <mkdir dir="output"/>
+        
+        <antcall target="to_hdoc_init"/>
         <antcall target="to_hdoc_unix"/>
         <antcall target="to_hdoc_windows"/>
+        <antcall target="to_opale_init"/>
         <antcall target="to_opale_unix"/>        
-        <antcall target="to_opale_windows"/>        
+        <antcall target="to_opale_windows"/>
+        <antcall target="to_opale_end"/>        
     </target>
-    
 </project>
\ No newline at end of file