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

optim_to_opale/myantce.ant → optim_to_opale/optim_to_opale.ant

@@ -8,10 +8,11 @@
     <property name="log" location="${basedir}/log"/>
     <property name="optim_to_hdoc" location="${basedir}/../optim_to_hdoc"/>
     <property name="hdoc_to_opale" location="${basedir}/../hdoc_to_opale"/>
-    <property name="optim_to_hdoc_in" location="${basedir}/../optim_to_hdoc/input"/>
-    <property name="hdoc_to_opale_in" location="${basedir}/../hdoc_to_opale/input"/>
-    <property name="optim_to_hdoc_out" location="${basedir}/../optim_to_hdoc/output"/>
-    <property name="hdoc_to_opale_out" location="${basedir}/../hdoc_to_opale/output"/>
+    <property name="optim_to_hdoc_in" location="${optim_to_hdoc}/input"/>
+    <property name="hdoc_to_opale_in" location="${hdoc_to_opale}/input"/>
+    <property name="optim_to_hdoc_out" location="${optim_to_hdoc}/output"/>
+    <property name="hdoc_to_opale_out" location="${hdoc_to_opale}/output"/>
+    <property name="optim_to_hdoc_ant" location="${optim_to_hdoc}/optim_to_hdoc.ant"/>
     
     <!-- Mandatory ressource to use if conditions -->
     <taskdef resource="net/sf/antcontrib/antlib.xml">
@@ -21,11 +22,10 @@
     </taskdef>
     
     
-    <!-- CHECK FOR WINDOWS FAMILY OS -->
+    <!-- CHECK FOR FAMILY OS -->
     <condition property="is_windows">
         <os family="windows"/>
     </condition>
-    
     <condition property="is_unix">
         <os family="unix"/>
     </condition>
@@ -53,6 +53,7 @@
                 
                 <antcall target="prepare_hdoc_to_opale"/>
                 <antcall target="run_hdoc_to_opale"/>
+                <antcall target="output_files"/>
             </then>
             
             <else>
@@ -75,7 +76,9 @@
         </antcall>
         
         <copy todir="${optim_to_hdoc_in}">
-            <fileset dir="${in}"/>
+            <fileset dir="${in}">
+                <include name="*.scar"/>
+            </fileset>
         </copy>
     </target>
     
@@ -90,7 +93,8 @@
         <antcall target="add_log">
             <param name="msg" value="Running optim_to_hdoc bat script"/>
         </antcall>
-        <exec executable="cmd">
+        <exec executable="cmd" dir="${optim_to_hdoc}">
+            <arg value="/c"/>
             <arg value="${optim_to_hdoc}/run.bat"/>
         </exec>
     </target>
@@ -100,7 +104,7 @@
         <antcall target="add_log">
             <param name="msg" value="Running optim_to_hdoc shell script"/>
         </antcall>
-        <exec executable="/bin/bash">
+        <exec executable="/bin/bash" dir="${optim_to_hdoc}">
             <arg value="${optim_to_hdoc}/run.sh"/>
         </exec>
     </target>
@@ -119,7 +123,9 @@
         </antcall>
         
         <copy todir="${hdoc_to_opale_in}">
-            <fileset dir="${optim_to_hdoc_out}"/>
+            <fileset dir="${optim_to_hdoc_out}">
+                <include name="*.hdoc"/>
+            </fileset>
         </copy>
     </target>
     
@@ -135,7 +141,8 @@
             <param name="msg" value="Running hdoc_to_opale bat script"/>
         </antcall>
         
-        <exec executable="cmd">
+        <exec executable="cmd" dir="${hdoc_to_opale}">
+            <arg value="/c"/>
             <arg value="${hdoc_to_opale}/run.bat"/>
         </exec>
     </target>
@@ -146,7 +153,7 @@
             <param name="msg" value="Running hdoc_to_opale shell script"/>
         </antcall>
         
-        <exec executable="/bin/bash">
+        <exec executable="/bin/bash" dir="${hdoc_to_opale}">
             <arg value="${hdoc_to_opale}/run.sh"/>
         </exec>
     </target>

optim_to_opale/run.bat

 @echo off
 set lib=lib
-set ant=myantce.ant
+set ant=optim_to_opale.ant
 set antparam=-Dprogram.param=%1
 
 set scJarList=%lib%\*

optim_to_opale/run.sh

 #!/bin/sh
 lib="lib"
-ant="myantce.ant"
+ant="optim_to_opale.ant"
 antparam="-Dprogram.param=$1"
 
 #Recherche de java et controle que se soit une version SUN