Merge branch 'master' of https://gitlab.utc.fr/crozatst/hdoc

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>
     

hdoc_to_opale/README.md

@@ -68,7 +68,7 @@ Known bugs
 Todo list
 ---
 
-* Single file conversion with parameter :
+* Single file conversion with parameter
 * Solve bugs
 
 Technical Notes