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

etherpad_to_lexique/etherpad_to_lexique.ant

@@ -27,7 +27,7 @@
         </delete>
         <copy file="input/pad.html" todir="${eth_in}"/>
         <exec executable="/bin/bash" dir="../etherpad_to_hdoc">
-        <arg value="../etherpad_to_hdoc/run.sh"/>
+            <arg value="../etherpad_to_hdoc/run.sh"/>
         </exec>
     </target>
     
@@ -38,7 +38,9 @@
             </fileset>
         </delete>
         <copy file="${eth_out}/pad.hdoc" todir="${lex_in}"/>
-        <exec dir="../hdoc_to_lexique" executable="run.sh"/>
+        <exec executable="/bin/bash" dir="../hdoc_to_lexique">
+            <arg value="../hdoc_to_lexique/run.sh"/>
+        </exec>
         <copy file="${lex_out}/*.scar" todir="output"/>        
     </target>
     

etherpad_to_opale/etherpad_to_opale.ant

@@ -38,7 +38,9 @@
                 <include name="*.html"/>
             </fileset>
         </copy> 
-        <exec dir="../etherpad_to_hdoc" executable="run.sh"/>
+        <exec executable="/bin/bash" dir="../etherpad_to_hdoc">
+            <arg value="../etherpad_to_hdoc/run.sh"/>
+        </exec>
     </target>
     
     <target name="to_opale_init">
@@ -53,7 +55,9 @@
         <copy todir="${opa_in}">
             <fileset dir="${eth_out}"/>
         </copy>
-        <exec dir="../hdoc_to_opale" executable="run.sh"/>
+        <exec executable="/bin/bash" dir="../hdoc_to_opale">
+            <arg value="../hdoc_to_opale/run.sh"/>
+        </exec>
     </target>
     
     <target name="to_opale_windows" if="${is_windows}">

etherpad_to_optim/etherpad_to_optim.ant

@@ -26,7 +26,9 @@
             </fileset>
         </delete>
         <copy file="input/pad.html" todir="${eth_in}"/>
-        <exec dir="../etherpad_to_hdoc" executable="run.sh"/>
+        <exec executable="/bin/bash" dir="../etherpad_to_hdoc">
+            <arg value="../etherpad_to_hdoc/run.sh"/>
+        </exec>
     </target>
     
     <target name="to_optim_unix" if="${is_unix}">
@@ -36,7 +38,9 @@
             </fileset>
         </delete>
         <copy file="${eth_out}/pad.hdoc" todir="${opti_in}"/>
-        <exec dir="../hdoc_to_optim" executable="run.sh"/>
+        <exec executable="/bin/bash" dir="../hdoc_to_optim">
+            <arg value="../hdoc_to_optim/run.sh"/>
+        </exec>
         <copy file="${opti_out}/*.scar" todir="output"/>        
     </target>
     

lexique_to_hdoc/README.md

@@ -37,9 +37,12 @@ none
 #TODO
 create a better transformation for the ressources. At the moment the user needs to copy the ressources in a folder named "&". The best would be to match the ressources in every definitions, and to call an Ant which automatically copy the ressources needed in this folder.
 Create a transformation which allows every audio resources to be seen in the hdoc.
-create the Ant transformation which copies the sources folder so that the source link is not empty.
+create the Ant transformation which copies the sources and tags folders so that the source link is not empty.
 
 #Technical notes
 If folders' names are changed, you will need to change the tasks of the ANT file.
 
+
 #Capitalisation
+This transformation was created in order to handle hdoc to opale and hdoc to optim transformation for termeRiche. 
+

opale_to_hdoc/README.txt

@@ -241,6 +241,8 @@ value of a submissed relative path.
 
 
 
+- The next group should manage the version of hdoc.
+
 Technical notes
 
 ---------------