From 9c4c97bb0ab2de385e8ddb7b9eb567d9ecf4afc5 Mon Sep 17 00:00:00 2001
From: Vintache Jean <jean.vintache@etu.utc.fr>
Date: Thu, 7 Jan 2016 08:31:32 +0100
Subject: [PATCH] fix etherpad-to-opale ant

---
 etherpad_to_opale/etherpad_to_opale.ant | 37 +++++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/etherpad_to_opale/etherpad_to_opale.ant b/etherpad_to_opale/etherpad_to_opale.ant
index 22d5af6..f9bf94c 100644
--- a/etherpad_to_opale/etherpad_to_opale.ant
+++ b/etherpad_to_opale/etherpad_to_opale.ant
@@ -10,7 +10,11 @@
     </condition>
 
     <target name="to_hdoc_init">
-        <delete>
+     
+    </target>
+
+    <target name="to_hdoc_windows" if="${is_windows}">
+    	<delete>
             <fileset dir="${eth_in}">
                 <include name="*.html"/>
             </fileset>
@@ -19,19 +23,29 @@
             <fileset dir="${in}">
                 <include name="*.html"/>
             </fileset>
-        </copy>      
-    </target>
-
-    <target name="to_hdoc_windows" if="${is_windows}">
+        </copy> 
         <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 todir="${eth_in}">
+            <fileset dir="${in}">
+                <include name="*.html"/>
+            </fileset>
+        </copy> 
         <exec dir="../etherpad_to_hdoc" executable="run.sh"/>
     </target>
     
     <target name="to_opale_init">
-        <delete>
+    </target>
+    
+    <target name="to_opale_unix" if="${is_unix}">
+    	<delete>
             <fileset dir="${opa_in}">
                 <include name="*.hdoc"/>
             </fileset>
@@ -39,13 +53,18 @@
         <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"/>
     </target>
     
     <target name="to_opale_windows" if="${is_windows}">
+    	<delete>
+            <fileset dir="${opa_in}">
+                <include name="*.hdoc"/>
+            </fileset>
+        </delete>
+        <copy todir="${opa_in}">
+            <fileset dir="${eth_out}"/>
+        </copy>
         <exec dir="../hdoc_to_opale" executable="run.bat"/>
     </target>
     
-- 
GitLab