Merge remote-tracking branch 'origin/5.5' 84/16184/1
Vincent COUVERT [Thu, 19 Mar 2015 10:02:12 +0000 (11:02 +0100)]
Conflicts:
scilab/configure

Change-Id: I339b16ae0ecccdebb7e90612c1920adfce7b77cd

68 files changed:
scilab/CHANGES_5.5.X
scilab/configure
scilab/contrib/Makefile.am
scilab/contrib/Makefile.in
scilab/contrib/toolbox_skeleton.iss
scilab/contrib/xcos_toolbox_skeleton/demos/Blocks.zcos
scilab/contrib/xcos_toolbox_skeleton/etc/xcos_toolbox_skeleton.start
scilab/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_modelica.gif [new file with mode: 0644]
scilab/contrib/xcos_toolbox_skeleton/images/svg/TBX_SUM_modelica.svg [new file with mode: 0644]
scilab/contrib/xcos_toolbox_skeleton/macros/TBX_SUM_modelica.sci [new file with mode: 0644]
scilab/contrib/xcos_toolbox_skeleton/macros/XcosToolboxSkeleton.mo [new file with mode: 0644]
scilab/contrib/xcos_toolbox_skeleton/macros/buildmacros.sce
scilab/m4/hdf5.m4
scilab/modules/cacsd/macros/sylv.sci
scilab/modules/cacsd/tests/unit_tests/sylv.dia.ref
scilab/modules/cacsd/tests/unit_tests/sylv.tst
scilab/modules/core/includes/machine.h.in
scilab/modules/data_structures/tests/benchmarks/arguments.tst [new file with mode: 0644]
scilab/modules/data_structures/tests/benchmarks/arguments_resize.tst [new file with mode: 0644]
scilab/modules/data_structures/tests/benchmarks/arguments_tlist.tst [new file with mode: 0644]
scilab/modules/data_structures/tests/benchmarks/arguments_tlist_resize.tst [new file with mode: 0644]
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java
scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportBitmap.java
scilab/modules/graphics/demos/basic_functions/basic_functions.dem.gateway.sce
scilab/modules/graphics/demos/basic_functions/basic_functions_xarrows.dem.sce [new file with mode: 0644]
scilab/modules/graphics/help/en_US/geometric_shapes/xarrows.xml
scilab/modules/gui/help/en_US/x_mdialog.xml
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java
scilab/modules/gui/tests/nonreg_tests/bug_8066.tst [new file with mode: 0644]
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/helptools/tests/unit_tests/javahelp.dia.ref [new file with mode: 0644]
scilab/modules/helptools/tests/unit_tests/javahelp.tst [new file with mode: 0644]
scilab/modules/linear_algebra/help/en_US/pencil/sylv.xml
scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.macosx.dia.ref
scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.unix.dia.ref
scilab/modules/modules_manager/tests/unit_tests/xcos_toolbox_skeleton.win.dia.ref
scilab/modules/optimization/macros/numderivative.sci
scilab/modules/scicos/.depend
scilab/modules/scicos/.gitignore
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/Makefile.modelica.am
scilab/modules/scicos/src/modelica_compiler/linenum.mll
scilab/modules/scicos/src/modelica_compiler/parser.mly
scilab/modules/scicos/src/xml2modelica/linenum.ml [deleted file]
scilab/modules/scicos/src/xml2modelica/linenum.mli [deleted file]
scilab/modules/scicos/src/xml2modelica/linenum.mll [new file with mode: 0644]
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java
scilab/modules/signal_processing/macros/wfir_gui.sci
scilab/modules/xcos/tests/nonreg_tests/bug_13758.tst [new file with mode: 0644]
scilab/modules/xcos/tests/nonreg_tests/bug_13758.zcos [new file with mode: 0644]
scilab/tools/innosetup/ca_ES_scilab.isl
scilab/tools/innosetup/cs_CZ_scilab.isl
scilab/tools/innosetup/de_DE_scilab.isl
scilab/tools/innosetup/en_US_scilab.isl
scilab/tools/innosetup/es_ES_scilab.isl
scilab/tools/innosetup/fr_FR_scilab.isl
scilab/tools/innosetup/it_IT_scilab.isl
scilab/tools/innosetup/ja_JP_scilab.isl
scilab/tools/innosetup/pl_PL_scilab.isl
scilab/tools/innosetup/pt_BR_scilab.isl
scilab/tools/innosetup/ru_RU_scilab.isl
scilab/tools/innosetup/uk_UA_scilab.isl
scilab/tools/innosetup/zh_CN_scilab.isl
scilab/tools/innosetup/zh_TW_scilab.isl

index 7113062..601b834 100644 (file)
@@ -33,6 +33,12 @@ Removed Functions
 * xsetm removed. Please use ged instead.
 
 
+Toolbox Skeleton
+=================
+
+* Modelica user-defined block added in xcos_toolbox_skeleton.
+
+
 Compilation
 ===========
 
@@ -48,12 +54,18 @@ Graphics Evolutions
 Scilab Bug Fixes
 ================
 
+* Bug #8066 fixed - There was no OK button in x_choose window.
+
+* Bug #9890 fixed - xarrows demonstration added in Graphics/Basic functions category.
+
 * Bug #12788 fixed - All graphics were displayed in red on some platforms.
 
 * Bug #12842 fixed - Scilab could not be launched on some platforms (ATOMS internal library loading problem).
 
 * Bug #13372 fixed - xsetm should have been removed in Scilab 5.5.0.
 
+* Bug #13531 fixed - sylv help page fixed to include the real Sylvester equation.
+
 * Bug #13549 fixed - Slider uicontrols triggered three callbacks instead of one.
 
 * Bug #13586 fixed - Scilab compilation failed with recent versions of JoGL package.
@@ -92,6 +104,9 @@ Scilab Bug Fixes
 
 * Bug #13752 fixed - The 'Supported compilers' page was outdated.
 
+* Bug #13758 fixed - x_mdialog interpreted 'F' and 'T' as boolean values
+                     whereas it should interpret '%F' and '%T' instead.
+
 * Bug #13772 fixed - Xcos GUI was not locked while setting parameters.
 
 
index d8f9d44..f77cd40 100755 (executable)
@@ -10356,7 +10356,17 @@ else
     if $WITH_DEVTOOLS; then # Scilab thirdparties
         HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
     else
-        ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+        if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
+            ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
+if test "x$ac_cv_header_hdf5_h" = xyes; then :
+  HDF5_CFLAGS="-I/usr/include/hdf5/serial"
+else
+  as_fn_error $? "Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package" "$LINENO" 5
+fi
+
+
+        else
+            ac_fn_c_check_header_mongrel "$LINENO" "hdf5.h" "ac_cv_header_hdf5_h" "$ac_includes_default"
 if test "x$ac_cv_header_hdf5_h" = xyes; then :
   HDF5_CFLAGS=""
 else
@@ -10364,6 +10374,7 @@ else
 fi
 
 
+        fi
     fi
 fi
 
@@ -10425,15 +10436,68 @@ else
     if $WITH_DEVTOOLS; then # Scilab thirparties
         HDF5_LIBS="-L$DEVTOOLS_LIBDIR -lhdf5 -lhdf5_hl"
     else
-        HDF5_LIBS="-lhdf5 -lhdf5_hl"
-        LIBS="$LIBS $HDF5_LIBS"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
+        if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
+            HDF5_LIBS="-lhdf5_serial -lhdf5_serial_hl"
+            LIBS="$LIBS $HDF5_LIBS"
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5_serial" >&5
+$as_echo_n "checking for H5Fopen in -lhdf5_serial... " >&6; }
+if ${ac_cv_lib_hdf5_serial_H5Fopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lhdf5_serial -lz
+                 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char H5Fopen ();
+int
+main ()
+{
+return H5Fopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_hdf5_serial_H5Fopen=yes
+else
+  ac_cv_lib_hdf5_serial_H5Fopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hdf5_serial_H5Fopen" >&5
+$as_echo "$ac_cv_lib_hdf5_serial_H5Fopen" >&6; }
+if test "x$ac_cv_lib_hdf5_serial_H5Fopen" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBHDF5_SERIAL 1
+_ACEOF
+
+  LIBS="-lhdf5_serial $LIBS"
+
+else
+  as_fn_error $? "libhdf5_serial or libhdf5_serial_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct" "$LINENO" 5
+fi
+
+        else
+            HDF5_LIBS="-lhdf5 -lhdf5_hl"
+            LIBS="$LIBS $HDF5_LIBS"
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for H5Fopen in -lhdf5" >&5
 $as_echo_n "checking for H5Fopen in -lhdf5... " >&6; }
 if ${ac_cv_lib_hdf5_H5Fopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lhdf5  $LIBS"
+LIBS="-lhdf5 -lsz -lz
+                 $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -10472,10 +10536,9 @@ _ACEOF
 
 else
   as_fn_error $? "libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct" "$LINENO" 5
-            -lsz -lz
-
 fi
 
+        fi
     fi
 fi
 
@@ -11115,7 +11178,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 11118 "configure"
+// #line 11181 "configure"
 import java.util.regex.Pattern;
 
 
@@ -11202,7 +11265,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 11205 "configure"
+// #line 11268 "configure"
 import java.util.regex.Pattern;
 
 import gnu.java.io.EncodingManager;
@@ -11286,7 +11349,7 @@ $as_echo_n "checking java API version... " >&6; }
     # The class java.nio.charset.Charset is new to 1.4
 
     cat << \EOF > conftest.java
-// #line 11289 "configure"
+// #line 11352 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.charset.Charset;
@@ -11351,7 +11414,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 11354 "configure"
+// #line 11417 "configure"
 import java.util.regex.Pattern;
 
 import java.lang.StringBuilder;
@@ -11416,7 +11479,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 11419 "configure"
+// #line 11482 "configure"
 import java.util.regex.Pattern;
 
 import java.util.ArrayDeque;
@@ -11481,7 +11544,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 11484 "configure"
+// #line 11547 "configure"
 import java.util.regex.Pattern;
 
 import java.nio.file.Path;
@@ -11546,7 +11609,7 @@ EOF
     # The class java.util.stream.DoubleStream is new to 1.8
 
     cat << \EOF > conftest.java
-// #line 11549 "configure"
+// #line 11612 "configure"
 import java.util.regex.Pattern;
 
 import java.util.stream.DoubleStream;
@@ -13024,7 +13087,7 @@ $as_echo_n "checking jgraphx... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13027 "configure"
+// #line 13090 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.model.mxCell;
@@ -13131,7 +13194,7 @@ $as_echo_n "checking minimal version (2.0.0.1) of jgraphx... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13134 "configure"
+// #line 13197 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -13203,7 +13266,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13206 "configure"
+// #line 13269 "configure"
 import java.util.regex.Pattern;
 
 import com.mxgraph.view.mxGraph;
@@ -13297,7 +13360,7 @@ $as_echo_n "checking scirenderer... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13300 "configure"
+// #line 13363 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13404,7 +13467,7 @@ $as_echo_n "checking minimal version (1.1.0) of scirenderer... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13407 "configure"
+// #line 13470 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13476,7 +13539,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13479 "configure"
+// #line 13542 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.scirenderer.PackageInfo;
@@ -13575,7 +13638,7 @@ $as_echo_n "checking flexdock... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13578 "configure"
+// #line 13641 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.docking.DockingManager;
@@ -13682,7 +13745,7 @@ $as_echo_n "checking minimal version (1.2.4) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 13685 "configure"
+// #line 13748 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13754,7 +13817,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 13757 "configure"
+// #line 13820 "configure"
 import java.util.regex.Pattern;
 
 import org.flexdock.util.Utilities;
@@ -13845,7 +13908,7 @@ $as_echo_n "checking looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13848 "configure"
+// #line 13911 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -13962,7 +14025,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13965 "configure"
+// #line 14028 "configure"
 import java.util.regex.Pattern;
 
 import com.jgoodies.looks.common.MenuItemRenderer;
@@ -14080,7 +14143,7 @@ $as_echo_n "checking skinlf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14083 "configure"
+// #line 14146 "configure"
 import java.util.regex.Pattern;
 
 import com.l2fprod.util.AccessUtils;
@@ -14197,7 +14260,7 @@ $as_echo_n "checking jogl2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14200 "configure"
+// #line 14263 "configure"
 import java.util.regex.Pattern;
 
 import javax.media.opengl.glu.GLUnurbs;
@@ -14303,7 +14366,7 @@ $as_echo_n "checking minimal version (Specification-Version 2.2) of jogl2... " >
     if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14306 "configure"
+// #line 14369 "configure"
 import java.util.regex.Pattern;
 
 import java.io.IOException;
@@ -14380,7 +14443,7 @@ EOF
     else
 
     cat << \EOF > conftest.java
-// #line 14383 "configure"
+// #line 14446 "configure"
 import java.util.regex.Pattern;
 
 import java.io.IOException;
@@ -14582,7 +14645,7 @@ $as_echo_n "checking gluegen2-rt... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14585 "configure"
+// #line 14648 "configure"
 import java.util.regex.Pattern;
 
 import jogamp.common.os.MachineDescriptionRuntime;
@@ -14756,7 +14819,7 @@ $as_echo_n "checking jhall... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14759 "configure"
+// #line 14822 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14871,7 +14934,7 @@ $as_echo_n "checking javahelp2... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14874 "configure"
+// #line 14937 "configure"
 import java.util.regex.Pattern;
 
 import javax.help.JHelp;
@@ -14989,7 +15052,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14992 "configure"
+// #line 15055 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -15103,7 +15166,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15106 "configure"
+// #line 15169 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
@@ -15221,7 +15284,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15224 "configure"
+// #line 15287 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
@@ -15327,7 +15390,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15330 "configure"
+// #line 15393 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15399,7 +15462,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15402 "configure"
+// #line 15465 "configure"
 import java.util.regex.Pattern;
 
 import com.artenum.rosetta.util.ConfigurationBuilder;
@@ -15492,7 +15555,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15495 "configure"
+// #line 15558 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.jeuclid.LayoutContext;
@@ -15611,7 +15674,7 @@ $as_echo_n "checking fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15614 "configure"
+// #line 15677 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.fop.pdf.PDFInfo;
@@ -15735,7 +15798,7 @@ $as_echo_n "checking freehep-graphics2d... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15738 "configure"
+// #line 15801 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.graphics2d.VectorGraphics;
@@ -15852,7 +15915,7 @@ $as_echo_n "checking freehep-graphicsio-emf... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15855 "configure"
+// #line 15918 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.graphicsio.emf.EMFGraphics2D;
@@ -15969,7 +16032,7 @@ $as_echo_n "checking freehep-graphicsio... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15972 "configure"
+// #line 16035 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.graphicsio.VectorGraphicsIO;
@@ -16086,7 +16149,7 @@ $as_echo_n "checking freehep-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16089 "configure"
+// #line 16152 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.util.io.XMLSequence;
@@ -16203,7 +16266,7 @@ $as_echo_n "checking freehep-util... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16206 "configure"
+// #line 16269 "configure"
 import java.util.regex.Pattern;
 
 import org.freehep.util.StringUtilities;
@@ -16321,7 +16384,7 @@ $as_echo_n "checking batik-all... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16324 "configure"
+// #line 16387 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -16438,7 +16501,7 @@ $as_echo_n "checking batik... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16441 "configure"
+// #line 16504 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.parser.Parser;
@@ -16545,7 +16608,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 16548 "configure"
+// #line 16611 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -16617,7 +16680,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 16620 "configure"
+// #line 16683 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.batik.Version;
@@ -16708,7 +16771,7 @@ $as_echo_n "checking commons-io... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16711 "configure"
+// #line 16774 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.output.CountingOutputStream;
@@ -16825,7 +16888,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16828 "configure"
+// #line 16891 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.xmlgraphics.util.Service;
@@ -16942,7 +17005,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16945 "configure"
+// #line 17008 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.avalon.framework.configuration.ConfigurationException;
@@ -17059,7 +17122,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17062 "configure"
+// #line 17125 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -17176,7 +17239,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17179 "configure"
+// #line 17242 "configure"
 import java.util.regex.Pattern;
 
 import org.w3c.dom.svg.SVGDocument;
@@ -17297,7 +17360,7 @@ $as_echo_n "checking commons-logging... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17300 "configure"
+// #line 17363 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.logging.LogFactory;
@@ -17414,7 +17477,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17417 "configure"
+// #line 17480 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17521,7 +17584,7 @@ $as_echo_n "checking minimal version (1.0.3) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 17524 "configure"
+// #line 17587 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17593,7 +17656,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 17596 "configure"
+// #line 17659 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.TeXFormula;
@@ -17684,7 +17747,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17687 "configure"
+// #line 17750 "configure"
 import java.util.regex.Pattern;
 
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
@@ -17807,7 +17870,7 @@ $as_echo_n "checking checkstyle... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17810 "configure"
+// #line 17873 "configure"
 import java.util.regex.Pattern;
 
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
@@ -17924,7 +17987,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 17927 "configure"
+// #line 17990 "configure"
 import java.util.regex.Pattern;
 
 import org.apache.commons.beanutils.Converter;
@@ -18041,7 +18104,7 @@ $as_echo_n "checking antlr... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18044 "configure"
+// #line 18107 "configure"
 import java.util.regex.Pattern;
 
 import antlr.TokenStreamException;
@@ -18158,7 +18221,7 @@ $as_echo_n "checking junit4... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18161 "configure"
+// #line 18224 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -18272,7 +18335,7 @@ $as_echo_n "checking junit... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18275 "configure"
+// #line 18338 "configure"
 import java.util.regex.Pattern;
 
 import org.junit.Assert;
@@ -18393,7 +18456,7 @@ $as_echo_n "checking cobertura... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18396 "configure"
+// #line 18459 "configure"
 import java.util.regex.Pattern;
 
 import net.sourceforge.cobertura.merge.Main;
@@ -18510,7 +18573,7 @@ $as_echo_n "checking asm3... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18513 "configure"
+// #line 18576 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -18624,7 +18687,7 @@ $as_echo_n "checking asm... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18627 "configure"
+// #line 18690 "configure"
 import java.util.regex.Pattern;
 
 import org.objectweb.asm.Type;
@@ -18741,7 +18804,7 @@ $as_echo_n "checking ecj... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 18744 "configure"
+// #line 18807 "configure"
 import java.util.regex.Pattern;
 
 import org.eclipse.jdt.core.compiler.batch.BatchCompiler;
@@ -27333,7 +27396,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 27336 "configure"
+#line 27399 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -27644,7 +27707,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 27647 "configure"
+#line 27710 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -28233,7 +28296,7 @@ $as_echo_n "checking saxon9he... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 28236 "configure"
+// #line 28299 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -28348,7 +28411,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 28351 "configure"
+// #line 28414 "configure"
 import java.util.regex.Pattern;
 
 import net.sf.saxon.Version;
@@ -28464,7 +28527,7 @@ $as_echo_n "checking saxon... " >&6; }
             export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 28467 "configure"
+// #line 28530 "configure"
 import java.util.regex.Pattern;
 
 import com.icl.saxon.Loader;
index c36b65f..2ed173b 100644 (file)
@@ -95,10 +95,12 @@ xcos_toolbox_skeleton/help/fr_FR/build_help.sce \
 xcos_toolbox_skeleton/images/gif/TBX_MUT_STYLE.gif \
 xcos_toolbox_skeleton/images/gif/TBX_NOOP.gif \
 xcos_toolbox_skeleton/images/gif/TBX_SUM_c.gif \
+xcos_toolbox_skeleton/images/gif/TBX_SUM_modelica.gif \
 xcos_toolbox_skeleton/images/gif/TBX_SUM_sci.gif \
 xcos_toolbox_skeleton/images/svg/TBX_MUT_STYLE.svg \
 xcos_toolbox_skeleton/images/svg/TBX_NOOP.svg \
 xcos_toolbox_skeleton/images/svg/TBX_SUM_c.svg \
+xcos_toolbox_skeleton/images/svg/TBX_SUM_modelica.svg \
 xcos_toolbox_skeleton/images/svg/TBX_SUM_sci.svg \
 xcos_toolbox_skeleton/license.txt \
 xcos_toolbox_skeleton/macros/buildmacros.sce \
@@ -108,8 +110,10 @@ xcos_toolbox_skeleton/macros/TBX_NOOP.sci \
 xcos_toolbox_skeleton/macros/TBX_NOOP_sci.sci \
 xcos_toolbox_skeleton/macros/TBX_NOOP_sim.sci \
 xcos_toolbox_skeleton/macros/TBX_SUM_c.sci \
+xcos_toolbox_skeleton/macros/TBX_SUM_modelica.sci \
 xcos_toolbox_skeleton/macros/TBX_SUM_sci.sci \
 xcos_toolbox_skeleton/macros/TBX_SUM_sim.sci \
+xcos_toolbox_skeleton/macros/XcosToolboxSkeleton.mo \
 xcos_toolbox_skeleton/sci_gateway/builder_gateway.sce \
 xcos_toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
 xcos_toolbox_skeleton/sci_gateway/c/sci_tbx_sum.c \
index ee02b35..078b59c 100644 (file)
@@ -498,10 +498,12 @@ xcos_toolbox_skeleton/help/fr_FR/build_help.sce \
 xcos_toolbox_skeleton/images/gif/TBX_MUT_STYLE.gif \
 xcos_toolbox_skeleton/images/gif/TBX_NOOP.gif \
 xcos_toolbox_skeleton/images/gif/TBX_SUM_c.gif \
+xcos_toolbox_skeleton/images/gif/TBX_SUM_modelica.gif \
 xcos_toolbox_skeleton/images/gif/TBX_SUM_sci.gif \
 xcos_toolbox_skeleton/images/svg/TBX_MUT_STYLE.svg \
 xcos_toolbox_skeleton/images/svg/TBX_NOOP.svg \
 xcos_toolbox_skeleton/images/svg/TBX_SUM_c.svg \
+xcos_toolbox_skeleton/images/svg/TBX_SUM_modelica.svg \
 xcos_toolbox_skeleton/images/svg/TBX_SUM_sci.svg \
 xcos_toolbox_skeleton/license.txt \
 xcos_toolbox_skeleton/macros/buildmacros.sce \
@@ -511,8 +513,10 @@ xcos_toolbox_skeleton/macros/TBX_NOOP.sci \
 xcos_toolbox_skeleton/macros/TBX_NOOP_sci.sci \
 xcos_toolbox_skeleton/macros/TBX_NOOP_sim.sci \
 xcos_toolbox_skeleton/macros/TBX_SUM_c.sci \
+xcos_toolbox_skeleton/macros/TBX_SUM_modelica.sci \
 xcos_toolbox_skeleton/macros/TBX_SUM_sci.sci \
 xcos_toolbox_skeleton/macros/TBX_SUM_sim.sci \
+xcos_toolbox_skeleton/macros/XcosToolboxSkeleton.mo \
 xcos_toolbox_skeleton/sci_gateway/builder_gateway.sce \
 xcos_toolbox_skeleton/sci_gateway/c/builder_gateway_c.sce \
 xcos_toolbox_skeleton/sci_gateway/c/sci_tbx_sum.c \
index e562a76..9ff2bda 100644 (file)
@@ -77,6 +77,7 @@ Source: contrib\{#XCOS_TOOLBOX_SKELETON}\help\fr_FR\build_help.sce; DestDir: {ap
 Source: contrib\{#XCOS_TOOLBOX_SKELETON}\images\gif\*.gif; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\images\gif; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
 Source: contrib\{#XCOS_TOOLBOX_SKELETON}\images\svg\*.svg; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\images\svg; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
 Source: contrib\{#XCOS_TOOLBOX_SKELETON}\macros\*.sci; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\macros; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
+Source: contrib\{#XCOS_TOOLBOX_SKELETON}\macros\*.mo; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\macros; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
 Source: contrib\{#XCOS_TOOLBOX_SKELETON}\macros\buildmacros.sce; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\macros; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
 Source: contrib\{#XCOS_TOOLBOX_SKELETON}\macros\cleanmacros.sce; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\macros; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
 Source: contrib\{#XCOS_TOOLBOX_SKELETON}\sci_gateway\builder_gateway.sce; DestDir: {app}\contrib\{#XCOS_TOOLBOX_SKELETON}\sci_gateway; Flags: recursesubdirs; Components: {#COMPN_TOOLBOX_SKELETON} and {#COMPN_XCOS}
index 3afff4e..7676bee 100644 (file)
Binary files a/scilab/contrib/xcos_toolbox_skeleton/demos/Blocks.zcos and b/scilab/contrib/xcos_toolbox_skeleton/demos/Blocks.zcos differ
index da356b2..027851c 100644 (file)
@@ -52,6 +52,11 @@ function xcos_skeletonlib = startModule()
   exec(pathconvert(root_tlbx+"/sci_gateway/loader_gateway.sce", %f));
   ilib_verbose(verboseMode);
 
+// Append Modelica functionnals
+// =============================================================================
+  global %MODELICA_USER_LIBS;
+  %MODELICA_USER_LIBS = [%MODELICA_USER_LIBS ; root_tlbx+"/macros"];
+
 // Load and add help chapter
 // =============================================================================
   if or(getscilabmode() == ["NW";"STD"]) then
diff --git a/scilab/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_modelica.gif b/scilab/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_modelica.gif
new file mode 100644 (file)
index 0000000..e7b590c
Binary files /dev/null and b/scilab/contrib/xcos_toolbox_skeleton/images/gif/TBX_SUM_modelica.gif differ
diff --git a/scilab/contrib/xcos_toolbox_skeleton/images/svg/TBX_SUM_modelica.svg b/scilab/contrib/xcos_toolbox_skeleton/images/svg/TBX_SUM_modelica.svg
new file mode 100644 (file)
index 0000000..b284849
--- /dev/null
@@ -0,0 +1 @@
+<svg/>
diff --git a/scilab/contrib/xcos_toolbox_skeleton/macros/TBX_SUM_modelica.sci b/scilab/contrib/xcos_toolbox_skeleton/macros/TBX_SUM_modelica.sci
new file mode 100644 (file)
index 0000000..8a6ddda
--- /dev/null
@@ -0,0 +1,40 @@
+//
+// This file is part of the Xcos skeleton toolbox
+//
+// see license.txt for more licensing information
+
+function [x,y,typ]=TBX_SUM_modelica(job,arg1,arg2)
+    x=[];y=[];typ=[]
+    select job
+    case "set" then
+        x=arg1;
+        // no parameters yet
+    case "define" then
+        model=scicos_model()
+        model.sim="XcosToolboxSkeleton.Sum"
+        // two inputs with a single "double" element
+        model.in=[1;1]
+        model.intyp=[1;1]
+        // one output with a single "double" element
+        model.out=1
+        model.outtyp=1
+
+        model.blocktype="c"
+        model.dep_ut=[%t %f]
+
+        mo=modelica();
+        mo.model="XcosToolboxSkeleton.Sum"
+        mo.inputs=["in1","in2"];
+        mo.outputs=["out"];
+        mo.parameters=list([],list())
+        model.equations=mo;
+
+        exprs=string([]);
+        gr_i=[]
+        x=standard_define([4 4],model,exprs,gr_i)
+        x.graphics.in_implicit=["E";"E"];
+        x.graphics.out_implicit=["E"];
+        x.graphics.style=["blockWithLabel;displayedLabel=TBX_SUM_modelica"]
+    end
+endfunction
+
diff --git a/scilab/contrib/xcos_toolbox_skeleton/macros/XcosToolboxSkeleton.mo b/scilab/contrib/xcos_toolbox_skeleton/macros/XcosToolboxSkeleton.mo
new file mode 100644 (file)
index 0000000..0398697
--- /dev/null
@@ -0,0 +1,18 @@
+//
+// This file is part of the Xcos skeleton toolbox
+//
+// see license.txt for more licensing information
+
+package XcosToolboxSkeleton
+
+  model Sum "Perfom the summation of the two inputs"
+    Real in1 "the first input";
+    Real in2 "the second input";
+    Real out "the output" ;
+  equation
+    out = in1 + in2;
+  end Sum;
+
+end XcosToolboxSkeleton;
+
+
index 8e66649..155410f 100644 (file)
@@ -3,7 +3,7 @@
 function buildmacros()
     macros_path = get_absolute_file_path("buildmacros.sce");
 
-    blocks = ["TBX_SUM_c" "TBX_MUT_STYLE", "TBX_SUM_sci", "TBX_NOOP"];
+    blocks = ["TBX_SUM_c", "TBX_SUM_sci", "TBX_SUM_modelica", "TBX_MUT_STYLE", "TBX_NOOP"];
 
     tbx_build_macros(TOOLBOX_NAME, macros_path);
     tbx_build_blocks(toolbox_dir, blocks);
index 39815a6..f40137a 100644 (file)
@@ -42,9 +42,15 @@ else
     if $WITH_DEVTOOLS; then # Scilab thirdparties
         HDF5_CFLAGS="-I$DEVTOOLS_INCDIR"
     else
-        AC_CHECK_HEADER([hdf5.h],
-            [HDF5_CFLAGS=""],
-            [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
+        if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
+            AC_CHECK_HEADER([hdf5.h],
+                [HDF5_CFLAGS="-I/usr/include/hdf5/serial"],
+                [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
+        else
+            AC_CHECK_HEADER([hdf5.h],
+                [HDF5_CFLAGS=""],
+                [AC_MSG_ERROR([Cannot find headers (hdf5.h) of the library HDF5. Please install the dev package])])
+        fi
     fi
 fi
 
@@ -63,13 +69,23 @@ else
     if $WITH_DEVTOOLS; then # Scilab thirparties
         HDF5_LIBS="-L$DEVTOOLS_LIBDIR -lhdf5 -lhdf5_hl"
     else
-        HDF5_LIBS="-lhdf5 -lhdf5_hl"
-        LIBS="$LIBS $HDF5_LIBS"
-        AC_CHECK_LIB([hdf5], [H5Fopen],
-            [],
-            [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])]
-            [-lsz -lz]
-            )
+        if test -d /usr/include/hdf5/serial; then # New Debian packaging layout since hdf5-1.8.13
+            HDF5_LIBS="-lhdf5_serial -lhdf5_serial_hl"
+            LIBS="$LIBS $HDF5_LIBS"
+            AC_CHECK_LIB([hdf5_serial], [H5Fopen],
+                [],
+                [AC_MSG_ERROR([libhdf5_serial or libhdf5_serial_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])],
+                [-lz]
+                )
+        else
+            HDF5_LIBS="-lhdf5 -lhdf5_hl"
+            LIBS="$LIBS $HDF5_LIBS"
+            AC_CHECK_LIB([hdf5], [H5Fopen],
+                [],
+                [AC_MSG_ERROR([libhdf5 or libhdf5_hl: library missing. (Cannot find symbol H5Fopen). Check if libhdf5 is installed and if the version is correct])],
+                [-lsz -lz]
+                )
+        fi
     fi
 fi
 
index 4eabad1..c1a51bc 100644 (file)
@@ -8,7 +8,7 @@
 // http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
 
 function X = sylv(A,B,C,flag)
-    //  solve  A*X+X*B=C if flag=='c' or  A*X*B-X=C if flag=='d'
+    //  solve  A*X+X*B=C if flag=='c' or  A*X*B+X=C if flag=='d'
     if argn(2)<>4 then
         error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),"sylv",4))
     end
index 4efb106..dc28ac3 100644 (file)
@@ -8,9 +8,12 @@
 // Run with test_run('cacsd', 'sylv', ['no_check_error_output']);
 A = rand(4, 4); C = rand(4, 3); B = rand(3, 3);
 // Solve continuous-time Sylvester equation: A*X+X*B = C
-X = sylv(A, B, C, 'c');
+X = sylv(A, B, C, "c");
 expected_norm = 1.D-16;
 if norm(A*X+X*B-C)-expected_norm > 1.D-15 then bugmes();quit;end
-// Solve discrete-time Sylvester equation: A*X*B+X = C
-X = sylv(A, B, C, 'd');
+// Solve modified discrete-time Sylvester equation: A*X*B+X = C
+X = sylv(A, B, C, "d");
 if norm(A*X*B+X-C)-expected_norm > 1.D-15 then bugmes();quit;end
+// Solve real discrete-time Sylvester equation: A*X*B+X = C
+X = -sylv(-A, B, C, "d");
+if norm(A*X*B-X-C)-expected_norm > 1.D-15 then bugmes();quit;end
index 6c7eecf..c89fcd0 100644 (file)
 A = rand(4, 4); C = rand(4, 3); B = rand(3, 3);
 
 // Solve continuous-time Sylvester equation: A*X+X*B = C
-X = sylv(A, B, C, 'c');
+X = sylv(A, B, C, "c");
 
 expected_norm = 1.D-16;
 
 if norm(A*X+X*B-C)-expected_norm > 1.D-15 then pause,end
 
-// Solve discrete-time Sylvester equation: A*X*B+X = C
-X = sylv(A, B, C, 'd');
+// Solve modified discrete-time Sylvester equation: A*X*B+X = C
+X = sylv(A, B, C, "d");
 
 if norm(A*X*B+X-C)-expected_norm > 1.D-15 then pause,end
+
+// Solve real discrete-time Sylvester equation: A*X*B+X = C
+X = -sylv(-A, B, C, "d");
+
+if norm(A*X*B-X-C)-expected_norm > 1.D-15 then pause,end
index a20c2e3..c99c58e 100644 (file)
 /* Define to 1 if you have the `hdf5' library (-lhdf5). */
 #undef HAVE_LIBHDF5
 
+/* Define to 1 if you have the `hdf5_serial' library (-lhdf5_serial). */
+#undef HAVE_LIBHDF5_SERIAL
+
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 
diff --git a/scilab/modules/data_structures/tests/benchmarks/arguments.tst b/scilab/modules/data_structures/tests/benchmarks/arguments.tst
new file mode 100644 (file)
index 0000000..9b51c70
--- /dev/null
@@ -0,0 +1,27 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Clement DAVID
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//==============================================================================
+// Pass raw values as rhs / lhs
+//==============================================================================
+
+// <-- BENCH NB RUN : 10 -->
+
+stacksize("max");
+
+foo1 = zeros(4096,4096);
+foo2 = zeros(4096,4096);
+foo3 = zeros(4096,4096);
+
+function foo3=computation(foo1, foo2)
+    foo3 = foo1 + foo2
+endfunction
+
+// <-- BENCH START -->
+foo3 = computation(foo1, foo2);
+// <-- BENCH END -->
+
diff --git a/scilab/modules/data_structures/tests/benchmarks/arguments_resize.tst b/scilab/modules/data_structures/tests/benchmarks/arguments_resize.tst
new file mode 100644 (file)
index 0000000..dbadb54
--- /dev/null
@@ -0,0 +1,27 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Clement DAVID
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//==============================================================================
+// Pass raw values as rhs / lhs
+//==============================================================================
+
+// <-- BENCH NB RUN : 10 -->
+
+stacksize("max");
+
+foo1 = zeros(4096,4096);
+foo2 = zeros(4096,4096);
+foo3 = [];
+
+function foo3=computation(foo1, foo2)
+    foo3 = foo1 + foo2
+endfunction
+
+// <-- BENCH START -->
+foo3 = computation(foo1, foo2);
+// <-- BENCH END -->
+
diff --git a/scilab/modules/data_structures/tests/benchmarks/arguments_tlist.tst b/scilab/modules/data_structures/tests/benchmarks/arguments_tlist.tst
new file mode 100644 (file)
index 0000000..87cc82b
--- /dev/null
@@ -0,0 +1,29 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Clement DAVID
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//==============================================================================
+// Pass tlist as rhs / lhs, let scilab reuse the allocated space
+//==============================================================================
+
+// <-- BENCH NB RUN : 10 -->
+
+stacksize("max");
+
+data = tlist(["mydata" "foo1" "foo2" "foo3"], [], [], []);
+
+data.foo1 = zeros(4096,4096);
+data.foo2 = zeros(4096,4096);
+data.foo3 = zeros(4096,4096);
+
+function data=computation(data)
+    data.foo3 = data.foo1 + data.foo2
+endfunction
+
+// <-- BENCH START -->
+data = computation(data);
+// <-- BENCH END -->
+
diff --git a/scilab/modules/data_structures/tests/benchmarks/arguments_tlist_resize.tst b/scilab/modules/data_structures/tests/benchmarks/arguments_tlist_resize.tst
new file mode 100644 (file)
index 0000000..b0c9304
--- /dev/null
@@ -0,0 +1,28 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Clement DAVID
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+//==============================================================================
+// Pass tlist as rhs / lhs
+//==============================================================================
+
+// <-- BENCH NB RUN : 10 -->
+
+stacksize("max");
+
+data = tlist(["mydata" "foo1" "foo2" "foo3"], [], [], []);
+
+data.foo1 = zeros(4096,4096);
+data.foo2 = zeros(4096,4096);
+
+function data=computation(data)
+    data.foo3 = data.foo1 + data.foo2
+endfunction
+
+// <-- BENCH START -->
+data = computation(data);
+// <-- BENCH END -->
+
index 138dfed..68a1cf9 100644 (file)
@@ -79,6 +79,7 @@ public class Export {
     public static final int MEMORY_ERROR = 3;
     public static final int UNKNOWN_ERROR = 4;
     public static final int FILENOTFOUND_ERROR = 5;
+    public static final int NOWRITER_ERROR = 5;
 
     private static final float DEFAULT_JPEG_COMPRESSION = 0.95f;
 
@@ -364,11 +365,22 @@ public class Export {
             }
 
             if (joglCanvas != null) {
+                BufferedImage image = joglCanvas.getImage();
                 PNGExporter exporter = (PNGExporter) getExporter(type);
-                BufferedImage image = joglCanvas.getImage(exporter.isAlphaChannelSupported());
                 exporter.setImage(file, image, params);
-                exporter.write();
+                int exportStatus = exporter.write();
                 exporter.dispose();
+                if (isBitmapFormat(type) && exportStatus == Export.NOWRITER_ERROR) {
+                    // If export fails because no writer was found for bitmap format
+                    // ==> Retry without Alpha channel in image
+                    // Needed after JoGL 2.2.4 version
+                    image = joglCanvas.getImage(false);
+                    exporter = (PNGExporter) getExporter(type);
+                    exporter.setImage(file, image, params);
+                    exporter.write();
+                    exporter.dispose();
+                }
+
             }
         }
     }
@@ -497,7 +509,7 @@ public class Export {
         /**
          * Write the file
          */
-        abstract void write() throws IOException;
+        abstract int write() throws IOException;
 
         abstract void dispose();
     }
@@ -530,8 +542,8 @@ public class Export {
         }
 
         @Override
-        public void write() throws IOException {
-            ExportBitmap.writeFile(image, "png", file);
+        public int write() throws IOException {
+            return ExportBitmap.writeFile(image, "png", file);
         }
 
         @Override
@@ -540,11 +552,6 @@ public class Export {
                 g2d.dispose();
             }
         }
-
-        public boolean isAlphaChannelSupported() {
-            return true;
-        }
-
     }
 
     /**
@@ -555,14 +562,9 @@ public class Export {
         public GIFExporter() { }
 
         @Override
-        public void write() throws IOException {
-            ExportBitmap.writeFile(image, "gif", file);
-        }
-
-        public boolean isAlphaChannelSupported() {
-            return false;
+        public int write() throws IOException {
+            return ExportBitmap.writeFile(image, "gif", file);
         }
-
     }
 
     /**
@@ -583,14 +585,9 @@ public class Export {
         }
 
         @Override
-        public void write() throws IOException {
-            ExportBitmap.writeFile(image, "bmp", file);
-        }
-
-        public boolean isAlphaChannelSupported() {
-            return false;
+        public int write() throws IOException {
+            return ExportBitmap.writeFile(image, "bmp", file);
         }
-
     }
 
     /**
@@ -601,18 +598,13 @@ public class Export {
         public JPEGExporter() { }
 
         @Override
-        public void write() throws IOException {
+        public int write() throws IOException {
             if (params.compressionQuality == -1) {
-                ExportBitmap.writeJPEG(image, DEFAULT_JPEG_COMPRESSION, file);
+                return ExportBitmap.writeJPEG(image, DEFAULT_JPEG_COMPRESSION, file);
             } else {
-                ExportBitmap.writeJPEG(image, params.compressionQuality, file);
+                return ExportBitmap.writeJPEG(image, params.compressionQuality, file);
             }
         }
-
-        public boolean isAlphaChannelSupported() {
-            return false;
-        }
-
     }
 
     /**
@@ -623,7 +615,7 @@ public class Export {
         public PPMExporter() { }
 
         @Override
-        public void write() throws IOException {
+        public int write() throws IOException {
             OutputStream out = new BufferedOutputStream(new FileOutputStream(file));
             PPMEncoder encoder = new PPMEncoder(image, out);
             int[] pixels = image.getRGB(0, 0, image.getWidth(), image.getHeight(), null, 0, image.getWidth());
@@ -631,6 +623,7 @@ public class Export {
             encoder.encodePixels(0, 0, image.getWidth(), image.getHeight(), pixels, 0, image.getWidth());
             out.flush();
             out.close();
+            return Export.SUCCESS;
         }
     }
 
@@ -681,13 +674,14 @@ public class Export {
         }
 
         @Override
-        public void write() throws IOException {
+        public int write() throws IOException {
             boolean useCSS = true;
             OutputStream svgs = new BufferedOutputStream(new FileOutputStream(file));
             Writer out = new OutputStreamWriter(svgs, "UTF-8");
             g2d.stream(out, useCSS);
             svgs.flush();
             svgs.close();
+            return Export.SUCCESS;
         }
 
         @Override
@@ -742,7 +736,7 @@ public class Export {
         }
 
         @Override
-        public void write() throws IOException {
+        public int write() throws IOException {
             if (g2d != null) {
                 g2d.finish();
             }
@@ -756,6 +750,7 @@ public class Export {
             if (out != null) {
                 out.close();
             }
+            return Export.SUCCESS;
         }
 
         @Override
@@ -914,7 +909,7 @@ public class Export {
         }
 
         @Override
-        public void write() throws IOException {
+        public int write() throws IOException {
             if (g2d != null) {
                 g2d.finish();
             }
@@ -928,6 +923,7 @@ public class Export {
             if (out != null) {
                 out.close();
             }
+            return Export.SUCCESS;
         }
 
         @Override
@@ -1158,7 +1154,7 @@ public class Export {
         }
 
         @Override
-        public void write() throws IOException {
+        public int write() throws IOException {
             if (g2d != null) {
                 try {
                     g2dClass.getMethod("endExport").invoke(g2d);
@@ -1180,6 +1176,7 @@ public class Export {
             if (out != null) {
                 out.close();
             }
+            return Export.SUCCESS;
         }
 
         @Override
index 3cf36b2..abbb689 100644 (file)
@@ -50,7 +50,10 @@ public class ExportBitmap {
             for (int i = 0; i < MAX_ATTEMPT && ret != Export.SUCCESS; i++) {
                 try {
                     fos = new FileOutputStream(file);
-                    ImageIO.write(image, ext, fos);
+                    boolean writerFound = ImageIO.write(image, ext, fos);
+                    if (writerFound == false) {
+                        return Export.NOWRITER_ERROR;
+                    }
                     fos.close();
                     ret = Export.SUCCESS;
                 } catch (FileNotFoundException e) {
@@ -71,22 +74,26 @@ public class ExportBitmap {
      * @param compressionQuality the compression rate
      * @param file the output file
      */
-    public static boolean writeJPEG(BufferedImage image, float compressionQuality, File file) throws IOException {
+    public static int writeJPEG(BufferedImage image, float compressionQuality, File file) throws IOException {
         Iterator iter = ImageIO.getImageWritersByFormatName("jpeg");
         ImageWriter writer;
         if (iter.hasNext()) {
             writer = (ImageWriter) iter.next();
         } else {
-            return false;
+            return Export.NOWRITER_ERROR;
         }
         ImageWriteParam param = writer.getDefaultWriteParam();
         param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
         param.setCompressionQuality(compressionQuality);
         FileImageOutputStream output = new FileImageOutputStream(file);
         writer.setOutput(output);
-        writer.write(null, new IIOImage(image, null, null), param);
+        try {
+            writer.write(null, new IIOImage(image, null, null), param);
+        } catch (IOException e) {
+            return Export.NOWRITER_ERROR;
+        }
         writer.dispose();
         output.close();
-        return true;
+        return Export.SUCCESS;
     }
 }
index fedd8f0..e833eac 100644 (file)
@@ -6,15 +6,16 @@
 demopath = get_absolute_file_path("basic_functions.dem.gateway.sce");
 
 subdemolist=[                                                                            ..
-"Rectangles, Arcs, Polylines, Segments and Numbers","basic_functions_1.dem.sce" ; ..
-"Rectangles, Arcs, Polylines and Strings"          ,"basic_functions_2.dem.sce" ; ..
-"Setting properties"                               ,"basic_functions_3.dem.sce" ; ..
-"Window properties"                                ,"basic_functions_4.dem.sce" ; ..
-"Set of rectangles"                                ,"basic_functions_5.dem.sce" ; ..
-"Colored matrix"                                   ,"basic_functions_6.dem.sce" ; ..
-"Colored histogram"                                ,"basic_functions_7.dem.sce" ; ..
-"Pie Chart"                                        ,"basic_functions_8.dem.sce" ; ..
-"Milk Drop"                                        ,"basic_functions_9.dem.sce" ]
+"Rectangles, Arcs, Polylines, Segments and Numbers", "basic_functions_1.dem.sce" ; ...
+"Rectangles, Arcs, Polylines and Strings"          , "basic_functions_2.dem.sce" ; ...
+"Setting properties"                               , "basic_functions_3.dem.sce" ; ...
+"Window properties"                                , "basic_functions_4.dem.sce" ; ...
+"Set of rectangles"                                , "basic_functions_5.dem.sce" ; ...
+"Colored matrix"                                   , "basic_functions_6.dem.sce" ; ...
+"Colored histogram"                                , "basic_functions_7.dem.sce" ; ...
+"Pie Chart"                                        , "basic_functions_8.dem.sce" ; ...
+"Milk Drop"                                        , "basic_functions_9.dem.sce" ; ...
+"Xarrows"                                          , "basic_functions_xarrows.dem.sce"; ];
 
-subdemolist(:,2) = demopath + subdemolist(:,2);
+subdemolist(:, 2) = demopath + subdemolist(:, 2);
 clear demopath;
diff --git a/scilab/modules/graphics/demos/basic_functions/basic_functions_xarrows.dem.sce b/scilab/modules/graphics/demos/basic_functions/basic_functions_xarrows.dem.sce
new file mode 100644 (file)
index 0000000..bf6c7b1
--- /dev/null
@@ -0,0 +1,40 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 Scilab Enterprises - Pierre-Aime Agnel
+//
+// This file is distributed under the same license as the Scilab package.
+
+// = =========================================================================== =
+// xarrows
+// = =========================================================================== =
+
+fp_old = funcprot();
+w_old  = warning("query");
+funcprot(0);
+warning("off");
+
+function demo_basic_function_xarrows()
+    f = figure("dockable", "off", "toolbar", "none", "visible", "off");
+    f.backgroundcolor = [1, 1, 1];
+    f.figure_name = "xarrows in 3D";
+
+    N = 100;
+    zi = linspace(-1, 2, N);
+    zf = zi;
+    theta = (zi - min(zi)) / (max(zi)-min(zi)) * 720;
+    xi = zeros(1, N);  xf = cosd(theta);
+    yi = zeros(1, N);  yf = sind(theta);
+
+    plot3d([-1 1 1 1], [-1 -1 -1 1], [-1 -1 2 2])
+    xarrows([xi; xf], [yi; yf], [zi; zf], 0.7, 32*rand(1, N))
+
+    demo_viewCode("basic_functions_xarrows.dem.sce")
+    f.visible = "on"
+endfunction
+
+demo_basic_function_xarrows();
+clear demo_basic_function_xarrows;
+
+funcprot(fp_old);
+warning(w_old);
+clear fp_old w_old;
index ea4bda9..92f6c99 100644 (file)
@@ -59,7 +59,7 @@
         <para>
             <function>xarrows</function> draws a set of arrows
             given by <varname>nx</varname>, <varname>ny</varname> and <varname>nz</varname>.
-           If <varname>nz</varname> is not given, then the arrows are drawn in 2D.
+            If <varname>nz</varname> is not given, then the arrows are drawn in 2D.
             If <varname>nx</varname>, <varname>ny</varname> and <varname>nz</varname> are vectors,
             the <literal>i</literal>-th arrow is defined by
             <literal>(nx(i),ny(i),nz(i))--&gt;(nx(i+1),ny(i+1),nz(i+1))</literal>.
@@ -110,14 +110,14 @@ clf, plot3d([-1 1 1 1],[-1 -1 -1 1],[-1 -1 2 2])
 xarrows([xi;xf],[yi;yf],[zi;zf],0.7, 32*rand(1,N))
  ]]></programlisting>
         <scilab:image>
-N = 100;
-zi = linspace(-1,2,N);
-zf = zi;
-theta = (zi - min(zi))/(max(zi)-min(zi))*720;
-xi = zeros(1,N);  xf = cosd(theta);
-yi = zeros(1,N);  yf = sind(theta);
-clf, plot3d([-1 1 1 1],[-1 -1 -1 1],[-1 -1 2 2])
-xarrows([xi;xf],[yi;yf],[zi;zf],0.7, 32*rand(1,N))
+            N = 100;
+            zi = linspace(-1,2,N);
+            zf = zi;
+            theta = (zi - min(zi))/(max(zi)-min(zi))*720;
+            xi = zeros(1,N);  xf = cosd(theta);
+            yi = zeros(1,N);  yf = sind(theta);
+            clf, plot3d([-1 1 1 1],[-1 -1 -1 1],[-1 -1 2 2])
+            xarrows([xi;xf],[yi;yf],[zi;zf],0.7, 32*rand(1,N))
         </scilab:image>
     </refsection>
     <refsection>
index a9590e2..bceb009 100644 (file)
@@ -101,7 +101,7 @@ rep = x_mdialog('Enter a matrix',...
  ]]></programlisting>
         <programlisting role="example"><![CDATA[
 sz = [10,10];
-default_input_matrix = string(rand(sz(1), sz(2)) > 0.5);
+default_input_matrix = "%"+string(rand(sz(1), sz(2)) > 0.5);
 labelsv = string(1:sz(1));
 labelsh = string(1:sz(2));
 rep = x_mdialog('Enter a boolean matrix', labelsv, labelsh, default_input_matrix)
index 35d7ec4..f60e678 100644 (file)
@@ -459,10 +459,10 @@ public class SwingScilabMessageBox extends JDialog implements SimpleMessageBox,
                     final String initial = defaultInput[col * lineLabels.length + line];
 
                     final Component c;
-                    if ("T".equalsIgnoreCase(initial)) {
+                    if ("%T".equalsIgnoreCase(initial)) {
                         c = new JCheckBox();
                         ((JCheckBox) c).setSelected(true);
-                    } else if ("F".equalsIgnoreCase(initial)) {
+                    } else if ("%F".equalsIgnoreCase(initial)) {
                         c = new JCheckBox();
                         ((JCheckBox) c).setSelected(false);
                     } else {
@@ -583,12 +583,14 @@ public class SwingScilabMessageBox extends JDialog implements SimpleMessageBox,
             objs[1] = createXchooseListBox();
 
             // And now the buttons
-            buttons = new Object[1];
+            buttons = new Object[2];
             if (buttonsLabels != null) {
                 btnCancel.setText(buttonsLabels[0]);
             }
+            btnOK.addActionListener(this);
             btnCancel.addActionListener(this);
             buttons[0] = btnCancel;
+            buttons[1] = btnOK;
         } else if (scilabDialogType == X_DIALOG_TYPE) {
             // Create a MessageBox for Scilab x_dialog
 
@@ -766,6 +768,8 @@ public class SwingScilabMessageBox extends JDialog implements SimpleMessageBox,
                     }
                 }
                 userValue = ""; /* To make getValueSize return a non zero value */
+            } else if (scilabDialogType == X_CHOOSE_TYPE) {
+                selectedItem = listBox.getSelectedIndex() + 1;
             }
             selectedButton = 1;
         } else if (ae.getSource() == btnCancel) {
diff --git a/scilab/modules/gui/tests/nonreg_tests/bug_8066.tst b/scilab/modules/gui/tests/nonreg_tests/bug_8066.tst
new file mode 100644 (file)
index 0000000..8895022
--- /dev/null
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Author: Ishit Mehta (ibm)
+// Copyright (C) 2015
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- INTERACTIVE TEST -->
+//
+// <-- Non-regression test for bug 8066 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=8066
+//
+// <-- Short Description -->
+//  the x_choose gui should change its behavior: - we should add a "OK" button
+
+n = x_choose(['item1';'item2';'item3'],['that is a comment';'for the dialog'])
+
+// Click on an item and click Ok.
+// Should return the 1-based index of that item
\ No newline at end of file
index 4c492fd..ad99a41 100644 (file)
@@ -124,7 +124,7 @@ libscihdf5_algo_la_CPPFLAGS = $(libscihdf5_la_CPPFLAGS)
 CHECK_SRC= $(HDF5_SOURCES) $(GATEWAY_CXX_SOURCES)
 INCLUDE_FLAGS = $(libscihdf5_la_CPPFLAGS)
 
-libscihdf5_la_LIBADD = libscihdf5-algo.la $(HDF5_LIBS) -lhdf5_hl
+libscihdf5_la_LIBADD = libscihdf5-algo.la $(HDF5_LIBS)
 
 #### Target ######
 modulename=hdf5
index de7c7f4..ecdb968 100644 (file)
@@ -697,7 +697,7 @@ libscihdf5_algo_la_CPPFLAGS = $(libscihdf5_la_CPPFLAGS)
 # For the code check (splint)
 CHECK_SRC = $(HDF5_SOURCES) $(GATEWAY_CXX_SOURCES)
 INCLUDE_FLAGS = $(libscihdf5_la_CPPFLAGS)
-libscihdf5_la_LIBADD = libscihdf5-algo.la $(HDF5_LIBS) -lhdf5_hl
+libscihdf5_la_LIBADD = libscihdf5-algo.la $(HDF5_LIBS)
 
 #### Target ######
 modulename = hdf5
diff --git a/scilab/modules/helptools/tests/unit_tests/javahelp.dia.ref b/scilab/modules/helptools/tests/unit_tests/javahelp.dia.ref
new file mode 100644 (file)
index 0000000..29f6992
--- /dev/null
@@ -0,0 +1,16 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- CLI SHELL MODE -->
+// Check that javahelp files are present and non-zero size for all supported languages
+supportedLanguages = ["en_US" "fr_FR" "ja_JP" "pt_BR" "ru_RU"];
+for kL=1:size(supportedLanguages, "*")
+    helpFile = "SCI/modules/helptools/jar/scilab_" + supportedLanguages(kL) + "_help.jar";
+    assert_checktrue(isfile(helpFile));
+    [x, ierr] = fileinfo(helpFile);
+    assert_checktrue(ierr==0);
+    assert_checktrue(x(1) > 0);
+end
diff --git a/scilab/modules/helptools/tests/unit_tests/javahelp.tst b/scilab/modules/helptools/tests/unit_tests/javahelp.tst
new file mode 100644 (file)
index 0000000..b554737
--- /dev/null
@@ -0,0 +1,21 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- CLI SHELL MODE -->
+
+// Check that javahelp files are present and non-zero size for all supported languages
+
+supportedLanguages = ["en_US" "fr_FR" "ja_JP" "pt_BR" "ru_RU"];
+
+for kL=1:size(supportedLanguages, "*")
+    helpFile = "SCI/modules/helptools/jar/scilab_" + supportedLanguages(kL) + "_help.jar";
+    assert_checktrue(isfile(helpFile));
+    [x, ierr] = fileinfo(helpFile);
+    assert_checktrue(ierr==0);
+    assert_checktrue(x(1) > 0);
+end
+
index 229a116..4b6d859 100644 (file)
@@ -2,11 +2,11 @@
 <!--
  * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
  * Copyright (C) 2008 - INRIA
- * 
+ *
  * This file must be used under the terms of the CeCILL.
  * This source file is licensed as described in the file COPYING, which
  * you should have received as part of this distribution.  The terms
- * are also available at    
+ * are also available at
  * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
  *
  -->
@@ -49,19 +49,33 @@ A*X+X*B = C
  ]]></programlisting>
         <para>
             <literal>X=sylv(A, B, C, 'd')</literal> computes <literal>X</literal>, solution
-            of the "discrete time" Sylvester equation
+            of the modified "discrete time" Sylvester equation
         </para>
         <programlisting role=""><![CDATA[
 A*X*B+X = C
  ]]></programlisting>
+        <para>
+            <literal>X=-sylv(-A, B, C, 'd')</literal> computes <literal>X</literal>, solution
+            of the real "discrete time" Sylvester equation
+        </para>
+        <programlisting role=""><![CDATA[
+A*X*B-X = C
+ ]]></programlisting>
     </refsection>
     <refsection>
         <title>Examples</title>
         <programlisting role="example"><![CDATA[
+// Continuous time Sylvester equation:
 A = rand(4, 4); C = rand(4, 3); B = rand(3, 3);
 X = sylv(A, B, C, 'c');
 norm(A*X+X*B-C)
+
+// Modified Discrete time Sylvester equation:
 X = sylv(A, B, C, 'd');
+norm(A*X*B+X-C)
+
+// Real Discrete time Sylvester equation:
+X = -sylv(-A, B, C, 'd');
 norm(A*X*B-X-C)
  ]]></programlisting>
     </refsection>
index 113e560..e02a1b5 100644 (file)
@@ -21,6 +21,7 @@ genlib: Processing file: TBX_NOOP.sci
 genlib: Processing file: TBX_NOOP_sci.sci
 genlib: Processing file: TBX_NOOP_sim.sci
 genlib: Processing file: TBX_SUM_c.sci
+genlib: Processing file: TBX_SUM_modelica.sci
 genlib: Processing file: TBX_SUM_sci.sci
 genlib: Processing file: TBX_SUM_sim.sci
 genlib: Regenerate names and lib
index 113e560..e02a1b5 100644 (file)
@@ -21,6 +21,7 @@ genlib: Processing file: TBX_NOOP.sci
 genlib: Processing file: TBX_NOOP_sci.sci
 genlib: Processing file: TBX_NOOP_sim.sci
 genlib: Processing file: TBX_SUM_c.sci
+genlib: Processing file: TBX_SUM_modelica.sci
 genlib: Processing file: TBX_SUM_sci.sci
 genlib: Processing file: TBX_SUM_sim.sci
 genlib: Regenerate names and lib
index 1fda524..ef0ff27 100644 (file)
@@ -21,6 +21,7 @@ genlib: Processing file: TBX_NOOP.sci
 genlib: Processing file: TBX_NOOP_sci.sci
 genlib: Processing file: TBX_NOOP_sim.sci
 genlib: Processing file: TBX_SUM_c.sci
+genlib: Processing file: TBX_SUM_modelica.sci
 genlib: Processing file: TBX_SUM_sci.sci
 genlib: Processing file: TBX_SUM_sim.sci
 genlib: Regenerate names and lib
index 14485a8..dc630f3 100644 (file)
@@ -23,6 +23,21 @@ function [J, H] = numderivative(varargin)
     //
     // Get input arguments
     __numderivative_f__ = varargin(1)
+    if and(type(__numderivative_f__) <> [11 13 15 130]) then
+        // Must be a function (uncompiled or compiled) or a list
+        error(msprintf(gettext("%s: Wrong type for argument #%d: Function or list expected.\n"), "numderivative", 1));
+    end
+    if type(__numderivative_f__) == 15 then
+        // List case
+        // Check that the first element in the list is a function
+        if and(type(__numderivative_f__(1)) <> [11 13]) then
+            error(msprintf(gettext("%s: Wrong type for argument #%d: Function expected in first element of list.\n"), "numderivative", 1));
+        end
+        if length(__numderivative_f__) < 2 then
+            error(msprintf(gettext("%s: Wrong number of elements in input argument #%d: At least %d elements expected, but current number is %d.\n"), "numderivative", 1, 2, length(__numderivative_f__)));
+        end
+    end
+
     //
     // Manage x, to get the size n.
     x = varargin(2);
@@ -43,93 +58,72 @@ function [J, H] = numderivative(varargin)
     h = [];
     if rhs >= 3 then
         h = varargin(3);
-    end
-    if type(h) ~= 1 then
-        error(msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "numderivative", 3));
-    end
-    if h <> [] then
-        if size(h, "*") <> 1 then
-            [nrows, ncols] = size(h);
-            if (nrows <> 1 & ncols <> 1) then
-                error(msprintf(gettext("%s: Wrong size for input argument #%d: Vector expected.\n"), "numderivative", 3));
-            end
-            if ncols <> 1 then
-                h = h(:);
+        if type(h) ~= 1 then
+            error(msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "numderivative", 3));
+        end
+        if h <> [] then
+            if size(h, "*") <> 1 then
+                [nrows, ncols] = size(h);
+                if (nrows <> 1 & ncols <> 1) then
+                    error(msprintf(gettext("%s: Wrong size for input argument #%d: Vector expected.\n"), "numderivative", 3));
+                end
+                if ncols <> 1 then
+                    h = h(:);
+                end
+                if or(size(h) <> [n 1]) then
+                    error(msprintf(gettext("%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"), "numderivative", 3, 1));
+                end
             end
-            if or(size(h) <> [n 1]) then
-                error(msprintf(gettext("%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"), "numderivative", 3, 1));
+            if or(h < 0) then
+                error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be > %d.\n"), "numderivative", 3, 0));
             end
         end
     end
+
     order = 2;
     if (rhs >= 4 & varargin(4) <> []) then
         order = varargin(4);
+        if type(order) ~= 1 then
+            error(msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "numderivative", 4));
+        end
+        if or(size(order) <> [1 1]) then
+            error(msprintf(gettext("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), "numderivative", 4, 1, 1));
+        end
+        if and(order <> [1 2 4]) then
+            error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be in the set  {%s}.\n"), "numderivative", 4, "1, 2, 4"));
+        end
     end
+
     H_form = "default";
     if (rhs >= 5 & varargin(5) <> []) then
         H_form = varargin(5);
+        if type(H_form) ~= 10 then
+            error(msprintf(gettext("%s: Wrong type for input argument #%d: String array expected.\n"), "numderivative", 5));
+        end
+        if or(size(H_form) <> [1 1]) then
+            error(msprintf(gettext("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), "numderivative", 5, 1, 1));
+        end
+        if and(H_form <> ["default" "blockmat" "hypermat"]) then
+            error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be in the set  {%s}.\n"), "numderivative", 5, "default, blockmat, hypermat"));
+        end
     end
+
     Q = eye(n, n);
     Q_not_given = %t;
     if (rhs >= 6 & varargin(6) <> []) then
         Q = varargin(6);
         Q_not_given = %f;
-    end
-    //
-    // Check types
-    if and(type(__numderivative_f__) <> [11 13 15 130]) then
-        // Must be a function (uncompiled or compiled) or a list
-        error(msprintf(gettext("%s: Wrong type for argument #%d: Function or list expected.\n"), "numderivative", 1));
-    end
-    if type(__numderivative_f__) == 15 then
-        // List case
-        // Check that the first element in the list is a function
-        if and(type(__numderivative_f__(1)) <> [11 13]) then
-            error(msprintf(gettext("%s: Wrong type for argument #%d: Function expected in first element of list.\n"), "numderivative", 1));
+        if type(Q) ~= 1 then
+            error(msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "numderivative", 6));
         end
-    end
-    if type(order) ~= 1 then
-        error(msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "numderivative", 4));
-    end
-    if type(H_form) ~= 10 then
-        error(msprintf(gettext("%s: Wrong type for input argument #%d: String array expected.\n"), "numderivative", 5));
-    end
-    if type(Q) ~= 1 then
-        error(msprintf(gettext("%s: Wrong type for argument #%d: Matrix expected.\n"), "numderivative", 6));
-    end
-    //
-    // Check sizes
-    if type(__numderivative_f__) == 15 then
-        // List case
-        if length(__numderivative_f__) < 2 then
-            error(msprintf(gettext("%s: Wrong number of elements in input argument #%d: At least %d elements expected, but current number is %d.\n"), "numderivative", 1, 2, length(__numderivative_f__)));
+        if or(size(Q) <> [n n]) then
+            error(msprintf(gettext("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), "numderivative", 6, n ,n));
         end
-    end
-    if or(size(order) <> [1 1]) then
-        error(msprintf(gettext("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), "numderivative", 4, 1, 1));
-    end
-    if or(size(H_form) <> [1 1]) then
-        error(msprintf(gettext("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), "numderivative", 5, 1, 1));
-    end
-    if or(size(Q) <> [n n]) then
-        error(msprintf(gettext("%s: Wrong size for input argument #%d: %d-by-%d matrix expected.\n"), "numderivative", 6, n ,n));
-    end
-    //
-    // Check value
-    if h <> [] then
-        if or(h < 0) then
-            error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be > %d.\n"), "numderivative", 3, 0));
+        if norm(clean(Q*Q'-eye(n, n))) > 0 then
+            error(msprintf(gettext("%s: Q must be orthogonal.\n"), "numderivative"));
         end
     end
-    if and(order <> [1 2 4]) then
-        error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be in the set  {%s}.\n"), "numderivative", 4, "1, 2, 4"));
-    end
-    if and(H_form <> ["default" "blockmat" "hypermat"]) then
-        error(msprintf(gettext("%s: Wrong value for input argument #%d: Must be in the set  {%s}.\n"), "numderivative", 5, "default, blockmat, hypermat"));
-    end
-    if norm(clean(Q*Q'-eye(n, n))) > 0 then
-        error(msprintf(gettext("%s: Q must be orthogonal.\n"), "numderivative"));
-    end
+
     //
     // Proceed...
     if h == [] then
@@ -147,12 +141,13 @@ function [J, H] = numderivative(varargin)
         h = numderivative_step(x, order, 1);
     end
     J = numderivative_deriv1(__numderivative_f__, x, h, order, Q);
-    m = size(J, 1);
     //
     // Quick return if possible
     if lhs == 1 then
         return
     end
+
+    m = size(J, 1);
     //
     // Compute Hessian matrix
     if ( h_not_given ) then
@@ -242,7 +237,7 @@ endfunction
 //   This function is used for the computation of the jacobian matrix.
 function g = numderivative_deriv1(__numderivative_f__, x, h, order, Q)
     n = size(x, "*");
-    Dy = []; // At this point, we do not know 'm' yet, so we cannot allocate Dy.
+    %Dy = []; // At this point, we do not know 'm' yet, so we cannot allocate Dy.
     select order
     case 1
         D = Q * diag(h);
@@ -251,9 +246,9 @@ function g = numderivative_deriv1(__numderivative_f__, x, h, order, Q)
             d = D(:, i);
             yplus = numderivative_evalf(__numderivative_f__, x+d);
             Dyi = (yplus-y)/h(i);
-            Dy = [Dy Dyi];
+            %Dy = [%Dy Dyi];
         end
-        g = Dy*Q';
+        g = %Dy*Q';
     case 2
         D = Q * diag(h);
         for i=1:n
@@ -261,9 +256,9 @@ function g = numderivative_deriv1(__numderivative_f__, x, h, order, Q)
             yplus = numderivative_evalf(__numderivative_f__, x+d);
             yminus = numderivative_evalf(__numderivative_f__, x-d);
             Dyi = (yplus-yminus)/(2*h(i));
-            Dy = [Dy Dyi];
+            %Dy = [%Dy Dyi];
         end
-        g = Dy*Q';
+        g = %Dy*Q';
     case 4
         D = Q * diag(h);
         for i=1:n
@@ -275,9 +270,9 @@ function g = numderivative_deriv1(__numderivative_f__, x, h, order, Q)
             dFh =  (yplus-yminus)/(2*h(i));
             dF2h = (yplus2-yminus2)/(4*h(i));
             Dyi = (4*dFh - dF2h)/3;
-            Dy = [Dy Dyi];
+            %Dy = [%Dy Dyi];
         end
-        g = Dy*Q';
+        g = %Dy*Q';
     end
 endfunction
 
@@ -286,7 +281,7 @@ endfunction
 //   This function is used for the computation of the hessian matrix, to take advantage of its symmetry
 function g = numderivative_deriv2(__numderivative_f__, x, h, order, Q)
     n = size(x, "*");
-    Dy = zeros(m*n, n); // 'm' is known at this point, so we can allocate Dy to reduce memory operations
+    %Dy = zeros(m*n, n); // 'm' is known at this point, so we can allocate Dy to reduce memory operations
     select order
     case 1
         D = Q * diag(h);
@@ -295,12 +290,12 @@ function g = numderivative_deriv2(__numderivative_f__, x, h, order, Q)
             d = D(:, i);
             yplus = numderivative_evalf(__numderivative_f__, x+d);
             for j=0:m-1
-                Dyi(1+j*n:i-1+j*n) = Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
+                Dyi(1+j*n:i-1+j*n) = %Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
                 Dyi(i+j*n:(j+1)*n) = (yplus(i+j*n:(j+1)*n)-y(i+j*n:(j+1)*n))/h(i); // Computing the new ones
             end
-            Dy(:, i) = Dyi;
+            %Dy(:, i) = Dyi;
         end
-        g = Dy*Q';
+        g = %Dy*Q';
     case 2
         D = Q * diag(h);
         for i=1:n
@@ -308,12 +303,12 @@ function g = numderivative_deriv2(__numderivative_f__, x, h, order, Q)
             yplus = numderivative_evalf(__numderivative_f__, x+d);
             yminus = numderivative_evalf(__numderivative_f__, x-d);
             for j=0:m-1
-                Dyi(1+j*n:i-1+j*n) = Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
+                Dyi(1+j*n:i-1+j*n) = %Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
                 Dyi(i+j*n:(j+1)*n) = (yplus(i+j*n:(j+1)*n)-yminus(i+j*n:(j+1)*n))/(2*h(i)); // Computing the new ones
             end
-            Dy(:, i) = Dyi;
+            %Dy(:, i) = Dyi;
         end
-        g = Dy*Q';
+        g = %Dy*Q';
     case 4
         D = Q * diag(h);
         for i=1:n
@@ -323,15 +318,15 @@ function g = numderivative_deriv2(__numderivative_f__, x, h, order, Q)
             yplus2 = numderivative_evalf(__numderivative_f__, x+2*d);
             yminus2 = numderivative_evalf(__numderivative_f__, x-2*d);
             for j=0:m-1
-                dFh(1+j*n:i-1+j*n) = Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
+                dFh(1+j*n:i-1+j*n) = %Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
                 dFh(i+j*n:(j+1)*n) = (yplus(i+j*n:(j+1)*n)-yminus(i+j*n:(j+1)*n))/(2*h(i)); // Computing the new ones
-                dF2h(1+j*n:i-1+j*n) = Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
+                dF2h(1+j*n:i-1+j*n) = %Dy(i+j*n, 1:i-1)'; // Retrieving symmetric elements (will not be done for the first vector)
                 dF2h(i+j*n:(j+1)*n) = (yplus2(i+j*n:(j+1)*n)-yminus2(i+j*n:(j+1)*n))/(4*h(i)); // Computing the new ones
             end
             Dyi = (4*dFh - dF2h)/3;
-            Dy(:, i) = Dyi;
+            %Dy(:, i) = Dyi;
         end
-        g = Dy*Q';
+        g = %Dy*Q';
     end
 endfunction
 
index ace969d..e175afe 100644 (file)
-src/modelica_compiler/parseTree.cmi:
-src/modelica_compiler/linenum.cmi:
-src/modelica_compiler/parser.cmi: ./src/modelica_compiler/parseTree.cmi
-src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
-src/modelica_compiler/precompilation.cmi: \
-    ./src/modelica_compiler/parseTree.cmi
-src/modelica_compiler/compilation.cmi: \
-    ./src/modelica_compiler/precompilation.cmi
-src/modelica_compiler/instantiation.cmi: \
-    ./src/modelica_compiler/compilation.cmi
-src/modelica_compiler/graphNodeSet.cmi:
-src/modelica_compiler/symbolicExpression.cmi:
-src/modelica_compiler/squareSparseMatrix.cmi:
-src/modelica_compiler/bipartiteGraph.cmi:
-src/modelica_compiler/hungarianMethod.cmi:
-src/modelica_compiler/causalityGraph.cmi:
-src/modelica_compiler/optimization.cmi: \
-    ./src/modelica_compiler/symbolicExpression.cmi \
-    ./src/translator/instantiation/instantiation.cmi \
-    ./src/modelica_compiler/compilation.cmi
-src/modelica_compiler/xMLCodeGeneration.cmi: \
-    ./src/modelica_compiler/optimization.cmi
-src/modelica_compiler/optimizingCompiler.cmi: \
-    ./src/modelica_compiler/optimization.cmi
-src/modelica_compiler/scicosCodeGeneration.cmi: \
-    ./src/modelica_compiler/optimization.cmi
-src/modelica_compiler/scicosOptimizingCompiler.cmi:
-src/modelica_compiler/parseTree.cmo: src/modelica_compiler/parseTree.cmi
-src/modelica_compiler/parseTree.cmx: src/modelica_compiler/parseTree.cmi
-src/modelica_compiler/linenum.cmo: src/modelica_compiler/linenum.cmi
-src/modelica_compiler/linenum.cmx: src/modelica_compiler/linenum.cmi
-src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
-    ./src/translator/parsing/linenum.cmi src/modelica_compiler/parser.cmi
-src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
-    ./src/translator/parsing/linenum.cmx src/modelica_compiler/parser.cmi
-src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
-    src/modelica_compiler/lexer.cmi
-src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
-    src/modelica_compiler/lexer.cmi
-src/modelica_compiler/precompilation.cmo: \
-    ./src/modelica_compiler/parseTree.cmi \
-    src/modelica_compiler/precompilation.cmi
-src/modelica_compiler/precompilation.cmx: \
-    ./src/modelica_compiler/parseTree.cmx \
-    src/modelica_compiler/precompilation.cmi
-src/modelica_compiler/compilation.cmo: \
-    ./src/modelica_compiler/precompilation.cmi \
-    ./src/modelica_compiler/parseTree.cmi \
-    src/modelica_compiler/compilation.cmi
-src/modelica_compiler/compilation.cmx: \
-    ./src/modelica_compiler/precompilation.cmx \
-    ./src/modelica_compiler/parseTree.cmx \
-    src/modelica_compiler/compilation.cmi
-src/modelica_compiler/instantiation.cmo: \
-    ./src/modelica_compiler/compilation.cmi \
-    src/modelica_compiler/instantiation.cmi
-src/modelica_compiler/instantiation.cmx: \
-    ./src/modelica_compiler/compilation.cmx \
-    src/modelica_compiler/instantiation.cmi
-src/modelica_compiler/graphNodeSet.cmo: \
-    src/modelica_compiler/graphNodeSet.cmi
-src/modelica_compiler/graphNodeSet.cmx: \
-    src/modelica_compiler/graphNodeSet.cmi
-src/modelica_compiler/symbolicExpression.cmo: \
-    ./src/modelica_compiler/graphNodeSet.cmi \
-    src/modelica_compiler/symbolicExpression.cmi
-src/modelica_compiler/symbolicExpression.cmx: \
-    ./src/modelica_compiler/graphNodeSet.cmx \
-    src/modelica_compiler/symbolicExpression.cmi
-src/modelica_compiler/squareSparseMatrix.cmo: \
-    src/modelica_compiler/squareSparseMatrix.cmi
-src/modelica_compiler/squareSparseMatrix.cmx: \
-    src/modelica_compiler/squareSparseMatrix.cmi
-src/modelica_compiler/bipartiteGraph.cmo: \
-    src/modelica_compiler/bipartiteGraph.cmi
-src/modelica_compiler/bipartiteGraph.cmx: \
-    src/modelica_compiler/bipartiteGraph.cmi
-src/modelica_compiler/hungarianMethod.cmo: \
-    src/modelica_compiler/hungarianMethod.cmi
-src/modelica_compiler/hungarianMethod.cmx: \
-    src/modelica_compiler/hungarianMethod.cmi
-src/modelica_compiler/causalityGraph.cmo: \
-    src/modelica_compiler/causalityGraph.cmi
-src/modelica_compiler/causalityGraph.cmx: \
-    src/modelica_compiler/causalityGraph.cmi
-src/modelica_compiler/optimization.cmo: \
-    ./src/modelica_compiler/symbolicExpression.cmi \
-    ./src/modelica_compiler/squareSparseMatrix.cmi \
-    ./src/translator/instantiation/instantiation.cmi \
-    ./src/modelica_compiler/hungarianMethod.cmi \
-    ./src/modelica_compiler/compilation.cmi \
-    ./src/modelica_compiler/causalityGraph.cmi \
-    ./src/modelica_compiler/bipartiteGraph.cmi \
-    src/modelica_compiler/optimization.cmi
-src/modelica_compiler/optimization.cmx: \
-    ./src/modelica_compiler/symbolicExpression.cmx \
-    ./src/modelica_compiler/squareSparseMatrix.cmx \
-    ./src/translator/instantiation/instantiation.cmx \
-    ./src/modelica_compiler/hungarianMethod.cmx \
-    ./src/modelica_compiler/compilation.cmx \
-    ./src/modelica_compiler/causalityGraph.cmx \
-    ./src/modelica_compiler/bipartiteGraph.cmx \
-    src/modelica_compiler/optimization.cmi
-src/modelica_compiler/xMLCodeGeneration.cmo: \
-    ./src/modelica_compiler/symbolicExpression.cmi \
-    ./src/modelica_compiler/optimization.cmi \
-    src/modelica_compiler/xMLCodeGeneration.cmi
-src/modelica_compiler/xMLCodeGeneration.cmx: \
-    ./src/modelica_compiler/symbolicExpression.cmx \
-    ./src/modelica_compiler/optimization.cmx \
-    src/modelica_compiler/xMLCodeGeneration.cmi
-src/modelica_compiler/optimizingCompiler.cmo: \
-    ./src/modelica_compiler/xMLCodeGeneration.cmi \
-    ./src/modelica_compiler/precompilation.cmi \
-    ./src/translator/parsing/parser.cmi \
-    ./src/modelica_compiler/optimization.cmi \
-    ./src/translator/parsing/lexer.cmi \
-    ./src/translator/instantiation/instantiation.cmi \
-    ./src/modelica_compiler/compilation.cmi \
-    src/modelica_compiler/optimizingCompiler.cmi
-src/modelica_compiler/optimizingCompiler.cmx: \
-    ./src/modelica_compiler/xMLCodeGeneration.cmx \
-    ./src/modelica_compiler/precompilation.cmx \
-    ./src/translator/parsing/parser.cmx \
-    ./src/modelica_compiler/optimization.cmx \
-    ./src/translator/parsing/lexer.cmx \
-    ./src/translator/instantiation/instantiation.cmx \
-    ./src/modelica_compiler/compilation.cmx \
-    src/modelica_compiler/optimizingCompiler.cmi
-src/modelica_compiler/scicosCodeGeneration.cmo: \
-    ./src/modelica_compiler/symbolicExpression.cmi \
-    ./src/modelica_compiler/optimization.cmi \
-    ./src/translator/instantiation/instantiation.cmi \
-    src/modelica_compiler/scicosCodeGeneration.cmi
-src/modelica_compiler/scicosCodeGeneration.cmx: \
-    ./src/modelica_compiler/symbolicExpression.cmx \
-    ./src/modelica_compiler/optimization.cmx \
-    ./src/translator/instantiation/instantiation.cmx \
-    src/modelica_compiler/scicosCodeGeneration.cmi
-src/modelica_compiler/scicosOptimizingCompiler.cmo: \
-    ./src/modelica_compiler/scicosCodeGeneration.cmi \
-    ./src/modelica_compiler/optimizingCompiler.cmi \
-    src/modelica_compiler/scicosOptimizingCompiler.cmi
-src/modelica_compiler/scicosOptimizingCompiler.cmx: \
-    ./src/modelica_compiler/scicosCodeGeneration.cmx \
-    ./src/modelica_compiler/optimizingCompiler.cmx \
-    src/modelica_compiler/scicosOptimizingCompiler.cmi
-src/xml2modelica/xMLTree.cmo:
-src/xml2modelica/xMLTree.cmx:
-src/xml2modelica/linenum.cmo:
-src/xml2modelica/linenum.cmx:
-src/xml2modelica/stringParser.cmo:
-src/xml2modelica/stringParser.cmx:
-src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
-src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
-src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
-    ./src/translator/parsing/linenum.cmi
-src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
-    ./src/translator/parsing/linenum.cmx
-src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
-src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
-src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
-    ./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringLexer.cmo
-src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
-    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.cmx
-src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
-    ./src/xml2modelica/xMLLexer.cmo \
-    ./src/xml2modelica/modelicaCodeGenerator.cmo
-src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
+./src/xml2modelica/xMLTree.cmo ./src/xml2modelica/xMLTree.cmi : \
+    ./src/xml2modelica/xMLTree.ml
+./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \
+    ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml
+./src/xml2modelica/linenum.cmo ./src/xml2modelica/linenum.cmi : \
+    ./src/xml2modelica/linenum.ml
+./src/xml2modelica/linenum.cmx ./src/xml2modelica/linenum.o \
+    ./src/xml2modelica/linenum.cmi : ./src/xml2modelica/linenum.ml
+./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \
+    ./src/xml2modelica/stringParser.ml
+./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \
+    ./src/xml2modelica/stringParser.cmi : ./src/xml2modelica/stringParser.ml
+./src/xml2modelica/stringLexer.cmo ./src/xml2modelica/stringLexer.cmi : \
+    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringLexer.ml
+./src/xml2modelica/stringLexer.cmx ./src/xml2modelica/stringLexer.o \
+    ./src/xml2modelica/stringLexer.cmi : ./src/xml2modelica/stringParser.cmi \
+    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.ml
+./src/xml2modelica/xMLParser.cmo ./src/xml2modelica/xMLParser.cmi : \
+    ./src/xml2modelica/xMLTree.cmi ./src/modelica_compiler/linenum.cmi \
+    ./src/xml2modelica/xMLParser.ml
+./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLParser.o \
+    ./src/xml2modelica/xMLParser.cmi : ./src/xml2modelica/xMLTree.cmi \
+    ./src/xml2modelica/xMLTree.cmx ./src/modelica_compiler/linenum.cmi \
+    ./src/modelica_compiler/linenum.cmx ./src/xml2modelica/xMLParser.ml
+./src/xml2modelica/xMLLexer.cmo ./src/xml2modelica/xMLLexer.cmi : \
+    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.ml
+./src/xml2modelica/xMLLexer.cmx ./src/xml2modelica/xMLLexer.o \
+    ./src/xml2modelica/xMLLexer.cmi : ./src/xml2modelica/xMLParser.cmi \
+    ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.ml
+./src/xml2modelica/modelicaCodeGenerator.cmo \
+    ./src/xml2modelica/modelicaCodeGenerator.cmi : \
+    ./src/xml2modelica/xMLTree.cmi ./src/xml2modelica/stringParser.cmi \
+    ./src/xml2modelica/stringLexer.cmi \
+    ./src/xml2modelica/modelicaCodeGenerator.ml
+./src/xml2modelica/modelicaCodeGenerator.cmx \
+    ./src/xml2modelica/modelicaCodeGenerator.o \
+    ./src/xml2modelica/modelicaCodeGenerator.cmi : \
+    ./src/xml2modelica/xMLTree.cmi ./src/xml2modelica/xMLTree.cmx \
+    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringParser.cmx \
+    ./src/xml2modelica/stringLexer.cmi ./src/xml2modelica/stringLexer.cmx \
+    ./src/xml2modelica/modelicaCodeGenerator.ml
+./src/xml2modelica/xML2Modelica.cmo ./src/xml2modelica/xML2Modelica.cmi : \
+    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.cmi \
+    ./src/xml2modelica/modelicaCodeGenerator.cmi \
+    ./src/xml2modelica/xML2Modelica.ml
+./src/xml2modelica/xML2Modelica.cmx ./src/xml2modelica/xML2Modelica.o \
+    ./src/xml2modelica/xML2Modelica.cmi : ./src/xml2modelica/xMLParser.cmi \
+    ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.cmi \
     ./src/xml2modelica/xMLLexer.cmx \
-    ./src/xml2modelica/modelicaCodeGenerator.cmx
-src/translator/parsing/syntax.cmi:
-src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmi
-src/translator/parsing/lexer.cmi: ./src/translator/parsing/parser.cmi
-src/translator/parsing/linenum.cmi:
-src/translator/compilation/types.cmi:
-src/translator/compilation/nameResolve.cmi: \
-    ./src/translator/compilation/types.cmi \
-    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
-src/translator/instantiation/instantiation.cmi: \
+    ./src/xml2modelica/modelicaCodeGenerator.cmi \
+    ./src/xml2modelica/modelicaCodeGenerator.cmx \
+    ./src/xml2modelica/xML2Modelica.ml
+./src/translator/parsing/syntax.cmo ./src/translator/parsing/syntax.cmi : \
+    ./src/translator/parsing/syntax.ml
+./src/translator/parsing/syntax.cmx ./src/translator/parsing/syntax.o \
+    ./src/translator/parsing/syntax.cmi : ./src/translator/parsing/syntax.ml
+./src/translator/parsing/parser.cmo ./src/translator/parsing/parser.cmi : \
+    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.ml
+./src/translator/parsing/parser.cmx ./src/translator/parsing/parser.o \
+    ./src/translator/parsing/parser.cmi : ./src/translator/parsing/syntax.cmi \
+    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.ml
+./src/translator/parsing/lexer.cmo ./src/translator/parsing/lexer.cmi : \
+    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.ml
+./src/translator/parsing/lexer.cmx ./src/translator/parsing/lexer.o \
+    ./src/translator/parsing/lexer.cmi : ./src/translator/parsing/parser.cmi \
+    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.ml
+./src/translator/parsing/linenum.cmo ./src/translator/parsing/linenum.cmi : \
+    ./src/translator/parsing/linenum.ml
+./src/translator/parsing/linenum.cmx ./src/translator/parsing/linenum.o \
+    ./src/translator/parsing/linenum.cmi : \
+    ./src/translator/parsing/linenum.ml
+./src/translator/compilation/types.cmo \
+    ./src/translator/compilation/types.cmi : \
+    ./src/translator/compilation/types.ml
+./src/translator/compilation/types.cmx ./src/translator/compilation/types.o \
+    ./src/translator/compilation/types.cmi : \
+    ./src/translator/compilation/types.ml
+./src/translator/compilation/nameResolve.cmo \
+    ./src/translator/compilation/nameResolve.cmi : \
     ./src/translator/compilation/types.cmi \
     ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
-    ./src/translator/compilation/nameResolve.cmi
-src/translator/exceptionHandling/msgDico.cmi:
-src/translator/exceptionHandling/errorDico.cmi: \
-    ./src/translator/parsing/parser.cmi \
-    ./src/translator/instantiation/instantiation.cmi
-src/translator/exceptionHandling/exceptHandler.cmi: \
-    ./src/translator/parsing/parser.cmi \
-    ./src/translator/instantiation/instantiation.cmi
-src/translator/translation/libraryManager.cmi: \
-    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
-src/translator/translation/codeGeneration.cmi: \
+    ./src/translator/compilation/nameResolve.ml
+./src/translator/compilation/nameResolve.cmx \
+    ./src/translator/compilation/nameResolve.o \
+    ./src/translator/compilation/nameResolve.cmi : \
     ./src/translator/compilation/types.cmi \
-    ./src/translator/instantiation/instantiation.cmi \
-    ./src/translator/exceptionHandling/errorDico.cmi
-src/translator/translation/versiondate.cmi:
-src/translator/translation/translator.cmi: \
-    ./src/translator/parsing/syntax.cmi \
-    ./src/translator/compilation/nameResolve.cmi \
-    ./src/translator/instantiation/instantiation.cmi
-src/translator/parsing/syntax.cmo: src/translator/parsing/syntax.cmi
-src/translator/parsing/syntax.cmx: src/translator/parsing/syntax.cmi
-src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmi \
-    src/translator/parsing/parser.cmi
-src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
-    src/translator/parsing/parser.cmi
-src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi \
-    src/translator/parsing/lexer.cmi
-src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx \
-    src/translator/parsing/lexer.cmi
-src/translator/parsing/linenum.cmo: src/translator/parsing/linenum.cmi
-src/translator/parsing/linenum.cmx: src/translator/parsing/linenum.cmi
-src/translator/compilation/types.cmo: src/translator/compilation/types.cmi
-src/translator/compilation/types.cmx: src/translator/compilation/types.cmi
-src/translator/compilation/nameResolve.cmo: \
-    ./src/translator/compilation/types.cmi \
-    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
-    src/translator/compilation/nameResolve.cmi
-src/translator/compilation/nameResolve.cmx: \
     ./src/translator/compilation/types.cmx \
-    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
-    src/translator/compilation/nameResolve.cmi
-src/translator/instantiation/instantiation.cmo: \
+    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
+    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+    ./src/translator/compilation/nameResolve.ml
+./src/translator/instantiation/instantiation.cmo \
+    ./src/translator/instantiation/instantiation.cmi : \
     ./src/translator/compilation/types.cmi \
     ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
     ./src/translator/compilation/nameResolve.cmi \
-    src/translator/instantiation/instantiation.cmi
-src/translator/instantiation/instantiation.cmx: \
+    ./src/translator/instantiation/instantiation.ml
+./src/translator/instantiation/instantiation.cmx \
+    ./src/translator/instantiation/instantiation.o \
+    ./src/translator/instantiation/instantiation.cmi : \
+    ./src/translator/compilation/types.cmi \
     ./src/translator/compilation/types.cmx \
-    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
+    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
+    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+    ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/compilation/nameResolve.cmx \
-    src/translator/instantiation/instantiation.cmi
-src/translator/exceptionHandling/msgDico.cmo: \
-    src/translator/exceptionHandling/msgDico.cmi
-src/translator/exceptionHandling/msgDico.cmx: \
-    src/translator/exceptionHandling/msgDico.cmi
-src/translator/exceptionHandling/errorDico.cmo: \
+    ./src/translator/instantiation/instantiation.ml
+./src/translator/exceptionHandling/msgDico.cmo \
+    ./src/translator/exceptionHandling/msgDico.cmi : \
+    ./src/translator/exceptionHandling/msgDico.ml
+./src/translator/exceptionHandling/msgDico.cmx \
+    ./src/translator/exceptionHandling/msgDico.o \
+    ./src/translator/exceptionHandling/msgDico.cmi : \
+    ./src/translator/exceptionHandling/msgDico.ml
+./src/translator/exceptionHandling/errorDico.cmo \
+    ./src/translator/exceptionHandling/errorDico.cmi : \
     ./src/translator/parsing/parser.cmi \
     ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/instantiation/instantiation.cmi \
-    src/translator/exceptionHandling/errorDico.cmi
-src/translator/exceptionHandling/errorDico.cmx: \
-    ./src/translator/parsing/parser.cmx \
+    ./src/translator/exceptionHandling/errorDico.ml
+./src/translator/exceptionHandling/errorDico.cmx \
+    ./src/translator/exceptionHandling/errorDico.o \
+    ./src/translator/exceptionHandling/errorDico.cmi : \
+    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+    ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/compilation/nameResolve.cmx \
+    ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/instantiation/instantiation.cmx \
-    src/translator/exceptionHandling/errorDico.cmi
-src/translator/exceptionHandling/exceptHandler.cmo: \
+    ./src/translator/exceptionHandling/errorDico.ml
+./src/translator/exceptionHandling/exceptHandler.cmo \
+    ./src/translator/exceptionHandling/exceptHandler.cmi : \
     ./src/translator/parsing/parser.cmi \
     ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/exceptionHandling/msgDico.cmi \
     ./src/translator/parsing/linenum.cmi \
     ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/exceptionHandling/errorDico.cmi \
-    src/translator/exceptionHandling/exceptHandler.cmi
-src/translator/exceptionHandling/exceptHandler.cmx: \
-    ./src/translator/parsing/parser.cmx \
+    ./src/translator/exceptionHandling/exceptHandler.ml
+./src/translator/exceptionHandling/exceptHandler.cmx \
+    ./src/translator/exceptionHandling/exceptHandler.o \
+    ./src/translator/exceptionHandling/exceptHandler.cmi : \
+    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+    ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/compilation/nameResolve.cmx \
+    ./src/translator/exceptionHandling/msgDico.cmi \
     ./src/translator/exceptionHandling/msgDico.cmx \
-    ./src/translator/parsing/linenum.cmx \
+    ./src/translator/parsing/linenum.cmi ./src/translator/parsing/linenum.cmx \
+    ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/instantiation/instantiation.cmx \
+    ./src/translator/exceptionHandling/errorDico.cmi \
     ./src/translator/exceptionHandling/errorDico.cmx \
-    src/translator/exceptionHandling/exceptHandler.cmi
-src/translator/translation/libraryManager.cmo: \
+    ./src/translator/exceptionHandling/exceptHandler.ml
+./src/translator/translation/libraryManager.cmo \
+    ./src/translator/translation/libraryManager.cmi : \
     ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
     ./src/translator/exceptionHandling/exceptHandler.cmi \
-    src/translator/translation/libraryManager.cmi
-src/translator/translation/libraryManager.cmx: \
-    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.cmx \
+    ./src/translator/translation/libraryManager.ml
+./src/translator/translation/libraryManager.cmx \
+    ./src/translator/translation/libraryManager.o \
+    ./src/translator/translation/libraryManager.cmi : \
+    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+    ./src/translator/parsing/lexer.cmi ./src/translator/parsing/lexer.cmx \
+    ./src/translator/exceptionHandling/exceptHandler.cmi \
     ./src/translator/exceptionHandling/exceptHandler.cmx \
-    src/translator/translation/libraryManager.cmi
-src/translator/translation/codeGeneration.cmo: \
+    ./src/translator/translation/libraryManager.ml
+./src/translator/translation/codeGeneration.cmo \
+    ./src/translator/translation/codeGeneration.cmi : \
     ./src/translator/compilation/types.cmi \
     ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/exceptionHandling/errorDico.cmi \
-    src/translator/translation/codeGeneration.cmi
-src/translator/translation/codeGeneration.cmx: \
+    ./src/translator/translation/codeGeneration.ml
+./src/translator/translation/codeGeneration.cmx \
+    ./src/translator/translation/codeGeneration.o \
+    ./src/translator/translation/codeGeneration.cmi : \
+    ./src/translator/compilation/types.cmi \
     ./src/translator/compilation/types.cmx \
+    ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/compilation/nameResolve.cmx \
+    ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/instantiation/instantiation.cmx \
+    ./src/translator/exceptionHandling/errorDico.cmi \
     ./src/translator/exceptionHandling/errorDico.cmx \
-    src/translator/translation/codeGeneration.cmi
-src/translator/translation/versiondate.cmo: \
-    src/translator/translation/versiondate.cmi
-src/translator/translation/versiondate.cmx: \
-    src/translator/translation/versiondate.cmi
-src/translator/translation/translator.cmo: \
+    ./src/translator/translation/codeGeneration.ml
+./src/translator/translation/versiondate.cmo \
+    ./src/translator/translation/versiondate.cmi : \
+    ./src/translator/translation/versiondate.ml
+./src/translator/translation/versiondate.cmx \
+    ./src/translator/translation/versiondate.o \
+    ./src/translator/translation/versiondate.cmi : \
+    ./src/translator/translation/versiondate.ml
+./src/translator/translation/translator.cmo \
+    ./src/translator/translation/translator.cmi : \
     ./src/translator/translation/versiondate.cmi \
     ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/translation/libraryManager.cmi \
     ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/exceptionHandling/exceptHandler.cmi \
     ./src/translator/translation/codeGeneration.cmi \
-    src/translator/translation/translator.cmi
-src/translator/translation/translator.cmx: \
+    ./src/translator/translation/translator.ml
+./src/translator/translation/translator.cmx \
+    ./src/translator/translation/translator.o \
+    ./src/translator/translation/translator.cmi : \
+    ./src/translator/translation/versiondate.cmi \
     ./src/translator/translation/versiondate.cmx \
+    ./src/translator/compilation/nameResolve.cmi \
     ./src/translator/compilation/nameResolve.cmx \
+    ./src/translator/translation/libraryManager.cmi \
     ./src/translator/translation/libraryManager.cmx \
+    ./src/translator/instantiation/instantiation.cmi \
     ./src/translator/instantiation/instantiation.cmx \
+    ./src/translator/exceptionHandling/exceptHandler.cmi \
     ./src/translator/exceptionHandling/exceptHandler.cmx \
+    ./src/translator/translation/codeGeneration.cmi \
     ./src/translator/translation/codeGeneration.cmx \
-    src/translator/translation/translator.cmi
+    ./src/translator/translation/translator.ml
+./src/modelica_compiler/parseTree.cmo : \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/parseTree.ml
+./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/parseTree.o : \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/parseTree.ml
+./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \
+    ./src/modelica_compiler/linenum.ml
+./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \
+    ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml
+./src/modelica_compiler/parser.cmo ./src/modelica_compiler/parser.cmi : \
+    ./src/modelica_compiler/parseTree.cmi ./src/modelica_compiler/linenum.cmi \
+    ./src/modelica_compiler/parser.ml
+./src/modelica_compiler/parser.cmx ./src/modelica_compiler/parser.o \
+    ./src/modelica_compiler/parser.cmi : \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/linenum.cmi \
+    ./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/parser.ml
+./src/modelica_compiler/lexer.cmo ./src/modelica_compiler/lexer.cmi : \
+    ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/lexer.ml
+./src/modelica_compiler/lexer.cmx ./src/modelica_compiler/lexer.o \
+    ./src/modelica_compiler/lexer.cmi : ./src/modelica_compiler/parser.cmi \
+    ./src/modelica_compiler/parser.cmx ./src/modelica_compiler/lexer.ml
+./src/modelica_compiler/precompilation.cmo : \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/precompilation.cmi \
+    ./src/modelica_compiler/precompilation.ml
+./src/modelica_compiler/precompilation.cmx \
+    ./src/modelica_compiler/precompilation.o : \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/parseTree.cmx \
+    ./src/modelica_compiler/precompilation.cmi \
+    ./src/modelica_compiler/precompilation.ml
+./src/modelica_compiler/compilation.cmo : \
+    ./src/modelica_compiler/precompilation.cmi \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/compilation.ml
+./src/modelica_compiler/compilation.cmx \
+    ./src/modelica_compiler/compilation.o : \
+    ./src/modelica_compiler/precompilation.cmi \
+    ./src/modelica_compiler/precompilation.cmx \
+    ./src/modelica_compiler/parseTree.cmi \
+    ./src/modelica_compiler/parseTree.cmx \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/compilation.ml
+./src/modelica_compiler/instantiation.cmo : \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/instantiation.ml
+./src/modelica_compiler/instantiation.cmx \
+    ./src/modelica_compiler/instantiation.o : \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/compilation.cmx \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/instantiation.ml
+./src/modelica_compiler/graphNodeSet.cmo : \
+    ./src/modelica_compiler/graphNodeSet.cmi \
+    ./src/modelica_compiler/graphNodeSet.ml
+./src/modelica_compiler/graphNodeSet.cmx \
+    ./src/modelica_compiler/graphNodeSet.o : \
+    ./src/modelica_compiler/graphNodeSet.cmi \
+    ./src/modelica_compiler/graphNodeSet.ml
+./src/modelica_compiler/symbolicExpression.cmo : \
+    ./src/modelica_compiler/graphNodeSet.cmi \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/symbolicExpression.ml
+./src/modelica_compiler/symbolicExpression.cmx \
+    ./src/modelica_compiler/symbolicExpression.o : \
+    ./src/modelica_compiler/graphNodeSet.cmi \
+    ./src/modelica_compiler/graphNodeSet.cmx \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/symbolicExpression.ml
+./src/modelica_compiler/squareSparseMatrix.cmo : \
+    ./src/modelica_compiler/squareSparseMatrix.cmi \
+    ./src/modelica_compiler/squareSparseMatrix.ml
+./src/modelica_compiler/squareSparseMatrix.cmx \
+    ./src/modelica_compiler/squareSparseMatrix.o : \
+    ./src/modelica_compiler/squareSparseMatrix.cmi \
+    ./src/modelica_compiler/squareSparseMatrix.ml
+./src/modelica_compiler/bipartiteGraph.cmo : \
+    ./src/modelica_compiler/bipartiteGraph.cmi \
+    ./src/modelica_compiler/bipartiteGraph.ml
+./src/modelica_compiler/bipartiteGraph.cmx \
+    ./src/modelica_compiler/bipartiteGraph.o : \
+    ./src/modelica_compiler/bipartiteGraph.cmi \
+    ./src/modelica_compiler/bipartiteGraph.ml
+./src/modelica_compiler/hungarianMethod.cmo : \
+    ./src/modelica_compiler/hungarianMethod.cmi \
+    ./src/modelica_compiler/hungarianMethod.ml
+./src/modelica_compiler/hungarianMethod.cmx \
+    ./src/modelica_compiler/hungarianMethod.o : \
+    ./src/modelica_compiler/hungarianMethod.cmi \
+    ./src/modelica_compiler/hungarianMethod.ml
+./src/modelica_compiler/causalityGraph.cmo : \
+    ./src/modelica_compiler/causalityGraph.cmi \
+    ./src/modelica_compiler/causalityGraph.ml
+./src/modelica_compiler/causalityGraph.cmx \
+    ./src/modelica_compiler/causalityGraph.o : \
+    ./src/modelica_compiler/causalityGraph.cmi \
+    ./src/modelica_compiler/causalityGraph.ml
+./src/modelica_compiler/optimization.cmo : \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/squareSparseMatrix.cmi \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/hungarianMethod.cmi \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/causalityGraph.cmi \
+    ./src/modelica_compiler/bipartiteGraph.cmi \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/optimization.ml
+./src/modelica_compiler/optimization.cmx \
+    ./src/modelica_compiler/optimization.o : \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/symbolicExpression.cmx \
+    ./src/modelica_compiler/squareSparseMatrix.cmi \
+    ./src/modelica_compiler/squareSparseMatrix.cmx \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/instantiation.cmx \
+    ./src/modelica_compiler/hungarianMethod.cmi \
+    ./src/modelica_compiler/hungarianMethod.cmx \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/compilation.cmx \
+    ./src/modelica_compiler/causalityGraph.cmi \
+    ./src/modelica_compiler/causalityGraph.cmx \
+    ./src/modelica_compiler/bipartiteGraph.cmi \
+    ./src/modelica_compiler/bipartiteGraph.cmx \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/optimization.ml
+./src/modelica_compiler/xMLCodeGeneration.cmo : \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+    ./src/modelica_compiler/xMLCodeGeneration.ml
+./src/modelica_compiler/xMLCodeGeneration.cmx \
+    ./src/modelica_compiler/xMLCodeGeneration.o : \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/symbolicExpression.cmx \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/optimization.cmx \
+    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+    ./src/modelica_compiler/xMLCodeGeneration.ml
+./src/modelica_compiler/optimizingCompiler.cmo : \
+    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+    ./src/modelica_compiler/precompilation.cmi \
+    ./src/modelica_compiler/parser.cmi \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/lexer.cmi \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/optimizingCompiler.cmi \
+    ./src/modelica_compiler/optimizingCompiler.ml
+./src/modelica_compiler/optimizingCompiler.cmx \
+    ./src/modelica_compiler/optimizingCompiler.o : \
+    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+    ./src/modelica_compiler/xMLCodeGeneration.cmx \
+    ./src/modelica_compiler/precompilation.cmi \
+    ./src/modelica_compiler/precompilation.cmx \
+    ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/parser.cmx \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/optimization.cmx \
+    ./src/modelica_compiler/lexer.cmi ./src/modelica_compiler/lexer.cmx \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/instantiation.cmx \
+    ./src/modelica_compiler/compilation.cmi \
+    ./src/modelica_compiler/compilation.cmx \
+    ./src/modelica_compiler/optimizingCompiler.cmi \
+    ./src/modelica_compiler/optimizingCompiler.ml
+./src/modelica_compiler/scicosCodeGeneration.cmo : \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+    ./src/modelica_compiler/scicosCodeGeneration.ml
+./src/modelica_compiler/scicosCodeGeneration.cmx \
+    ./src/modelica_compiler/scicosCodeGeneration.o : \
+    ./src/modelica_compiler/symbolicExpression.cmi \
+    ./src/modelica_compiler/symbolicExpression.cmx \
+    ./src/modelica_compiler/optimization.cmi \
+    ./src/modelica_compiler/optimization.cmx \
+    ./src/modelica_compiler/instantiation.cmi \
+    ./src/modelica_compiler/instantiation.cmx \
+    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+    ./src/modelica_compiler/scicosCodeGeneration.ml
+./src/modelica_compiler/scicosOptimizingCompiler.cmo \
+    ./src/modelica_compiler/scicosOptimizingCompiler.cmi : \
+    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+    ./src/modelica_compiler/optimizingCompiler.cmi \
+    ./src/modelica_compiler/scicosOptimizingCompiler.ml
+./src/modelica_compiler/scicosOptimizingCompiler.cmx \
+    ./src/modelica_compiler/scicosOptimizingCompiler.o \
+    ./src/modelica_compiler/scicosOptimizingCompiler.cmi : \
+    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+    ./src/modelica_compiler/scicosCodeGeneration.cmx \
+    ./src/modelica_compiler/optimizingCompiler.cmi \
+    ./src/modelica_compiler/optimizingCompiler.cmx \
+    ./src/modelica_compiler/scicosOptimizingCompiler.ml
index 8ee7264..f80fec8 100644 (file)
@@ -6,22 +6,23 @@ modelicac.ocamlc
 *.cma
 *.cmo
 *.cmx
-*.mll
 *.a
 
-src/modelica_compiler/*.ml
-src/modelica_compiler/.depend
-src/modelica_compiler/doc
 #
 #modelicac (windows)
 #
 src/modelica_compiler/modelicac.exe
 src/modelica_compiler/*.obj
+src/modelica_compiler/lexer.ml
+src/modelica_compiler/linenum.ml
+src/modelica_compiler/parser.ml
+src/modelica_compiler/parser.mli
 
 #
 XML2Modelica
 XML2Modelica.ocamlc
 xml2modelica.exe
+src/xml2modelica/linenum.ml
 
 
 #translator
@@ -31,6 +32,7 @@ modelicat.exe
 src/translator/*/*.a
 src/translator/parsing/lexer.ml
 src/translator/parsing/parser.ml
+src/translator/parsing/parser.mli
 src/translator/parsing/linenum.ml
 
 # .tmp files generated on Windows
index 09b26cd..293d0fe 100644 (file)
@@ -251,8 +251,6 @@ $(AM_CPPFLAGS)
 
 libscisundials_la_SOURCES = $(SUNDIALS_SOURCES)
 
-.NOTPARALLEL: libscisundials.la libsciscicos-algo.la
-
 include $(top_srcdir)/Makefile.incl.am
 
 # Build modelica stuff
index 3725e99..7fa95f9 100644 (file)
@@ -42,6 +42,7 @@
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2008 - INRIA - Sylvestre Ledru <sylvestre.ledru@inria.fr>
 # Copyright (C) 2010 - DIGITEO - Sylvestre Ledru
+# Copyright (C) 2014 - Scilab Enterprises - Clement DAVID
 #
 # This file must be used under the terms of the CeCILL.
 # This source file is licensed as described in the file COPYING, which
@@ -437,20 +438,19 @@ libscisundials_la_OBJECTS = $(am_libscisundials_la_OBJECTS)
 @OCAML_TRUE@@XCOS_TRUE@        modelicat$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \
-       $(srcdir)/src/xml2modelica/linenum.ml \
+       $(srcdir)/src/xml2modelica/linenum.mll \
        $(srcdir)/src/xml2modelica/stringParser.ml \
        $(srcdir)/src/xml2modelica/stringLexer.ml \
        $(srcdir)/src/xml2modelica/xMLParser.ml \
        $(srcdir)/src/xml2modelica/xMLLexer.ml \
        $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \
        $(srcdir)/src/xml2modelica/xML2Modelica.ml
-am__objects_8 =
-@OCAML_TRUE@@XCOS_TRUE@am_XML2Modelica_OBJECTS = $(am__objects_8)
+am_XML2Modelica_OBJECTS =
 XML2Modelica_OBJECTS = $(am_XML2Modelica_OBJECTS)
 XML2Modelica_LDADD = $(LDADD)
 am__modelicac_SOURCES_DIST =  \
        $(srcdir)/src/modelica_compiler/parseTree.ml \
-       $(srcdir)/src/modelica_compiler/linenum.ml \
+       $(srcdir)/src/modelica_compiler/linenum.mll \
        $(srcdir)/src/modelica_compiler/parser.mly \
        $(srcdir)/src/modelica_compiler/lexer.mll \
        $(srcdir)/src/modelica_compiler/precompilation.ml \
@@ -474,7 +474,7 @@ am__modelicat_SOURCES_DIST =  \
        $(srcdir)/src/translator/parsing/syntax.ml \
        $(srcdir)/src/translator/parsing/parser.mly \
        $(srcdir)/src/translator/parsing/lexer.mll \
-       $(srcdir)/src/translator/parsing/linenum.ml \
+       $(srcdir)/src/translator/parsing/linenum.mll \
        $(srcdir)/src/translator/compilation/types.ml \
        $(srcdir)/src/translator/compilation/nameResolve.ml \
        $(srcdir)/src/translator/instantiation/instantiation.ml \
@@ -1144,10 +1144,9 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @OCAML_TRUE@@XCOS_TRUE@OCAMLLIBS = nums.cma
 
 ### XML2Modelica
-@OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = $(MLS_XML2Modelica)
-@OCAML_TRUE@@XCOS_TRUE@MLS_XML2Modelica = \
+@OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xMLTree.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/linenum.ml \
+@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/linenum.mll \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/stringParser.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/stringLexer.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xMLParser.ml \
@@ -1155,14 +1154,17 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xML2Modelica.ml
 
+@OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES_mly = $(XML2Modelica_SOURCES:.mly=.ml)
+@OCAML_TRUE@@XCOS_TRUE@MLS_XML2Modelica = $(XML2Modelica_SOURCES_mly:.mll=.ml)
+@OCAML_TRUE@@XCOS_TRUE@MLIS_XML2Modelica = $(MLS_XML2Modelica:.ml=.mli)
 @OCAML_TRUE@@XCOS_TRUE@BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
 
-### Translator 
+### Translator
 @OCAML_TRUE@@XCOS_TRUE@modelicat_SOURCES = \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/parsing/syntax.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/parsing/parser.mly \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/parsing/lexer.mll \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/parsing/linenum.ml \
+@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/parsing/linenum.mll \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/compilation/types.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/compilation/nameResolve.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/translator/instantiation/instantiation.ml \
@@ -1187,7 +1189,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 ### Modelicac
 @OCAML_TRUE@@XCOS_TRUE@modelicac_SOURCES = \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/parseTree.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/linenum.ml \
+@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/linenum.mll \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/parser.mly \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/lexer.mll \
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/precompilation.ml \
@@ -1206,8 +1208,8 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
 
 @OCAML_TRUE@@XCOS_TRUE@modelicac_SOURCES_mly = $(modelicac_SOURCES:.mly=.ml)
-@OCAML_TRUE@@XCOS_TRUE@MLS = $(modelicac_SOURCES_mly:.mll=.ml)
-@OCAML_TRUE@@XCOS_TRUE@MLIS = $(MLS:.ml=.mli)
+@OCAML_TRUE@@XCOS_TRUE@MLS_modelicac = $(modelicac_SOURCES_mly:.mll=.ml)
+@OCAML_TRUE@@XCOS_TRUE@MLIS_modelicac = $(MLS:.ml=.mli)
 @OCAML_TRUE@@XCOS_TRUE@BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler
 @OCAML_TRUE@@XCOS_TRUE@INCLUDE = -I $(BASE_PATH_MODELICAC) -I $(BASE_PATH_XML2Modelica)
 @OCAML_TRUE@@XCOS_TRUE@CLEANFILES = $(BASE_PATH)/*/*.cmi \
@@ -1216,8 +1218,10 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/*.cm[aiox] \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/parser.mli \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/lexer.mli \
+@OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/linenum.mli \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/parser.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/lexer.ml \
+@OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/*/linenum.ml \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/*.cmi \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/*.o \
 @OCAML_TRUE@@XCOS_TRUE@        $(BASE_PATH)/translator/*/*.a \
@@ -3091,8 +3095,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libsciscicos_la_etcDATA \
        uninstall-pkglibLTLIBRARIES
 
 
-.NOTPARALLEL: libscisundials.la libsciscicos-algo.la
-
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
        if test -d $(mydatadir)/tests; then \
@@ -3315,22 +3317,22 @@ distclean-local:
 
 # @TODO check how to avoid the rebuild of the parser/lexer
 
-@OCAML_TRUE@@XCOS_TRUE@%.cmo: %.ml %.cmi
+@OCAML_TRUE@@XCOS_TRUE@.cmi.cmo:
 @OCAML_TRUE@@XCOS_TRUE@        @if echo "$<"|grep src/translator; then \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
 @OCAML_TRUE@@XCOS_TRUE@        else \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
 @OCAML_TRUE@@XCOS_TRUE@        fi
 
-@OCAML_TRUE@@XCOS_TRUE@.ml.cmx:
+@OCAML_TRUE@@XCOS_TRUE@.cmi.cmx:
 @OCAML_TRUE@@XCOS_TRUE@        @if echo "$<"|grep src/translator; then \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
 @OCAML_TRUE@@XCOS_TRUE@        else \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
 @OCAML_TRUE@@XCOS_TRUE@        fi
 
 @OCAML_TRUE@@XCOS_TRUE@.mli.cmi:
@@ -3356,334 +3358,452 @@ distclean-local:
 
 @OCAML_TRUE@@XCOS_TRUE@.mly.ml:
 @OCAML_TRUE@@XCOS_TRUE@        $(OCAMLYACC) $<
+@OCAML_TRUE@@XCOS_TRUE@        @rm $*.mli
 
-# Build the binaries
+# Build the binaries, disabling parallel building
 
-@OCAML_TRUE@@XCOS_TRUE@modelicac: $(MLS:.ml=.cmx)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+@OCAML_TRUE@@XCOS_TRUE@modelicac: $(modelicac_SOURCES)
+@OCAML_TRUE@@XCOS_TRUE@        $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmx)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac:.ml=.cmx)
 
-@OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(MLS:.ml=.cmo)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+@OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(modelicac_SOURCES)
+@OCAML_TRUE@@XCOS_TRUE@        $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmo)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac:.ml=.cmo)
 
-@OCAML_TRUE@@XCOS_TRUE@XML2Modelica: $(MLS_XML2Modelica:.ml=.cmx) 
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+@OCAML_TRUE@@XCOS_TRUE@XML2Modelica: $(XML2Modelica_SOURCES)
+@OCAML_TRUE@@XCOS_TRUE@        $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmx)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx)
 
-@OCAML_TRUE@@XCOS_TRUE@XML2Modelica.ocamlc: $(MLS_XML2Modelica:.ml=.cmo)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $^
+@OCAML_TRUE@@XCOS_TRUE@XML2Modelica.ocamlc: $(XML2Modelica_SOURCES)
+@OCAML_TRUE@@XCOS_TRUE@        $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmo)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $(MLS_XML2Modelica:.ml=.cmo)
 
-@OCAML_TRUE@@XCOS_TRUE@modelicat: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+@OCAML_TRUE@@XCOS_TRUE@modelicat: $(modelicat_SOURCES)
+@OCAML_TRUE@@XCOS_TRUE@        $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmx)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicat:.ml=.cmx)
 
-@OCAML_TRUE@@XCOS_TRUE@modelicat.ocamlc: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmo)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+@OCAML_TRUE@@XCOS_TRUE@modelicat.ocamlc: $(modelicat_SOURCES)
+@OCAML_TRUE@@XCOS_TRUE@        $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmo)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicat:.ml=.cmo)
 
 #BUILT_SOURCES = depend
 
-@OCAML_TRUE@@XCOS_TRUE@depend: 
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLDEP) $(INCLUDE_modelicat) $(INCLUDE) $(MLIS) $(MLS) $(MLIS_XML2Modelica) $(MLS_XML2Modelica) $(MLIS_modelicat) $(MLS_modelicat) > .depend
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parseTree.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/linenum.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parser.cmi: ./src/modelica_compiler/parseTree.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/precompilation.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/compilation.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/instantiation.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/graphNodeSet.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/symbolicExpression.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/squareSparseMatrix.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/bipartiteGraph.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/hungarianMethod.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/causalityGraph.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimization.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/xMLCodeGeneration.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimizingCompiler.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosCodeGeneration.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosOptimizingCompiler.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parseTree.cmo: src/modelica_compiler/parseTree.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parseTree.cmx: src/modelica_compiler/parseTree.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/linenum.cmo: src/modelica_compiler/linenum.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/linenum.cmx: src/modelica_compiler/linenum.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi src/modelica_compiler/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx src/modelica_compiler/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/lexer.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/lexer.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/precompilation.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/precompilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/precompilation.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/precompilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/compilation.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/compilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/compilation.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/compilation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/instantiation.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/instantiation.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/graphNodeSet.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/graphNodeSet.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/graphNodeSet.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/graphNodeSet.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/symbolicExpression.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/symbolicExpression.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/symbolicExpression.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/symbolicExpression.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/squareSparseMatrix.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/squareSparseMatrix.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/squareSparseMatrix.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/squareSparseMatrix.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/bipartiteGraph.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/bipartiteGraph.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/bipartiteGraph.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/bipartiteGraph.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/hungarianMethod.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/hungarianMethod.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/hungarianMethod.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/hungarianMethod.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/causalityGraph.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/causalityGraph.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/causalityGraph.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/causalityGraph.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimization.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimization.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimization.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimization.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/xMLCodeGeneration.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/xMLCodeGeneration.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/xMLCodeGeneration.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/xMLCodeGeneration.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimizingCompiler.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimizingCompiler.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimizingCompiler.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimizingCompiler.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosCodeGeneration.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosCodeGeneration.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosCodeGeneration.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosCodeGeneration.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosOptimizingCompiler.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosOptimizingCompiler.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosOptimizingCompiler.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosOptimizingCompiler.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLTree.cmo:
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLTree.cmx:
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/linenum.cmo:
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/linenum.cmx:
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringParser.cmo:
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringParser.cmx:
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringLexer.cmo
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.cmx
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmo \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmo
-@OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@depend: $(MLS_XML2Modelica) $(MLS_modelicac) $(MLS_modelicat)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLDEP) -all $(INCLUDE) $(MLS_XML2Modelica) $(MLIS_XML2Modelica) > .depend
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLDEP) -all $(INCLUDE_modelicat) $(MLS_modelicat) $(MLIS_modelicat) >> .depend
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLDEP) -all $(INCLUDE) $(MLS_modelicac) $(MLIS_modelicac) >> .depend
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmo ./src/xml2modelica/xMLTree.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx ./src/xml2modelica/xMLTree.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi : ./src/xml2modelica/xMLTree.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmo ./src/xml2modelica/linenum.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/linenum.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmx ./src/xml2modelica/linenum.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/linenum.cmi : ./src/xml2modelica/linenum.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringParser.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringParser.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi : ./src/xml2modelica/stringParser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmo ./src/xml2modelica/stringLexer.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringLexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmx ./src/xml2modelica/stringLexer.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringLexer.cmi : ./src/xml2modelica/stringParser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmo ./src/xml2modelica/xMLParser.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi ./src/modelica_compiler/linenum.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLParser.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi : ./src/xml2modelica/xMLTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmx ./src/modelica_compiler/linenum.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmx ./src/xml2modelica/xMLParser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmo ./src/xml2modelica/xMLLexer.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmx ./src/xml2modelica/xMLLexer.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmi : ./src/xml2modelica/xMLParser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/modelicaCodeGenerator.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi ./src/xml2modelica/stringParser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringLexer.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/modelicaCodeGenerator.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLTree.cmi ./src/xml2modelica/xMLTree.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmi ./src/xml2modelica/stringParser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringLexer.cmi ./src/xml2modelica/stringLexer.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xML2Modelica.cmo ./src/xml2modelica/xML2Modelica.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmi ./src/xml2modelica/xMLLexer.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xML2Modelica.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xML2Modelica.cmx ./src/xml2modelica/xML2Modelica.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xML2Modelica.cmi : ./src/xml2modelica/xMLParser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLParser.cmx ./src/xml2modelica/xMLLexer.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmx
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/syntax.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/lexer.cmi: ./src/translator/parsing/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/linenum.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/types.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/nameResolve.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/instantiation/instantiation.cmi: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xML2Modelica.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmo ./src/translator/parsing/syntax.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmx ./src/translator/parsing/syntax.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi : ./src/translator/parsing/syntax.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmo ./src/translator/parsing/parser.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmx ./src/translator/parsing/parser.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi : ./src/translator/parsing/syntax.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmo ./src/translator/parsing/lexer.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmx ./src/translator/parsing/lexer.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi : ./src/translator/parsing/parser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmo ./src/translator/parsing/linenum.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmx ./src/translator/parsing/linenum.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmx ./src/translator/compilation/types.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/msgDico.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/errorDico.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/exceptHandler.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/libraryManager.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/codeGeneration.cmi: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/versiondate.cmi:
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/translator.cmi: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/syntax.cmo: src/translator/parsing/syntax.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/syntax.cmx: src/translator/parsing/syntax.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/parser.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/lexer.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/lexer.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/linenum.cmo: src/translator/parsing/linenum.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/linenum.cmx: src/translator/parsing/linenum.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/types.cmo: src/translator/compilation/types.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/types.cmx: src/translator/compilation/types.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/nameResolve.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/compilation/nameResolve.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/nameResolve.cmx: \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/compilation/nameResolve.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/instantiation/instantiation.cmo: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/instantiation/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/instantiation/instantiation.cmx: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/syntax.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/instantiation/instantiation.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/msgDico.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/msgDico.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/msgDico.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/msgDico.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/errorDico.cmo: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/errorDico.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/errorDico.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/errorDico.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/exceptHandler.cmo: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/exceptHandler.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/exceptHandler.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/exceptHandler.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/exceptHandler.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi ./src/translator/parsing/linenum.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/exceptHandler.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/libraryManager.cmo: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/libraryManager.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/libraryManager.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi ./src/translator/parsing/lexer.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/libraryManager.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/codeGeneration.cmo: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/codeGeneration.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/codeGeneration.cmx: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/codeGeneration.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/versiondate.cmo: \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/versiondate.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/versiondate.cmx: \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/versiondate.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/translator.cmo: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.cmi : \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/translator.cmi
-@OCAML_TRUE@@XCOS_TRUE@src/translator/translation/translator.cmx: \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi \
 @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmx \
-@OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/translator.cmi
+@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/parseTree.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo ./src/modelica_compiler/linenum.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/linenum.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmi : ./src/modelica_compiler/linenum.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmo ./src/modelica_compiler/parser.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi ./src/modelica_compiler/linenum.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmx ./src/modelica_compiler/parser.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx ./src/modelica_compiler/linenum.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/linenum.cmx ./src/modelica_compiler/parser.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmo ./src/modelica_compiler/lexer.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/lexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmx ./src/modelica_compiler/lexer.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi : ./src/modelica_compiler/parser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmx ./src/modelica_compiler/lexer.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parser.cmi ./src/modelica_compiler/parser.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi ./src/modelica_compiler/lexer.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmo : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.o : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosOptimizingCompiler.cmo \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.ml
+@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosOptimizingCompiler.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.o \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.cmi : \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmx \
+@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.ml
 
 # Build modelica stuff
 
index d7c387b..a1a1d47 100644 (file)
@@ -1,6 +1,7 @@
 # Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
 # Copyright (C) 2008 - INRIA - Sylvestre Ledru <sylvestre.ledru@inria.fr>
 # Copyright (C) 2010 - DIGITEO - Sylvestre Ledru
+# Copyright (C) 2014 - Scilab Enterprises - Clement DAVID
 #
 # This file must be used under the terms of the CeCILL.
 # This source file is licensed as described in the file COPYING, which
@@ -23,10 +24,9 @@ OCAMLLIBS=nums.cma
 
 ### XML2Modelica
 
-XML2Modelica_SOURCES = $(MLS_XML2Modelica)
-MLS_XML2Modelica= \
+XML2Modelica_SOURCES = \
        $(srcdir)/src/xml2modelica/xMLTree.ml \
-       $(srcdir)/src/xml2modelica/linenum.ml \
+       $(srcdir)/src/xml2modelica/linenum.mll \
        $(srcdir)/src/xml2modelica/stringParser.ml \
        $(srcdir)/src/xml2modelica/stringLexer.ml \
        $(srcdir)/src/xml2modelica/xMLParser.ml \
@@ -34,16 +34,20 @@ MLS_XML2Modelica= \
        $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \
        $(srcdir)/src/xml2modelica/xML2Modelica.ml
 
+XML2Modelica_SOURCES_mly = $(XML2Modelica_SOURCES:.mly=.ml)
+MLS_XML2Modelica = $(XML2Modelica_SOURCES_mly:.mll=.ml)
+MLIS_XML2Modelica = $(MLS_XML2Modelica:.ml=.mli)
+
 BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
 
 
-### Translator 
+### Translator
 
 modelicat_SOURCES = \
        $(srcdir)/src/translator/parsing/syntax.ml \
        $(srcdir)/src/translator/parsing/parser.mly \
        $(srcdir)/src/translator/parsing/lexer.mll \
-       $(srcdir)/src/translator/parsing/linenum.ml \
+       $(srcdir)/src/translator/parsing/linenum.mll \
        $(srcdir)/src/translator/compilation/types.ml \
        $(srcdir)/src/translator/compilation/nameResolve.ml \
        $(srcdir)/src/translator/instantiation/instantiation.ml \
@@ -69,7 +73,7 @@ INCLUDE_modelicat = -I $(srcdir)/src/translator/compilation \
 
 modelicac_SOURCES = \
        $(srcdir)/src/modelica_compiler/parseTree.ml \
-       $(srcdir)/src/modelica_compiler/linenum.ml \
+       $(srcdir)/src/modelica_compiler/linenum.mll \
        $(srcdir)/src/modelica_compiler/parser.mly \
        $(srcdir)/src/modelica_compiler/lexer.mll \
        $(srcdir)/src/modelica_compiler/precompilation.ml \
@@ -88,8 +92,8 @@ modelicac_SOURCES = \
        $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
 
 modelicac_SOURCES_mly = $(modelicac_SOURCES:.mly=.ml)
-MLS = $(modelicac_SOURCES_mly:.mll=.ml)
-MLIS = $(MLS:.ml=.mli)
+MLS_modelicac = $(modelicac_SOURCES_mly:.mll=.ml)
+MLIS_modelicac = $(MLS:.ml=.mli)
 
 BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler
 
@@ -100,22 +104,22 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
 
 # @TODO check how to avoid the rebuild of the parser/lexer
 
-%.cmo: %.ml %.cmi
+.cmi.cmo:
        @if echo "$<"|grep src/translator; then \
-               echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
-               $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+               echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
+               $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $*.ml; \
        else \
-               echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-               $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+               echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
+               $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $*.ml; \
        fi
 
-.ml.cmx:
+.cmi.cmx:
        @if echo "$<"|grep src/translator; then \
-               echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
-               $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
+               echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
+               $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $*.ml; \
        else \
-               echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
-               $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
+               echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
+               $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $*.ml; \
        fi
 
 .mli.cmi:
@@ -141,26 +145,33 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
 
 .mly.ml:
        $(OCAMLYACC) $<
+       @rm $*.mli
 
-# Build the binaries
+# Build the binaries, disabling parallel building
 
-modelicac: $(MLS:.ml=.cmx)
-       $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+modelicac: $(modelicac_SOURCES)
+       $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmx)
+       $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicac:.ml=.cmx)
 
-modelicac.ocamlc: $(MLS:.ml=.cmo)
-       $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+modelicac.ocamlc: $(modelicac_SOURCES)
+       $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicac:.ml=.cmo)
+       $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicac:.ml=.cmo)
 
-XML2Modelica: $(MLS_XML2Modelica:.ml=.cmx) 
-       $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+XML2Modelica: $(XML2Modelica_SOURCES)
+       $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmx)
+       $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx)
 
-XML2Modelica.ocamlc: $(MLS_XML2Modelica:.ml=.cmo)
-       $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $^
+XML2Modelica.ocamlc: $(XML2Modelica_SOURCES)
+       $(MAKE) MAKEFLAGS=-j1 $(MLS_XML2Modelica:.ml=.cmo)
+       $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $(MLS_XML2Modelica:.ml=.cmo)
 
-modelicat: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
-       $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+modelicat: $(modelicat_SOURCES)
+       $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmx)
+       $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $(MLS_modelicat:.ml=.cmx)
 
-modelicat.ocamlc: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmo)
-       $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+modelicat.ocamlc: $(modelicat_SOURCES)
+       $(MAKE) MAKEFLAGS=-j1 $(MLS_modelicat:.ml=.cmo)
+       $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $(MLS_modelicat:.ml=.cmo)
 
 CLEANFILES = $(BASE_PATH)/*/*.cmi \
        $(BASE_PATH)/*/*.o \
@@ -168,8 +179,10 @@ CLEANFILES = $(BASE_PATH)/*/*.cmi \
        $(BASE_PATH)/*/*.cm[aiox] \
        $(BASE_PATH)/*/parser.mli \
        $(BASE_PATH)/*/lexer.mli \
+       $(BASE_PATH)/*/linenum.mli \
        $(BASE_PATH)/*/parser.ml \
        $(BASE_PATH)/*/lexer.ml \
+       $(BASE_PATH)/*/linenum.ml \
        $(BASE_PATH)/translator/*/*.cmi \
        $(BASE_PATH)/translator/*/*.o \
        $(BASE_PATH)/translator/*/*.a \
@@ -199,8 +212,10 @@ CLEANFILES = $(BASE_PATH)/*/*.cmi \
 
 #BUILT_SOURCES = depend
 
-depend: 
-       $(OCAMLDEP) $(INCLUDE_modelicat) $(INCLUDE) $(MLIS) $(MLS) $(MLIS_XML2Modelica) $(MLS_XML2Modelica) $(MLIS_modelicat) $(MLS_modelicat) > .depend
+depend: $(MLS_XML2Modelica) $(MLS_modelicac) $(MLS_modelicat)
+       $(OCAMLDEP) -all $(INCLUDE) $(MLS_XML2Modelica) $(MLIS_XML2Modelica) > .depend
+       $(OCAMLDEP) -all $(INCLUDE_modelicat) $(MLS_modelicat) $(MLIS_modelicat) >> .depend
+       $(OCAMLDEP) -all $(INCLUDE) $(MLS_modelicac) $(MLIS_modelicac) >> .depend
 
 include .depend
 
index d1f97b6..f94f2ec 100644 (file)
@@ -22,6 +22,8 @@
 
 {
 
+(** Convert {! Parser.location } to line and column numbers. *)
+
 let linenum = ref 0
 let linebeg = ref 0
 
index 17f48ed..58b0fe3 100644 (file)
@@ -663,3 +663,4 @@ let parse filename token_fun lexbuf =
           first_char 
           ((Lexing.lexeme_end lexbuf - Lexing.lexeme_start lexbuf) + first_char);
         raise Parsing.Parse_error
+
diff --git a/scilab/modules/scicos/src/xml2modelica/linenum.ml b/scilab/modules/scicos/src/xml2modelica/linenum.ml
deleted file mode 100644 (file)
index 4cb385d..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-# 23 "linenum.mll"
-
-let linenum = ref 0
-let linebeg = ref 0
-
-
-# 9 "linenum.ml"
-let __ocaml_lex_tables = {
-  Lexing.lex_base = 
-   "\000\000\254\255\001\000\255\255";
-  Lexing.lex_backtrk = 
-   "\255\255\255\255\000\000\255\255";
-  Lexing.lex_default = 
-   "\000\000\000\000\255\255\000\000";
-  Lexing.lex_trans = 
-   "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\003\000\003\000\000\000\002\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\
-    \001\000\000\000";
-  Lexing.lex_check = 
-   "\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\000\000\002\000\255\255\000\000\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\255\
-    \000\000\255\255";
-  Lexing.lex_base_code = 
-   "";
-  Lexing.lex_backtrk_code = 
-   "";
-  Lexing.lex_default_code = 
-   "";
-  Lexing.lex_trans_code = 
-   "";
-  Lexing.lex_check_code = 
-   "";
-  Lexing.lex_code = 
-   "";
-}
-
-let rec skip_line lexbuf =
-    __ocaml_lex_skip_line_rec lexbuf 0
-and __ocaml_lex_skip_line_rec lexbuf __ocaml_lex_state =
-  match Lexing.engine __ocaml_lex_tables __ocaml_lex_state lexbuf with
-      | 0 ->
-# 32 "linenum.mll"
-      ( incr linenum;
-        linebeg := Lexing.lexeme_start lexbuf;
-        Lexing.lexeme_end lexbuf )
-# 108 "linenum.ml"
-
-  | 1 ->
-# 36 "linenum.mll"
-      ( incr linenum;
-        linebeg := Lexing.lexeme_start lexbuf;
-        raise End_of_file )
-# 115 "linenum.ml"
-
-  | __ocaml_lex_state -> lexbuf.Lexing.refill_buff lexbuf; __ocaml_lex_skip_line_rec lexbuf __ocaml_lex_state
-
-;;
-
-# 40 "linenum.mll"
-
-let for_position file loc =
-  let ic = open_in_bin file in
-  let lb = Lexing.from_channel ic in
-  linenum := 1;
-  linebeg := 0;
-  begin try
-    while skip_line lb <= loc do () done
-  with End_of_file -> ()
-  end;
-  close_in ic;
-  (!linenum - 1, !linebeg)
-
-
-# 137 "linenum.ml"
diff --git a/scilab/modules/scicos/src/xml2modelica/linenum.mli b/scilab/modules/scicos/src/xml2modelica/linenum.mli
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/scilab/modules/scicos/src/xml2modelica/linenum.mll b/scilab/modules/scicos/src/xml2modelica/linenum.mll
new file mode 100644 (file)
index 0000000..c043e44
--- /dev/null
@@ -0,0 +1,56 @@
+(*
+ *  Translator from Modelica 2.x to flat Modelica
+ *
+ *  Copyright (C) 2005 - 2007 Imagine S.A.
+ *  For more information or commercial use please contact us at www.amesim.com
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *)
+
+{
+
+(** Convert {! Parser.location } to line and column numbers. *)
+
+let linenum = ref 0
+let linebeg = ref 0
+
+}
+
+rule skip_line = parse
+  | [^ '\n' '\r']* ('\n' | '\r' | "\r\n")
+      { incr linenum;
+        linebeg := Lexing.lexeme_start lexbuf;
+        Lexing.lexeme_end lexbuf }
+  | [^ '\n' '\r']* eof
+      { incr linenum;
+        linebeg := Lexing.lexeme_start lexbuf;
+        raise End_of_file }
+
+{
+
+let for_position file loc =
+  let ic = open_in_bin file in
+  let lb = Lexing.from_channel ic in
+  linenum := 1;
+  linebeg := 0;
+  begin try
+    while skip_line lb <= loc do () done
+  with End_of_file -> ()
+  end;
+  close_in ic;
+  (!linenum - 1, !linebeg)
+
+}
index 45b22d3..6670513 100644 (file)
@@ -487,27 +487,25 @@ endif
 
 $(top_builddir)/modules/scicos_blocks/build/Cblocknames:Makefile.am $(SCICOS_BLOCKS_C_SOURCES)
        @echo "-- Generates build/Cblocknames --"
-       @if test ! -d build; then mkdir $(top_builddir)/modules/scicos_blocks/build; fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/build;
 # Get the filename, strip the extension and put into a file
        @for file in $(SCICOS_BLOCKS_C_SOURCES); do echo $$file |sed  's|.*/\([0-9A-Za-z_-]*\)\.c|\1|' ;done > $(top_builddir)/modules/scicos_blocks/build/Cblocknames
 
 $(top_builddir)/modules/scicos_blocks/build/CPPblocknames:Makefile.am $(SCICOS_BLOCKS_CXX_SOURCES)
        @echo "-- Generates build/CPPblocknames --"
-       @if test ! -d build; then mkdir $(top_builddir)/modules/scicos_blocks/build; fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/build;
 # Get the filename, strip the extension and put into a file
        @for file in $(SCICOS_BLOCKS_CXX_SOURCES); do echo $$file |sed  's|.*/\([0-9A-Za-z_-]*\)\.cpp|\1|' ;done > $(top_builddir)/modules/scicos_blocks/build/CPPblocknames
 
 $(top_builddir)/modules/scicos_blocks/build/Fblocknames: Makefile.am $(SCICOS_BLOCKS_FORTRAN_SOURCES)
        @echo "-- Generates build/Fblocknames --"
-       @if test ! -d build; then mkdir $(top_builddir)/modules/scicos_blocks/build; fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/build;
 # Get the filename, strip the extension and put into a file
        @for file in $(SCICOS_BLOCKS_FORTRAN_SOURCES); do echo $$file |sed  's|.*/\([0-9A-Za-z_-]*\)\.f|\1|';done > $(top_builddir)/modules/scicos_blocks/build/Fblocknames
 
 includes/blocks.h: $(top_builddir)/modules/scicos_blocks/build/Cblocknames $(top_builddir)/modules/scicos_blocks/build/Fblocknames $(top_builddir)/modules/scicos_blocks/build/CPPblocknames
        @echo "-- Building includes/blocks.h --"
-       @if test ! -d $(top_builddir)/modules/scicos_blocks/includes/; then \
-               mkdir $(top_builddir)/modules/scicos_blocks/includes/; \
-       fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/includes;
        @$(top_srcdir)/modules/scicos_blocks/src/scripts/GenBlocks.sh $(top_builddir)/modules/scicos_blocks/build/Fblocknames $(top_builddir)/modules/scicos_blocks/build/Cblocknames $(top_builddir)/modules/scicos_blocks/build/CPPblocknames $(top_builddir)/modules/scicos_blocks/includes/blocks.h
 
 CLEANFILES=$(top_srcdir)/modules/scicos_blocks/includes/blocks.h \
@@ -554,7 +552,5 @@ MACROSSPECIALEXT=*.mo \
 
 TESTS_DIREXT= tests/unit_tests/Linear
 
-.NOTPARALLEL: build/Fblocknames build/Cblocknames
-
 include $(top_srcdir)/Makefile.incl.am
 
index 95c9f49..4377acf 100644 (file)
@@ -5293,31 +5293,27 @@ uninstall-am: uninstall-libsciscicos_blocks_la_etcDATA \
 
 $(top_builddir)/modules/scicos_blocks/build/Cblocknames:Makefile.am $(SCICOS_BLOCKS_C_SOURCES)
        @echo "-- Generates build/Cblocknames --"
-       @if test ! -d build; then mkdir $(top_builddir)/modules/scicos_blocks/build; fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/build;
 # Get the filename, strip the extension and put into a file
        @for file in $(SCICOS_BLOCKS_C_SOURCES); do echo $$file |sed  's|.*/\([0-9A-Za-z_-]*\)\.c|\1|' ;done > $(top_builddir)/modules/scicos_blocks/build/Cblocknames
 
 $(top_builddir)/modules/scicos_blocks/build/CPPblocknames:Makefile.am $(SCICOS_BLOCKS_CXX_SOURCES)
        @echo "-- Generates build/CPPblocknames --"
-       @if test ! -d build; then mkdir $(top_builddir)/modules/scicos_blocks/build; fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/build;
 # Get the filename, strip the extension and put into a file
        @for file in $(SCICOS_BLOCKS_CXX_SOURCES); do echo $$file |sed  's|.*/\([0-9A-Za-z_-]*\)\.cpp|\1|' ;done > $(top_builddir)/modules/scicos_blocks/build/CPPblocknames
 
 $(top_builddir)/modules/scicos_blocks/build/Fblocknames: Makefile.am $(SCICOS_BLOCKS_FORTRAN_SOURCES)
        @echo "-- Generates build/Fblocknames --"
-       @if test ! -d build; then mkdir $(top_builddir)/modules/scicos_blocks/build; fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/build;
 # Get the filename, strip the extension and put into a file
        @for file in $(SCICOS_BLOCKS_FORTRAN_SOURCES); do echo $$file |sed  's|.*/\([0-9A-Za-z_-]*\)\.f|\1|';done > $(top_builddir)/modules/scicos_blocks/build/Fblocknames
 
 includes/blocks.h: $(top_builddir)/modules/scicos_blocks/build/Cblocknames $(top_builddir)/modules/scicos_blocks/build/Fblocknames $(top_builddir)/modules/scicos_blocks/build/CPPblocknames
        @echo "-- Building includes/blocks.h --"
-       @if test ! -d $(top_builddir)/modules/scicos_blocks/includes/; then \
-               mkdir $(top_builddir)/modules/scicos_blocks/includes/; \
-       fi
+       mkdir -p $(top_builddir)/modules/scicos_blocks/includes;
        @$(top_srcdir)/modules/scicos_blocks/src/scripts/GenBlocks.sh $(top_builddir)/modules/scicos_blocks/build/Fblocknames $(top_builddir)/modules/scicos_blocks/build/Cblocknames $(top_builddir)/modules/scicos_blocks/build/CPPblocknames $(top_builddir)/modules/scicos_blocks/includes/blocks.h
 
-.NOTPARALLEL: build/Fblocknames build/Cblocknames
-
 # This target enables tests for Scilab
 check-local: $(top_builddir)/scilab-bin test
        if test -d $(mydatadir)/tests; then \
index 538d476..f048402 100644 (file)
 
 package org.scilab.forge.scirenderer.implementation.jogl;
 
-import org.scilab.forge.scirenderer.Canvas;
-import org.scilab.forge.scirenderer.Drawer;
-import org.scilab.forge.scirenderer.implementation.jogl.buffers.JoGLBuffersManager;
-import org.scilab.forge.scirenderer.implementation.jogl.picking.JoGLPickingManager;
-import org.scilab.forge.scirenderer.implementation.jogl.renderer.JoGLRendererManager;
-import org.scilab.forge.scirenderer.implementation.jogl.texture.JoGLTextureManager;
-import org.scilab.forge.scirenderer.picking.PickingManager;
-
-import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
-import com.jogamp.opengl.util.awt.ImageUtil;
-
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.lang.reflect.InvocationTargetException;
@@ -39,6 +28,16 @@ import javax.media.opengl.GLOffscreenAutoDrawable;
 import javax.media.opengl.GLProfile;
 import javax.swing.SwingUtilities;
 
+import org.scilab.forge.scirenderer.Canvas;
+import org.scilab.forge.scirenderer.Drawer;
+import org.scilab.forge.scirenderer.implementation.jogl.buffers.JoGLBuffersManager;
+import org.scilab.forge.scirenderer.implementation.jogl.picking.JoGLPickingManager;
+import org.scilab.forge.scirenderer.implementation.jogl.renderer.JoGLRendererManager;
+import org.scilab.forge.scirenderer.implementation.jogl.texture.JoGLTextureManager;
+import org.scilab.forge.scirenderer.picking.PickingManager;
+
+import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil;
+
 /**
  * JoGL implementation of a Canvas.
  *
index c5be74f..25e8624 100644 (file)
@@ -1,5 +1,5 @@
 // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) INRIA - 2011 - Serge Steer
+// Copyright (C) 2011-2014 - INRIA - Serge Steer
 //
 // This file must be used under the terms of the CeCILL.
 // This source file is licensed as described in the file COPYING, which
@@ -33,7 +33,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
 
     margin_x     = 5;      // Horizontal margin between each elements
     margin_y     = 5;      // Vertical margin between each elements
-    button_w     = 65;
+    button_w     = 70;
     button_h     = 30;
     frame_h     = 300;
     frame_w     = 440;
@@ -47,7 +47,6 @@ function [ok,values,exprs]=wfir_gui(exprs)
 
     fig_id=max(winsid())+1
     fig = scf(fig_id)
-    fig.visible = "off"
 
     // Remove Scilab graphics menus & toolbar
     //  drawlater (bug)
@@ -265,7 +264,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "BackgroundColor"     , [1 1 1], ...
     "ForegroundColor"     , [1 1 1]*0, ...
     "userdata"            , list(Forderv,1), ...
-    "callback"            , "wfirSliderpos2Value()",...
+    "callback"            , "wfirSliderpos2ValueI()",...
     "visible"             , "on")
     set(Forderv,"userdata",Forders);
 
@@ -274,9 +273,11 @@ function [ok,values,exprs]=wfir_gui(exprs)
     xlcf=xsf
     labellcf_w=labelsf_w;
     editlcf_w= editsf_w;
+    if ftype=="""hp""" then visible="off";else visible="on";end
     Lcfl=uicontrol( ...
     "parent"              , gui,...
     "style"               , "text",...
+    "visible"             , visible,...
     "string"              ,  _("Low cutoff frequency (Hz)"),...
     "units"               , "pixels",...
     "position"            , [xlcf ylcf labellcf_w label_h],....
@@ -290,6 +291,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
     Lcfv=uicontrol( ...
     "parent"              , gui,...
     "style"               , "edit",...
+    "visible"             , visible,...
     "units"               , "pixels",...
     "string"              , exprs(5),...
     "position"            , [xlcf,ylcf-label_h-margin_y,editlcf_w,label_h],...
@@ -303,6 +305,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
     Lcfs=uicontrol( ...
     "parent"              , gui,...
     "style"               , "slider",...
+    "visible"             , visible,...
     "min"                 , 0,...
     "max"                 , 500,...
     "sliderstep"          , [1 10],...
@@ -317,7 +320,6 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "ForegroundColor"     , [1 1 1]*0, ...
     "userdata"            , list(Lcfv,fact), ...
     "callback"            , "wfirSliderpos2Value()")
-    if ftype=="""hp""" then Lcfs.visible="off";Lcfv.visible="off";Lcfl.visible="off";end
     set(Lcfv,"userdata",Lcfs);
 
     //High cutoff frequency -----------------------------------------------------------------
@@ -325,9 +327,11 @@ function [ok,values,exprs]=wfir_gui(exprs)
     xhcf=xsf
     labelhcf_w=labelsf_w;
     edithcf_w= editsf_w;
+    if ftype=="""lp""" then visible="off";else visible="on";end
     Hcfl=uicontrol( ...
     "parent"              , gui,...
     "style"               , "text",...
+    "visible"             , visible,...
     "string"              ,  _("High cutoff frequency (Hz)"),...
     "units"               , "pixels",...
     "position"            , [xhcf yhcf labelhcf_w label_h],....
@@ -336,12 +340,12 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "fontsize"            , 12,...
     "fontweight"          , "bold", ...
     "horizontalalignment" , "left", ...
-    "visible"             , "off", ...
     "background"          , [1 1 1]*0.8);
     fact=1000;
     Hcfv=uicontrol( ...
     "parent"              , gui,...
     "style"               , "edit",...
+    "visible"             , visible,...
     "units"               , "pixels",...
     "string"              , exprs(6),...
     "position"            , [xhcf,yhcf-label_h-margin_y,edithcf_w,label_h],...
@@ -351,11 +355,11 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "horizontalalignment" , "left", ...
     "BackgroundColor"     , [1 1 1], ...
     "ForegroundColor"     , [1 1 1]*0, ...
-    "visible"             , "off", ...
     "callback"            , "wfirValue2Sliderpos()")
     Hcfs=uicontrol( ...
     "parent"              , gui,...
     "style"               , "slider",...
+    "visible"             , visible,...
     "min"                 , 0,...
     "max"                 , 500,...
     "sliderstep"          , [1 10],...
@@ -369,21 +373,20 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "BackgroundColor"     , [1 1 1], ...
     "ForegroundColor"     , [1 1 1]*0, ...
     "userdata"            , list(Hcfv,fact), ...
-    "visible"             , "off", ...
     "callback"            , "wfirSliderpos2Value()")
-    if ftype=="lp" then Hcfs.visible="off";Hcfv.visible="off";Hcfl.visible="off";end
     set(Hcfv,"userdata",Hcfs);
 
 
-
     //Chebychev or Kaiser window parameter -----------------------------------------------------------------
     yfp=yhcf-2*(margin_y+label_h)
     xfp=xsf
     labelfp_w=labelsf_w;
     editfp_w= editsf_w;
+    if and(wtype<>["""kr""" """ch"""]) then visible="off";else visible="on";end
     Fpl=uicontrol( ...
     "parent"              , gui,...
     "style"               , "text",...
+    "visible"             , visible,...
     "string"              ,  _("Parameter"),...
     "units"               , "pixels",...
     "position"            , [xfp yfp labelfp_w label_h],....
@@ -392,13 +395,13 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "fontsize"            , 12,...
     "fontweight"          , "bold", ...
     "horizontalalignment" , "left", ...
-    "visible"             , "off",...
     "background"          , [1 1 1]*0.8);
     fact=1000;
 
     Fpv=uicontrol( ...
     "parent"              , gui,...
     "style"               , "edit",...
+    "visible"             , visible,...
     "units"               , "pixels",...
     "string"              , exprs(7),...
     "position"            , [xfp,yfp-label_h-margin_y,editfp_w,label_h],...
@@ -412,6 +415,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
     Fps=uicontrol( ...
     "parent"              , gui,...
     "style"               , "slider",...
+    "visible"             , visible,...
     "min"                 , 0,...
     "max"                 , 500,...
     "sliderstep"          , [1 10],...
@@ -426,7 +430,6 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "ForegroundColor"     , [1 1 1]*0, ...
     "userdata"            , list(Fpv,fact), ...
     "callback"            , "wfirSliderpos2Value()")
-    if and(wtype<>["""kr""" """ch"""]) then Fps.visible="off";Fpv.visible="off";end
 
     set(Fpv,"userdata",Fps);
 
@@ -437,7 +440,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
     //Display -----------------------------------------------------------------
     yd=yfp-2*(margin_y+label_h)
     xd=xsf
-    labeld_w=80
+    labeld_w=40
     uicontrol( ...
     "parent"              , gui,...
     "style"               , "text",...
@@ -495,22 +498,6 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "visible"             , "on", ...
     "callback"            , "global ret;ret=2;");
     xbuttons=xbuttons+margin_x+button_w
-    Reset = uicontrol( ...
-    "parent"              , gui,...
-    "relief"              , "groove",...
-    "style"               , "pushbutton",...
-    "string"              , _("Reset"),...
-    "units"               , "pixels",...
-    "position"            , [xbuttons,ybuttons,button_w button_h],..
-    "fontname"            , "arial",...
-    "fontunits"           , "points",...
-    "fontsize"            , 12,...
-    "fontweight"          , "bold", ...
-    "horizontalalignment" , "center", ...
-    "visible"             , "on", ...
-    "callback"            , "wfirSetDefaultParameters(gcbo.parent.user_data)");
-
-    xbuttons=xbuttons+margin_x+button_w
     Help = uicontrol( ...
     "parent"              , gui,...
     "relief"              , "groove",...
@@ -527,8 +514,6 @@ function [ok,values,exprs]=wfir_gui(exprs)
     "callback"            , "help wfir");
     // next used by wfirGetFilterParameters
     set(gui,"userdata",[Fview,Filtertype,Windowtype,Forderv,Forders,Lcfv,Lcfs,Hcfv,Hcfs,Fpv,Fps,Sfreq,Ftv,Wtv])
-
-    fig.visible = "on";
     realtimeinit(0.1);
     t=0;
     while ret==0&or(winsid()==fig_id) then
@@ -538,7 +523,7 @@ function [ok,values,exprs]=wfir_gui(exprs)
     end
     if ret==1&or(winsid()==fig_id) then
         ok=%t
-        [ftype,forder,low,high,wtype,fpar,freq_ech,ok]= wfirGetFilterParameters(gui.userdata)
+        [ftype,forder,low,high,wtype,fpar,freq_ech]=wfirGetFilterParameters(gui.userdata)
         values=tlist(["wfir","ftype","forder","low","high","wtype","fpar","freq_ech"],ftype,forder,low,high,wtype,fpar,freq_ech)
         exprs= wfirGetFilterExprs(gui.userdata)
         delete(fig)
@@ -547,7 +532,6 @@ function [ok,values,exprs]=wfir_gui(exprs)
         ok=%f
         values=[]
         exprs=[]
-        if or(winsid()==fig_id) then delete(fig),end
     end
     clearglobal ret idle;
 
@@ -556,53 +540,33 @@ endfunction
 function wfirSliderpos2Value(hs)
     //hs handle on the slider
     if argn(2)<1 then hs=gcbo,end
-    H=hs.parent.userdata
     ud=hs.userdata
     hv=ud(1);//handle on edition zone
     fact=ud(2)// scale factor
-    Sfreq=H(12);
-    freq_ech=evstr(Sfreq.string)
-    hv.string=string((hs.value/fact)*freq_ech);
+    hv.string=string(hs.value/fact)
+    wfirUpdate(hs)
+endfunction
+function wfirSliderpos2ValueI(hs)
+    //hs handle on the slider
+    if argn(2)<1 then hs=gcbo,end
+    hs.value=round(hs.value)
+    ud=hs.userdata
+    hv=ud(1);//handle on edition zone
+    fact=ud(2)// scale factor
+    hv.string=string(hs.value/fact)
     wfirUpdate(hs)
 endfunction
 
 function wfirValue2Sliderpos(hv)
     // hv handle on edition zone
     if argn(2)<1 then hv=gcbo,end
-    H=hv.parent.userdata
-    //H=[Fview,Filtertype,Windowtype,Forderv,Forders,Lcfv,Lcfs,Hcfv,Hcfs,Fpv,Fps,Sfreq,Ftv,Wtv]
-    k=find(H==hv)
-    Sfreq=H(12)
-    hs=hv.userdata //handle on the slider
-    ud=hs.userdata
-    fact=ud(2)// scale factor
-
-    Ok=%t
     if execstr("v="+hv.string,"errcatch")==0 then
-        if k==8 then //Hcfv
-            execstr("v2="+H(6).string)
-            if v<=v2|v<=0|v>0.5*fact then Ok=%f,end
-        elseif k==6 then  //Lcfv
-            execstr("v2="+H(8).string)
-            if v>=v2|v<=0|v>0.5*fact then Ok=%f,end
-        elseif k==4 then  //Forderv
-            if v<3 then Ok=%f,end
-        elseif k==10 then  //Fpv
-            if v<=0 then Ok=%f,end
-            if H(3).value==6 then //cheby main lobe
-                if v>=0.5 then Ok=%f,end
-            end
-
-        end
-        if Ok then
-            Sfreq=H(12);
-            freq_ech=evstr(Sfreq.string)
-            hs.value=v*fact/freq_ech;
-            hv.ForegroundColor=[0 0 0];
-            wfirUpdate(hv)
-        else
-            hv.ForegroundColor=[1 0 0];
-        end
+        hs=hv.userdata //handle on the slider
+        ud=hs.userdata
+        fact=ud(2)// scale factor
+        hs.value=fact*v
+        hv.ForegroundColor=[0 0 0];
+        wfirUpdate(hv)
     else
         hv.ForegroundColor=[1 0 0];
     end
@@ -684,9 +648,9 @@ function wfirSetWindowType()
             label.visible="on";
             value.visible="on";
 
-            init=2.5;fact=50;
+            init=2.5;fact=100;
             value.string=string(init)
-            scroll.min=1d-10*fact
+            scroll.min=0
             scroll.max=10*fact
             scroll.value=init*fact
             d=scroll.userdata;d(2)=fact
@@ -698,7 +662,7 @@ function wfirSetWindowType()
             value.visible="on";
             init=0.2;fact=1000;
             value.string=string(init)
-            scroll.min=1d-6*fact
+            scroll.min=1d-10*fact
             scroll.max=0.5*fact
             scroll.value=init*fact
             d=scroll.userdata;d(2)=fact
@@ -709,9 +673,9 @@ function wfirSetWindowType()
             label.string=_("maximum side-lobe height")
             label.visible="on";
             value.visible="on";
-            init=0.001;fact=500;
+            init=0.001;fact=1000;
             value.string=string(init)
-            scroll.min=1d-6*fact
+            scroll.min=1d-10*fact
             scroll.max=1*fact
             scroll.value=init*fact
             d=scroll.userdata;d(2)=fact
@@ -757,9 +721,16 @@ function wfirSetSamplingFrequency()
         //H=[Fview,Filtertype,Windowtype,Forderv,Forders,Lcfv,Lcfs,Hcfv,Hcfs,Fpv,Fps,Sfreq,Ftv,Wtv]
         //update low and high cutoff frequencies
         r=newfreq/curfreq
-        Lcfv=H(6);
-        Hcfv=H(8);
+        Lcfv=H(6),Lcfs=H(7),Hcfv=H(8),Hcfs=H(9)
+
+        Lcfs.min=Lcfs.min*r
+        Lcfs.max=Lcfs.max*r
+        Lcfs.value=Lcfs.value*r
         Lcfv.string=string(evstr(Lcfv.string)*r)
+
+        Hcfs.min=Hcfs.min*r
+        Hcfs.max=Hcfs.max*r
+        Hcfs.value=Hcfs.value*r
         Hcfv.string=string(evstr(Hcfv.string)*r)
 
         Sfreq.userdata=newfreq
@@ -770,10 +741,9 @@ function wfirSetSamplingFrequency()
 
 endfunction
 
-function [ftype,forder,low,high,wtype,fpar,freq_ech,ok]=wfirGetFilterParameters(H)
+function [ftype,forder,low,high,wtype,fpar,freq_ech]=wfirGetFilterParameters(H)
     //  low,high,freq_ech are returned in Hz
     //H=[Fview,Filtertype,Windowtype,Forderv,Forders,Lcfv,Lcfs,Hcfv,Hcfs,Fpv,Fps,Sfreq,Ftv,Wtv]
-    ftype=[];forder=[];low=[];high=[];wtype=[];fpar=[];freq_ech=[];ok=%t
     FT=["lp","hp","bp","sb"]
     WT=["re","tr","hn","hm","kr","ch","ch"]
     Filtertype=H(2);
@@ -786,14 +756,6 @@ function [ftype,forder,low,high,wtype,fpar,freq_ech,ok]=wfirGetFilterParameters(
     ftype=FT(Filtertype.value)
     wtype=WT(Windowtype.value)
     forder=evstr(Forderv.string)
-    if and(Forderv.ForegroundColor==[1 0 0])| ...
-        and(Lcfv.ForegroundColor==[1 0 0])| ...
-        and(Hcfv.ForegroundColor==[1 0 0])| ...
-        and(Sfreq.ForegroundColor==[1 0 0])| ...
-        and(Fpv.ForegroundColor==[1 0 0]) then
-        ok=%f
-        return
-    end
     if or(ftype==["hp" "sb"]) then
         //force odd ordrer
         if 2*int(forder/2)==forder then forder=forder+1,end
@@ -810,43 +772,16 @@ function [ftype,forder,low,high,wtype,fpar,freq_ech,ok]=wfirGetFilterParameters(
         high=evstr(Hcfv.string)
     end
     if Windowtype.value==5 //Kaiser
-        fpar=[max(1e-10,evstr(Fpv.string)) 0]
+        fpar=[evstr(Fpv.string) 0]
     elseif Windowtype.value==6 //Chebychev, main lobe constraint df in [0 0.5]
-        fpar=[-1 max(1e-10,evstr(Fpv.string))]
+        fpar=[-1 evstr(Fpv.string)]
     elseif Windowtype.value==7  //Chebychev, side lobe constraint dp>0
-        fpar=[ max(1e-10,evstr(Fpv.string)) -1]
+        fpar=[evstr(Fpv.string) -1]
     else
         fpar=[-1 -1]
     end
 endfunction
-function wfirSetDefaultParameters(H)
-    //  low,high,freq_ech are returned in Hz
-    //H=[Fview,Filtertype,Windowtype,Forderv,Forders,Lcfv,Lcfs,Hcfv,Hcfs,Fpv,Fps,Sfreq,Ftv,Wtv]
-    FT=["lp","hp","bp","sb"]
-    WT=["re","tr","hn","hm","kr","ch","ch"]
-    Fview=H(1);
-    Ftv=H(13);
-    Wtv=H(14);
-    Windowtype= Wtv.user_data(2)
-    Windowtype.user_data(1).visible="off"
-    Windowtype.value=1
-    Filtertype= Ftv.user_data(2)
-    Filtertype.user_data(1)(2,:).visible="off";
-    Filtertype.value=1
-    Forderv=H(4);
-    Lcfv=H(6);
-    Hcfv=H(8);
-    Fpv=H(10);
-    Sfreq=H(12)
 
-    //Fview.value=0
-    Sfreq.string="1";
-    Forderv.string="49";
-    Ftv.string="""lp""";
-    Wtv.string="""re""";
-    Lcfv.string="0.05"
-    wfirUpdate(gcbo)
-endfunction
 function  wfirUpdate(h)
     global idle
     if ~idle then return,end
@@ -856,13 +791,12 @@ function  wfirUpdate(h)
     //  H=[Fview,Filtertype,Windowtype,Forderv,Forders,Lcfv,Lcfs,Hcfv,Hcfs,Fpv,Fps,Sfreq,Ftv,Wtv]
     if H(1).value==1 then
         old=gcf()
-        [ftype,forder,low,high,wtype,fpar,freq_ech,ok]= wfirGetFilterParameters(H)
-        if ~ok then clearglobal idle;return,end
+        [ftype,forder,low,high,wtype,fpar,freq_ech]= ...
+        wfirGetFilterParameters(H)
         cfreq=[low,high]/freq_ech;
         [filt,wfm,fr]=wfir(ftype,forder,cfreq,wtype,fpar);
         fig=H(1).userdata
-        if ~is_handle_valid(fig) then ...
-
+        if ~is_handle_valid(fig) then
             //the window has been closed by user
             fig=scf(max(winsid())+1)
             a=gca();
diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13758.tst b/scilab/modules/xcos/tests/nonreg_tests/bug_13758.tst
new file mode 100644 (file)
index 0000000..3d42333
--- /dev/null
@@ -0,0 +1,23 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Vincent COUVERT
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- XCOS TEST -->
+// <-- INTERACTIVE TEST -->
+//
+// <-- Non-regression test for bug 13758 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13758
+//
+// <-- Short Description -->
+// x_mdialog interpreted 'F' and 'T' as boolean values
+// whereas it should interpret '%F' and '%T' instead.
+
+xcos("SCI/modules/xcos/tests/nonreg_tests/bug_13758.zcos");
+
+// Double-clic on SampleCLK block (top left block)
+// In parameters dialog, check that "Sample time" is a text field containing T and not a checkbox.
\ No newline at end of file
diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13758.zcos b/scilab/modules/xcos/tests/nonreg_tests/bug_13758.zcos
new file mode 100644 (file)
index 0000000..db2888f
Binary files /dev/null and b/scilab/modules/xcos/tests/nonreg_tests/bug_13758.zcos differ
index 13cb79d..01672f0 100644 (file)
@@ -17,9 +17,9 @@ ca_ES.LANGUAGE =ca_ES
 
 ca_ES.MsgBoxJRENotFound =Java Runtime Environment not detected.
 ca_ES.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-ca_ES.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-ca_ES.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-ca_ES.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+ca_ES.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+ca_ES.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+ca_ES.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 ca_ES.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 ca_ES.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ ca_ES.DescriptionTclTK =TCL/TK in Scilab
 ca_ES.DescriptionSpreadsheet =Spreadsheet Toolbox
 ca_ES.DescriptionJVM =Java Runtime
 ca_ES.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-ca_ES.DescriptionFftwModule = FFTW interface for Scilab
-ca_ES.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-ca_ES.DescriptionRefFftwLibrary = Reference FFTW library
+ca_ES.DescriptionFftwModule =FFTW interface for Scilab
+ca_ES.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+ca_ES.DescriptionRefFftwLibrary =Reference FFTW library
 ca_ES.DescriptionParametersTlbx =Parameters Toolbox
 ca_ES.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 ca_ES.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 ca_ES.DescriptionDevTools =Development Tools
 ca_ES.DescriptionTests =Tests for Scilab
-ca_ES.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-ca_ES.DescriptionComConnector = COM connector
-ca_ES.DescriptionSciNotes = SciNotes: Editor for Scilab
-ca_ES.DescriptionXcos = XCos 1.1
-ca_ES.DescriptionParallel = Parallel Computing with Scilab
-ca_ES.DescriptionModulesManager = Tools for management of extern modules 
-ca_ES.DescriptionModuleJVM = JVM Module
+ca_ES.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+ca_ES.DescriptionComConnector =COM connector
+ca_ES.DescriptionSciNotes =SciNotes: Editor for Scilab
+ca_ES.DescriptionXcos =Xcos
+ca_ES.DescriptionParallel =Parallel Computing with Scilab
+ca_ES.DescriptionModulesManager =Tools for management of extern modules
+ca_ES.DescriptionModuleJVM =JVM Module
 ;
 ca_ES.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ ca_ES.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 ca_ES.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-ca_ES.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+ca_ES.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-ca_ES.DescriptionAssociateTstDem =Associate *.tst files with scilab
+ca_ES.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-ca_ES.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+ca_ES.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-ca_ES.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+ca_ES.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-ca_ES.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+ca_ES.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 ca_ES.DescriptionDefaultInstall =Installation (Default)
 ca_ES.DescriptionFullInstall =Full installation
index abb0753..c57de6f 100644 (file)
@@ -17,9 +17,9 @@ cs_CZ.LANGUAGE =cs_CZ
 
 cs_CZ.MsgBoxJRENotFound =Java Runtime Environment not detected.
 cs_CZ.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-cs_CZ.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-cs_CZ.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-cs_CZ.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+cs_CZ.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+cs_CZ.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+cs_CZ.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 cs_CZ.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 cs_CZ.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ cs_CZ.DescriptionTclTK =TCL/TK in Scilab
 cs_CZ.DescriptionSpreadsheet =Spreadsheet Toolbox
 cs_CZ.DescriptionJVM =Java Runtime
 cs_CZ.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-cs_CZ.DescriptionFftwModule = FFTW interface for Scilab
-cs_CZ.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-cs_CZ.DescriptionRefFftwLibrary = Reference FFTW library
+cs_CZ.DescriptionFftwModule =FFTW interface for Scilab
+cs_CZ.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+cs_CZ.DescriptionRefFftwLibrary =Reference FFTW library
 cs_CZ.DescriptionParametersTlbx =Parameters Toolbox
 cs_CZ.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 cs_CZ.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 cs_CZ.DescriptionDevTools =Development Tools
 cs_CZ.DescriptionTests =Tests for Scilab
-cs_CZ.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-cs_CZ.DescriptionComConnector = COM connector
-cs_CZ.DescriptionSciNotes = SciNotes: Editor for Scilab
-cs_CZ.DescriptionXcos = XCos 1.1
-cs_CZ.DescriptionParallel = Parallel Computing with Scilab
-cs_CZ.DescriptionModulesManager = Tools for management of extern modules 
-cs_CZ.DescriptionModuleJVM = JVM Module
+cs_CZ.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+cs_CZ.DescriptionComConnector =COM connector
+cs_CZ.DescriptionSciNotes =SciNotes: Editor for Scilab
+cs_CZ.DescriptionXcos =Xcos
+cs_CZ.DescriptionParallel =Parallel Computing with Scilab
+cs_CZ.DescriptionModulesManager =Tools for management of extern modules
+cs_CZ.DescriptionModuleJVM =JVM Module
 ;
 cs_CZ.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ cs_CZ.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 cs_CZ.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-cs_CZ.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+cs_CZ.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-cs_CZ.DescriptionAssociateTstDem =Associate *.tst files with scilab
+cs_CZ.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-cs_CZ.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+cs_CZ.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-cs_CZ.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+cs_CZ.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-cs_CZ.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+cs_CZ.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 cs_CZ.DescriptionDefaultInstall =Installation (Default)
 cs_CZ.DescriptionFullInstall =Full installation
index 9645416..51af1e9 100644 (file)
@@ -16,9 +16,9 @@ de_DE.LANGUAGE =de_DE
 
 de_DE.MsgBoxJRENotFound =Java Runtime Environment not detected.
 de_DE.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-de_DE.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-de_DE.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-de_DE.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+de_DE.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+de_DE.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+de_DE.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 de_DE.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 de_DE.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -65,21 +65,21 @@ de_DE.DescriptionTclTK =TCL/TK in Scilab
 de_DE.DescriptionSpreadsheet =Spreadsheet Toolbox
 de_DE.DescriptionJVM =Java Runtime
 de_DE.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-de_DE.DescriptionFftwModule = FFTW interface for Scilab
-de_DE.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-de_DE.DescriptionRefFftwLibrary = Reference FFTW library
+de_DE.DescriptionFftwModule =FFTW interface for Scilab
+de_DE.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+de_DE.DescriptionRefFftwLibrary =Reference FFTW library
 de_DE.DescriptionParametersTlbx =Parameters Toolbox
 de_DE.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 de_DE.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 de_DE.DescriptionDevTools =Development Tools
 de_DE.DescriptionTests =Tests for Scilab
-de_DE.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-de_DE.DescriptionComConnector = COM connector
-de_DE.DescriptionSciNotes = SciNotes: Editor for Scilab
-de_DE.DescriptionXcos = XCos 1.1
-de_DE.DescriptionParallel = Parallel Computing with Scilab
-de_DE.DescriptionModulesManager = Tools for management of extern modules 
-de_DE.DescriptionModuleJVM = JVM Module
+de_DE.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+de_DE.DescriptionComConnector =COM connector
+de_DE.DescriptionSciNotes =SciNotes: Editor for Scilab
+de_DE.DescriptionXcos =Xcos
+de_DE.DescriptionParallel =Parallel Computing with Scilab
+de_DE.DescriptionModulesManager =Tools for management of extern modules
+de_DE.DescriptionModuleJVM =JVM Module
 ;
 de_DE.ConsoleIconName =Scilab Console
 ;
@@ -101,15 +101,15 @@ de_DE.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 de_DE.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-de_DE.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+de_DE.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-de_DE.DescriptionAssociateTstDem =Associate *.tst files with scilab
+de_DE.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-de_DE.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+de_DE.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-de_DE.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+de_DE.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-de_DE.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+de_DE.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 de_DE.DescriptionDefaultInstall =Installation (Default)
 de_DE.DescriptionFullInstall =Full installation
index 1ce6d93..e136175 100644 (file)
 ;
 ;-------------------------------------------------------------------------------
 
-en_US.LANGUAGE = en_US
+en_US.LANGUAGE =en_US
 
-en_US.MsgBoxJRENotFound = Java Runtime Environment not detected.
-en_US.MsgBoxJREURL = Please download & Install JRE at http://www.java.com/en/download/
-en_US.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-en_US.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-en_US.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+en_US.MsgBoxJRENotFound =Java Runtime Environment not detected.
+en_US.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
+en_US.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+en_US.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+en_US.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
-en_US.MsgBoxJavaDetection1 = Java is not installed on this computer and this program needs it.
-en_US.MsgBoxJavaDetection2 = Please choose to install Java Runtime:
-en_US.MsgBoxWebOpen = Can not open web page.
-en_US.MsgBoxDevToolsRequired1 = You choose to install toolbox_skeleton module but development_tools module is not selected.
-en_US.MsgBoxDevToolsRequired2 = Please install development_tools module.
-en_US.MsgBoxDevToolsRequired3 = You choose to install tests module but development_tools module is not selected.
-en_US.MsgBoxTclsciRequired2 = Please install tclsci module.
-en_US.MsgBoxFftw1 = You choose to install FFTW module for Scilab.
-en_US.MsgBoxFftw2 = This module requires to download FFTW library (GPL).
-en_US.MsgBoxFftw3 = Do you want to open a web page about this add-on ?
-en_US.MsgBoxFftw4 = Can not open web page.
-en_US.MsgBoxWinVer = Windows 2000 is required.
-en_US.MsgBoxScicosRequired1 = You choose to install Xcos module but Scicos module is not selected.
-en_US.MsgBoxScicosRequired2 = Please also install Scicos module.
+en_US.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
+en_US.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
+en_US.MsgBoxWebOpen =Can not open web page.
+en_US.MsgBoxDevToolsRequired1 =You choose to install toolbox_skeleton module but development_tools module is not selected.
+en_US.MsgBoxDevToolsRequired2 =Please install development_tools module.
+en_US.MsgBoxDevToolsRequired3 =You choose to install tests module but development_tools module is not selected.
+en_US.MsgBoxTclsciRequired2 =Please install tclsci module.
+en_US.MsgBoxFftw1 =You choose to install FFTW module for Scilab.
+en_US.MsgBoxFftw2 =This module requires to download FFTW library (GPL).
+en_US.MsgBoxFftw3 =Do you want to open a web page about this add-on ?
+en_US.MsgBoxFftw4 =Can not open web page.
+en_US.MsgBoxWinVer =Windows 2000 is required.
+en_US.MsgBoxScicosRequired1 =You choose to install Xcos module but Scicos module is not selected.
+en_US.MsgBoxScicosRequired2 =Please also install Scicos module.
 
 ;
-en_US.ButtonAboutModules = &About modules ...
+en_US.ButtonAboutModules =&About modules ...
 ;
-en_US.DescriptionGraphics = Graphics Module
-en_US.DescriptionTclTK = TCL/TK in Scilab
-en_US.DescriptionJVM = Java Runtime
-en_US.DescriptionAtlas = Atlas library 3.8.0 CPU optimized
-en_US.DescriptionFftwModule = FFTW interface for Scilab
-en_US.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-en_US.DescriptionRefFftwLibrary = Reference FFTW library
-en_US.DescriptionDevTools = Development Tools
-en_US.DescriptionTests = Tests for Scilab
-en_US.DescriptionTlbxSkeleton = A toolbox skeleton (to extend scilab)
-en_US.DescriptionSciNotes = Scinotes: Text editor for Scilab
-en_US.DescriptionXcos = Xcos
-en_US.DescriptionParallel = Parallel Computing with Scilab
-en_US.DescriptionModulesManager = Tools for management of extern modules
-en_US.DescriptionModuleJVM = Graphic User Interface
-en_US.DescriptionMPI = MPI ( based on Microsoft HPC Pack 2012 R2 )
+en_US.DescriptionGraphics =Graphics Module
+en_US.DescriptionTclTK =TCL/TK in Scilab
+en_US.DescriptionJVM =Java Runtime
+en_US.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
+en_US.DescriptionFftwModule =FFTW interface for Scilab
+en_US.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+en_US.DescriptionRefFftwLibrary =Reference FFTW library
+en_US.DescriptionDevTools =Development Tools
+en_US.DescriptionTests =Tests for Scilab
+en_US.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+en_US.DescriptionSciNotes =Scinotes: Text editor for Scilab
+en_US.DescriptionXcos =Xcos
+en_US.DescriptionParallel =Parallel Computing with Scilab
+en_US.DescriptionModulesManager =Tools for management of extern modules
+en_US.DescriptionModuleJVM =Graphic User Interface
+en_US.DescriptionMPI =MPI ( based on Microsoft HPC Pack 2012 R2 )
 ;
-en_US.ConsoleIconName = Scilab Console
+en_US.ConsoleIconName =Scilab Console
 ;
-en_US.WebIconScilab = Scilab on the Web
+en_US.WebIconScilab =Scilab on the Web
 ;
-en_US.ReadMeIcon = Read Me
+en_US.ReadMeIcon =Read Me
 ;
-en_US.UnInstallIcon = Uninstall Scilab
+en_US.UnInstallIcon =Uninstall Scilab
 ;
-en_US.RegKeyRunWith = Run with
+en_US.RegKeyRunWith =Run with
 ;
-en_US.DescriptionVC2008Redist = Install Microsoft Visual C++ 2008 Redistributable Package
+en_US.DescriptionVC2008Redist =Install Microsoft Visual C++ 2008 Redistributable Package
 ;
-en_US.DescriptionConfigureAtlas = Configure Atlas
+en_US.DescriptionConfigureAtlas =Configure Atlas
 ;
-en_US.DescriptionLaunchScilab = Launch Scilab
+en_US.DescriptionLaunchScilab =Launch Scilab
 ;
-en_US.DescriptionCreateDesktopIcon = Create a &desktop icon
+en_US.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
-en_US.DescriptionQuickLaunch = Create a shortcut in Quick Launch Bar
+en_US.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-en_US.DescriptionAssociateSceSci = Associate *.sce,*.sci files with scilab
+en_US.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-en_US.DescriptionAssociateTstDem = Associate *.tst files with scilab
+en_US.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-en_US.DescriptionAssociateBinSav = Associate *.bin, *.sav files with scilab
+en_US.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-en_US.DescriptionAssociateGraph = Associate *.graph *.graphb files with scilab
+en_US.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-en_US.DescriptionAssociateScicos = Associate *.xcos *.cos *.cosf *.zcos files with scilab
+en_US.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf *.zcos files with Scilab
 ;
-en_US.DescriptionAssociateSOD = Associate *.sod files with scilab
+en_US.DescriptionAssociateSOD =Associate *.sod files with Scilab
 ;
-en_US.DescriptionDefaultInstall = Installation (Default)
-en_US.DescriptionFullInstall = Full installation
-en_US.DescriptionCustomInstall = Custom installation
-en_US.DescriptionCLIInstall = Command Line Installation (no gui)
+en_US.DescriptionDefaultInstall =Installation (Default)
+en_US.DescriptionFullInstall =Full installation
+en_US.DescriptionCustomInstall =Custom installation
+en_US.DescriptionCLIInstall =Command Line Installation (no gui)
 ;
-en_US.DescriptionCPUOptimization = CPU Optimization for Scilab
-en_US.DescriptionATLASLibrary = Atlas Library for Scilab
-en_US.DescriptionRefBlasLibrary = Blas, Lapack Reference libraries for Scilab
-en_US.DescriptionMKLLibrary = Download Intel Math Kernel Library for Scilab
+en_US.DescriptionCPUOptimization =CPU Optimization for Scilab
+en_US.DescriptionATLASLibrary =Atlas Library for Scilab
+en_US.DescriptionRefBlasLibrary =Blas, Lapack Reference libraries for Scilab
+en_US.DescriptionMKLLibrary =Download Intel Math Kernel Library for Scilab
 ;
-en_US.DownloadMKLLabel = Downloading Intel Math Kernel Library files for Scilab
-en_US.DownloadMKLDescription = Please wait while Setup is downloading extra files to your computer.
+en_US.DownloadMKLLabel =Downloading Intel Math Kernel Library files for Scilab
+en_US.DownloadMKLDescription =Please wait while Setup is downloading extra files to your computer.
 ;
-en_US.DownloadMKLFFTWLabel = Downloading FFTW3 library optimized by Intel Math Kernel.
+en_US.DownloadMKLFFTWLabel =Downloading FFTW3 library optimized by Intel Math Kernel.
 ;
-en_US.DoTasksJustAfterInstallMsg2 = BLAS, LAPACK reference libraries will be installed and used.
-en_US.DoTasksJustAfterInstallMsg3 = FFTW3 reference library will be installed and used.
+en_US.DoTasksJustAfterInstallMsg2 =BLAS, LAPACK reference libraries will be installed and used.
+en_US.DoTasksJustAfterInstallMsg3 =FFTW3 reference library will be installed and used.
 ;
-en_US.NextButtonClickwpReadyMsg1 = Impossible to download Intel Math Kernel Library files for Scilab (Default library will be used).
-en_US.NextButtonClickwpReadyMsg2 = Impossible to download FFTW3 library optimized by Intel Math Kernel Library (Default library will be used).
+en_US.NextButtonClickwpReadyMsg1 =Impossible to download Intel Math Kernel Library files for Scilab (Default library will be used).
+en_US.NextButtonClickwpReadyMsg2 =Impossible to download FFTW3 library optimized by Intel Math Kernel Library (Default library will be used).
 ;-------------------------------------------------------------------------------
 ;
index 3dd4aac..452925a 100644 (file)
@@ -17,9 +17,9 @@ es_ES.LANGUAGE =es_ES
 
 es_ES.MsgBoxJRENotFound =Java Runtime Environment not detected.
 es_ES.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-es_ES.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-es_ES.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-es_ES.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+es_ES.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+es_ES.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+es_ES.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 es_ES.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 es_ES.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ es_ES.DescriptionTclTK =TCL/TK in Scilab
 es_ES.DescriptionSpreadsheet =Spreadsheet Toolbox
 es_ES.DescriptionJVM =Java Runtime
 es_ES.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-es_ES.DescriptionFftwModule = FFTW interface for Scilab
-es_ES.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-es_ES.DescriptionRefFftwLibrary = Reference FFTW library
+es_ES.DescriptionFftwModule =FFTW interface for Scilab
+es_ES.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+es_ES.DescriptionRefFftwLibrary =Reference FFTW library
 es_ES.DescriptionParametersTlbx =Parameters Toolbox
 es_ES.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 es_ES.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 es_ES.DescriptionDevTools =Development Tools
 es_ES.DescriptionTests =Tests for Scilab
-es_ES.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-es_ES.DescriptionComConnector = COM connector
-es_ES.DescriptionSciNotes = SciNotes: Editor for Scilab
-es_ES.DescriptionXcos = XCos 1.1
-es_ES.DescriptionParallel = Parallel Computing with Scilab
-es_ES.DescriptionModulesManager = Tools for management of extern modules 
-es_ES.DescriptionModuleJVM = JVM Module
+es_ES.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+es_ES.DescriptionComConnector =COM connector
+es_ES.DescriptionSciNotes =SciNotes: Editor for Scilab
+es_ES.DescriptionXcos =Xcos
+es_ES.DescriptionParallel =Parallel Computing with Scilab
+es_ES.DescriptionModulesManager =Tools for management of extern modules
+es_ES.DescriptionModuleJVM =JVM Module
 ;
 es_ES.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ es_ES.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 es_ES.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-es_ES.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+es_ES.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-es_ES.DescriptionAssociateTstDem =Associate *.tst files with scilab
+es_ES.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-es_ES.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+es_ES.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-es_ES.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+es_ES.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-es_ES.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+es_ES.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 es_ES.DescriptionDefaultInstall =Installation (Default)
 es_ES.DescriptionFullInstall =Full installation
index 9d03f0a..d9966fe 100644 (file)
 ;
 ;-------------------------------------------------------------------------------
 
-fr_FR.LANGUAGE = fr_FR
+fr_FR.LANGUAGE =fr_FR
 
-fr_FR.MsgBoxJRENotFound = Java Runtime Environment non détecté.
-fr_FR.MsgBoxJREURL = Veuillez télécharger et installer le JRE (http://www.java.com/fr/download/)
-fr_FR.MsgBoxJREReinstall = Relancer l'installation de Scilab après l'installation du JRE.
-fr_FR.MsgBoxSSERequired = Les instructions CPU SSE2 sont requises pour faire fonctionner.
-fr_FR.MsgBoxX64Ready = Pour de meilleurs performances, il serait mieux d'utiliser la version 64 bits de Scilab sur ce système d'exploitation.
+fr_FR.MsgBoxJRENotFound =Java Runtime Environment non détecté.
+fr_FR.MsgBoxJREURL =Veuillez télécharger et installer le JRE (http://www.java.com/fr/download/)
+fr_FR.MsgBoxJREReinstall =Relancer l'installation de Scilab après l'installation du JRE.
+fr_FR.MsgBoxSSERequired =Les instructions CPU SSE2 sont requises pour faire fonctionner.
+fr_FR.MsgBoxX64Ready =Pour de meilleurs performances, il serait mieux d'utiliser la version 64 bits de Scilab sur ce système d'exploitation.
 
-fr_FR.MsgBoxJavaDetection1 = Java n'est pas installé correctement sur cet ordinateur.
-fr_FR.MsgBoxJavaDetection2 = Veuillez sélectionner & installer Java Runtime :
-fr_FR.MsgBoxWebOpen = Impossible d'ouvrir cette page internet.
-fr_FR.MsgBoxDevToolsRequired1 = Vous avez choisi d'installer le module toolbox_skeleton mais vous n'avez pas sélectionné le module development_tools.
-fr_FR.MsgBoxDevToolsRequired2 = Veuillez installer le module development_tools.
-fr_FR.MsgBoxDevToolsRequired3 = Vous avez choisi d'installer les tests mais vous n'avez pas sélectionné le module development_tools.
-fr_FR.MsgBoxTclsciRequired2 = Veuillez installer le module tclsci.
-fr_FR.MsgBoxFftw1 = Vous avez choisi d'installer le module FFTW pour Scilab.
-fr_FR.MsgBoxFftw2 = Il est nécessaire de télécharger la bibliothèque FFTW (GPL).
-fr_FR.MsgBoxFftw3 = Voulez-vous ouvrir une page web concernant cet add-on ?
-fr_FR.MsgBoxFftw4 = Impossible d'accéder à cette page web.
-fr_FR.MsgBoxWinVer = Nécessite Windows 2000 ou plus.
-fr_FR.MsgBoxScicosRequired1 = Vous avez choisi d'installer le module Xcos mais vous n'avez pas sélectionné le module Scicos.
-fr_FR.MsgBoxScicosRequired2 = Veuillez également installer le module Scicos.
+fr_FR.MsgBoxJavaDetection1 =Java n'est pas installé correctement sur cet ordinateur.
+fr_FR.MsgBoxJavaDetection2 =Veuillez sélectionner & installer Java Runtime :
+fr_FR.MsgBoxWebOpen =Impossible d'ouvrir cette page internet.
+fr_FR.MsgBoxDevToolsRequired1 =Vous avez choisi d'installer le module toolbox_skeleton mais vous n'avez pas sélectionné le module development_tools.
+fr_FR.MsgBoxDevToolsRequired2 =Veuillez installer le module development_tools.
+fr_FR.MsgBoxDevToolsRequired3 =Vous avez choisi d'installer les tests mais vous n'avez pas sélectionné le module development_tools.
+fr_FR.MsgBoxTclsciRequired2 =Veuillez installer le module tclsci.
+fr_FR.MsgBoxFftw1 =Vous avez choisi d'installer le module FFTW pour Scilab.
+fr_FR.MsgBoxFftw2 =Il est nécessaire de télécharger la bibliothèque FFTW (GPL).
+fr_FR.MsgBoxFftw3 =Voulez-vous ouvrir une page web concernant cet add-on ?
+fr_FR.MsgBoxFftw4 =Impossible d'accéder à cette page web.
+fr_FR.MsgBoxWinVer =Nécessite Windows 2000 ou plus.
+fr_FR.MsgBoxScicosRequired1 =Vous avez choisi d'installer le module Xcos mais vous n'avez pas sélectionné le module Scicos.
+fr_FR.MsgBoxScicosRequired2 =Veuillez également installer le module Scicos.
 
 ;
-fr_FR.ButtonAboutModules = &A propos des modules ...
+fr_FR.ButtonAboutModules =&A propos des modules ...
 ;
-fr_FR.DescriptionGraphics = Module Graphique
-fr_FR.DescriptionTclTK = TCL/TK pour Scilab
-fr_FR.DescriptionJVM = Java Runtime
-fr_FR.DescriptionAtlas = Bibliothèque Atlas 3.8.0 optimisée selon le CPU
-fr_FR.DescriptionFftwModule = Interface avec la bibliothèque FFTW3 pour Scilab
-fr_FR.DescriptionFftwMKLDownload = Télécharger la bibliothèque FFTW3 optimisée par Intel Math Kernel Library
-fr_FR.DescriptionRefFftwLibrary = Bibliothèque FFTW3 de référence
-fr_FR.DescriptionDevTools = Outils pour le Développement
-fr_FR.DescriptionTests = Tests pour Scilab
-fr_FR.DescriptionTlbxSkeleton = Un modèle de boite à outils (pour étendre scilab)
-fr_FR.DescriptionSciNotes = Scinotes : Éditeur de texte pour Scilab
-fr_FR.DescriptionXcos = Xcos
-fr_FR.DescriptionModulesManager = Outils pour créer des modules externes
-fr_FR.DescriptionModuleJVM = Interface graphique
-fr_FR.DescriptionMPI = MPI ( basé sur Microsoft HPC Pack 2012 R2 )
+fr_FR.DescriptionGraphics =Module Graphique
+fr_FR.DescriptionTclTK =TCL/TK pour Scilab
+fr_FR.DescriptionJVM =Java Runtime
+fr_FR.DescriptionAtlas =Bibliothèque Atlas 3.8.0 optimisée selon le CPU
+fr_FR.DescriptionFftwModule =Interface avec la bibliothèque FFTW3 pour Scilab
+fr_FR.DescriptionFftwMKLDownload =Télécharger la bibliothèque FFTW3 optimisée par Intel Math Kernel Library
+fr_FR.DescriptionRefFftwLibrary =Bibliothèque FFTW3 de référence
+fr_FR.DescriptionDevTools =Outils pour le Développement
+fr_FR.DescriptionTests =Tests pour Scilab
+fr_FR.DescriptionTlbxSkeleton =Un modèle de boite à outils (pour étendre Scilab)
+fr_FR.DescriptionSciNotes =Scinotes : Éditeur de texte pour Scilab
+fr_FR.DescriptionXcos =Xcos
+fr_FR.DescriptionModulesManager =Outils pour créer des modules externes
+fr_FR.DescriptionModuleJVM =Interface graphique
+fr_FR.DescriptionMPI =MPI ( basé sur Microsoft HPC Pack 2012 R2 )
 ;
-fr_FR.ConsoleIconName = Console Scilab
+fr_FR.ConsoleIconName =Console Scilab
 ;
-fr_FR.WebIconScilab = Site Internet Scilab
+fr_FR.WebIconScilab =Site Internet Scilab
 ;
-fr_FR.ReadMeIcon = Lisez Moi
+fr_FR.ReadMeIcon =Lisez Moi
 ;
-fr_FR.UnInstallIcon = Désinstaller Scilab
+fr_FR.UnInstallIcon =Désinstaller Scilab
 ;
-fr_FR.RegKeyRunWith = Exécuter avec
+fr_FR.RegKeyRunWith =Exécuter avec
 ;
-fr_FR.DescriptionVC2008Redist = Installer Microsoft Visual C++ 2008 Redistributable Package
+fr_FR.DescriptionVC2008Redist =Installer Microsoft Visual C++ 2008 Redistributable Package
 ;
-fr_FR.DescriptionConfigureAtlas = Configurer Atlas
+fr_FR.DescriptionConfigureAtlas =Configurer Atlas
 ;
-fr_FR.DescriptionLaunchScilab = Démarrer Scilab
+fr_FR.DescriptionLaunchScilab =Démarrer Scilab
 ;
-fr_FR.DescriptionCreateDesktopIcon = Créer un icône sur le bureau
+fr_FR.DescriptionCreateDesktopIcon =Créer un icône sur le bureau
 ;
-fr_FR.DescriptionQuickLaunch = Créer un raccourci dans la barre d'exécution rapide
+fr_FR.DescriptionQuickLaunch =Créer un raccourci dans la barre d'exécution rapide
 ;
-fr_FR.DescriptionAssociateSceSci = Associer les fichiers *.sce, *.sci avec Scilab
+fr_FR.DescriptionAssociateSceSci =Associer les fichiers *.sce, *.sci avec Scilab
 ;
-fr_FR.DescriptionAssociateTstDem = Associer les fichiers *.tst avec Scilab
+fr_FR.DescriptionAssociateTstDem =Associer les fichiers *.tst avec Scilab
 ;
-fr_FR.DescriptionAssociateBinSav = Associer les fichiers *.bin, *.sav avec Scilab
+fr_FR.DescriptionAssociateBinSav =Associer les fichiers *.bin, *.sav avec Scilab
 ;
-fr_FR.DescriptionAssociateGraph = Associer les fichiers *.graph *.graphb avec Scilab
+fr_FR.DescriptionAssociateGraph =Associer les fichiers *.graph *.graphb avec Scilab
 ;
-fr_FR.DescriptionAssociateScicos = Associer les fichiers *.xcos *.cos *.cosf *.zcos avec Scilab
+fr_FR.DescriptionAssociateScicos =Associer les fichiers *.xcos *.cos *.cosf *.zcos avec Scilab
 ;
-fr_FR.DescriptionAssociateSOD = Associer les fichiers *.sod avec scilab
+fr_FR.DescriptionAssociateSOD =Associer les fichiers *.sod avec Scilab
 ;
-fr_FR.DescriptionDefaultInstall = Installation (Par défaut)
-fr_FR.DescriptionFullInstall = Installation Complète
-fr_FR.DescriptionCustomInstall = Installation avancée
-fr_FR.DescriptionCLIInstall = Ligne de commandes uniquement (sans interface graphique)
+fr_FR.DescriptionDefaultInstall =Installation (Par défaut)
+fr_FR.DescriptionFullInstall =Installation Complète
+fr_FR.DescriptionCustomInstall =Installation avancée
+fr_FR.DescriptionCLIInstall =Ligne de commandes uniquement (sans interface graphique)
 ;
-fr_FR.DescriptionCPUOptimization = Optimisation CPU pour Scilab
-fr_FR.DescriptionATLASLibrary = Bibliothèque Atlas pour Scilab
-fr_FR.DescriptionRefBlasLibrary = Bibliothèque Blas, Lapack de référence pour Scilab
-fr_FR.DescriptionMKLLibrary = Télécharger la bibliothèque Intel Math Kernel Library pour Scilab
+fr_FR.DescriptionCPUOptimization =Optimisation CPU pour Scilab
+fr_FR.DescriptionATLASLibrary =Bibliothèque Atlas pour Scilab
+fr_FR.DescriptionRefBlasLibrary =Bibliothèque Blas, Lapack de référence pour Scilab
+fr_FR.DescriptionMKLLibrary =Télécharger la bibliothèque Intel Math Kernel Library pour Scilab
 ;
-fr_FR.DownloadMKLLabel = Téléchargement des fichiers Intel Math Kernel Library pour Scilab
-fr_FR.DownloadMKLDescription = Merci de patienter durant le téléchargement de fichiers.
+fr_FR.DownloadMKLLabel =Téléchargement des fichiers Intel Math Kernel Library pour Scilab
+fr_FR.DownloadMKLDescription =Merci de patienter durant le téléchargement de fichiers.
 ;
-fr_FR.DownloadMKLFFTWLabel = Téléchargement de la bibliothèque FFTW3 optimisée par Intel Math Kernel Library.
+fr_FR.DownloadMKLFFTWLabel =Téléchargement de la bibliothèque FFTW3 optimisée par Intel Math Kernel Library.
 ;
-fr_FR.DoTasksJustAfterInstallMsg2 = Les bibliothèques de référence BLAS, LAPACK seront installées et utilisées.
-fr_FR.DoTasksJustAfterInstallMsg3 = La bibliothèque de référence FFTW3 sera installée et utilisée.
+fr_FR.DoTasksJustAfterInstallMsg2 =Les bibliothèques de référence BLAS, LAPACK seront installées et utilisées.
+fr_FR.DoTasksJustAfterInstallMsg3 =La bibliothèque de référence FFTW3 sera installée et utilisée.
 ;
-fr_FR.NextButtonClickwpReadyMsg1 = Impossible de télécharger la bibliothèque Intel Math Kernel pour Scilab (La bibliothèque par défaut sera utilisée).
-fr_FR.NextButtonClickwpReadyMsg2 = Impossible de télécharger la bibliothèque FFTW3 optimisée par Intel Math Kernel Library (La bibliothèque par défaut sera utilisée).
+fr_FR.NextButtonClickwpReadyMsg1 =Impossible de télécharger la bibliothèque Intel Math Kernel pour Scilab (La bibliothèque par défaut sera utilisée).
+fr_FR.NextButtonClickwpReadyMsg2 =Impossible de télécharger la bibliothèque FFTW3 optimisée par Intel Math Kernel Library (La bibliothèque par défaut sera utilisée).
 ;-------------------------------------------------------------------------------
 ;
index 5554e0d..c8fe1ec 100644 (file)
@@ -17,9 +17,9 @@ it_IT.LANGUAGE =it_IT
 
 it_IT.MsgBoxJRENotFound =Java Runtime Environment not detected.
 it_IT.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-it_IT.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-it_IT.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-it_IT.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+it_IT.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+it_IT.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+it_IT.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 it_IT.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 it_IT.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ it_IT.DescriptionTclTK =TCL/TK in Scilab
 it_IT.DescriptionSpreadsheet =Spreadsheet Toolbox
 it_IT.DescriptionJVM =Java Runtime
 it_IT.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-it_IT.DescriptionFftwModule = FFTW interface for Scilab
-it_IT.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-it_IT.DescriptionRefFftwLibrary = Reference FFTW library
+it_IT.DescriptionFftwModule =FFTW interface for Scilab
+it_IT.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+it_IT.DescriptionRefFftwLibrary =Reference FFTW library
 it_IT.DescriptionParametersTlbx =Parameters Toolbox
 it_IT.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 it_IT.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 it_IT.DescriptionDevTools =Development Tools
 it_IT.DescriptionTests =Tests for Scilab
-it_IT.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-it_IT.DescriptionComConnector = COM connector
-it_IT.DescriptionSciNotes = SciNotes: Editor for Scilab
-it_IT.DescriptionXcos = XCos 1.1
-it_IT.DescriptionParallel = Parallel Computing with Scilab
-it_IT.DescriptionModulesManager = Tools for management of extern modules 
-it_IT.DescriptionModuleJVM = JVM Module
+it_IT.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+it_IT.DescriptionComConnector =COM connector
+it_IT.DescriptionSciNotes =SciNotes: Editor for Scilab
+it_IT.DescriptionXcos =Xcos
+it_IT.DescriptionParallel =Parallel Computing with Scilab
+it_IT.DescriptionModulesManager =Tools for management of extern modules
+it_IT.DescriptionModuleJVM =JVM Module
 ;
 it_IT.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ it_IT.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 it_IT.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-it_IT.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+it_IT.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-it_IT.DescriptionAssociateTstDem =Associate *.tst files with scilab
+it_IT.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-it_IT.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+it_IT.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-it_IT.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+it_IT.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-it_IT.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+it_IT.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 it_IT.DescriptionDefaultInstall =Installation (Default)
 it_IT.DescriptionFullInstall =Full installation
index a051447..d52d132 100644 (file)
@@ -17,9 +17,9 @@ ja_JP.LANGUAGE =ja_JP
 
 ja_JP.MsgBoxJRENotFound =Java Runtime Environment not detected.
 ja_JP.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/ja_JP/download/
-ja_JP.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-ja_JP.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-ja_JP.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+ja_JP.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+ja_JP.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+ja_JP.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 ja_JP.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 ja_JP.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ ja_JP.DescriptionTclTK =TCL/TK in Scilab
 ja_JP.DescriptionSpreadsheet =Spreadsheet Toolbox
 ja_JP.DescriptionJVM =Java Runtime
 ja_JP.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-ja_JP.DescriptionFftwModule = FFTW interface for Scilab
-ja_JP.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-ja_JP.DescriptionRefFftwLibrary = Reference FFTW library
+ja_JP.DescriptionFftwModule =FFTW interface for Scilab
+ja_JP.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+ja_JP.DescriptionRefFftwLibrary =Reference FFTW library
 ja_JP.DescriptionParametersTlbx =Parameters Toolbox
 ja_JP.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 ja_JP.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 ja_JP.DescriptionDevTools =Development Tools
 ja_JP.DescriptionTests =Tests for Scilab
-ja_JP.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-ja_JP.DescriptionComConnector = COM connector
-ja_JP.DescriptionSciNotes = SciNotes: Editor for Scilab
-ja_JP.DescriptionXcos = XCos 1.1
-ja_JP.DescriptionParallel = Parallel Computing with Scilab
-ja_JP.DescriptionModulesManager = Tools for management of extern modules 
-ja_JP.DescriptionModuleJVM = JVM Module
+ja_JP.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+ja_JP.DescriptionComConnector =COM connector
+ja_JP.DescriptionSciNotes =SciNotes: Editor for Scilab
+ja_JP.DescriptionXcos =Xcos
+ja_JP.DescriptionParallel =Parallel Computing with Scilab
+ja_JP.DescriptionModulesManager =Tools for management of extern modules
+ja_JP.DescriptionModuleJVM =JVM Module
 ;
 ja_JP.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ ja_JP.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 ja_JP.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-ja_JP.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+ja_JP.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-ja_JP.DescriptionAssociateTstDem =Associate *.tst files with scilab
+ja_JP.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-ja_JP.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+ja_JP.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-ja_JP.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+ja_JP.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-ja_JP.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+ja_JP.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 ja_JP.DescriptionDefaultInstall =Installation (Default)
 ja_JP.DescriptionFullInstall =Full installation
index 67791e0..9e0aa40 100644 (file)
@@ -17,9 +17,9 @@ pl_PL.LANGUAGE =pl_PL
 
 pl_PL.MsgBoxJRENotFound =Java Runtime Environment not detected.
 pl_PL.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-pl_PL.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-pl_PL.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-pl_PL.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+pl_PL.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+pl_PL.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+pl_PL.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 pl_PL.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 pl_PL.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ pl_PL.DescriptionTclTK =TCL/TK in Scilab
 pl_PL.DescriptionSpreadsheet =Spreadsheet Toolbox
 pl_PL.DescriptionJVM =Java Runtime
 pl_PL.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-pl_PL.DescriptionFftwModule = FFTW interface for Scilab
-pl_PL.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-pl_PL.DescriptionRefFftwLibrary = Reference FFTW library
+pl_PL.DescriptionFftwModule =FFTW interface for Scilab
+pl_PL.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+pl_PL.DescriptionRefFftwLibrary =Reference FFTW library
 pl_PL.DescriptionParametersTlbx =Parameters Toolbox
 pl_PL.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 pl_PL.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 pl_PL.DescriptionDevTools =Development Tools
 pl_PL.DescriptionTests =Tests for Scilab
-pl_PL.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-pl_PL.DescriptionComConnector = COM connector
-pl_PL.DescriptionSciNotes = SciNotes: Editor for Scilab
-pl_PL.DescriptionXcos = XCos 1.1
-pl_PL.DescriptionParallel = Parallel Computing with Scilab
-pl_PL.DescriptionModulesManager = Tools for management of extern modules 
-pl_PL.DescriptionModuleJVM = JVM Module
+pl_PL.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+pl_PL.DescriptionComConnector =COM connector
+pl_PL.DescriptionSciNotes =SciNotes: Editor for Scilab
+pl_PL.DescriptionXcos =Xcos
+pl_PL.DescriptionParallel =Parallel Computing with Scilab
+pl_PL.DescriptionModulesManager =Tools for management of extern modules
+pl_PL.DescriptionModuleJVM =JVM Module
 ;
 pl_PL.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ pl_PL.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 pl_PL.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-pl_PL.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+pl_PL.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-pl_PL.DescriptionAssociateTstDem =Associate *.tst files with scilab
+pl_PL.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-pl_PL.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+pl_PL.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-pl_PL.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+pl_PL.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-pl_PL.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+pl_PL.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 pl_PL.DescriptionDefaultInstall =Installation (Default)
 pl_PL.DescriptionFullInstall =Full installation
index 99dc757..f4e5cc6 100644 (file)
@@ -16,9 +16,9 @@ pt_BR.LANGUAGE =pt_BR
 
 pt_BR.MsgBoxJRENotFound =Java Runtime Environment not detected.
 pt_BR.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-pt_BR.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-pt_BR.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-pt_BR.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+pt_BR.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+pt_BR.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+pt_BR.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 pt_BR.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 pt_BR.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -65,21 +65,21 @@ pt_BR.DescriptionTclTK =TCL/TK in Scilab
 pt_BR.DescriptionSpreadsheet =Spreadsheet Toolbox
 pt_BR.DescriptionJVM =Java Runtime
 pt_BR.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-pt_BR.DescriptionFftwModule = FFTW interface for Scilab
-pt_BR.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-pt_BR.DescriptionRefFftwLibrary = Reference FFTW library
+pt_BR.DescriptionFftwModule =FFTW interface for Scilab
+pt_BR.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+pt_BR.DescriptionRefFftwLibrary =Reference FFTW library
 pt_BR.DescriptionParametersTlbx =Parameters Toolbox
 pt_BR.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 pt_BR.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 pt_BR.DescriptionDevTools =Development Tools
 pt_BR.DescriptionTests =Tests for Scilab
-pt_BR.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-pt_BR.DescriptionComConnector = COM connector
-pt_BR.DescriptionSciNotes = SciNotes: Editor for Scilab
-pt_BR.DescriptionXcos = XCos 1.1
-pt_BR.DescriptionParallel = Parallel Computing with Scilab
-pt_BR.DescriptionModulesManager = Tools for management of extern modules 
-pt_BR.DescriptionModuleJVM = JVM Module
+pt_BR.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+pt_BR.DescriptionComConnector =COM connector
+pt_BR.DescriptionSciNotes =SciNotes: Editor for Scilab
+pt_BR.DescriptionXcos =Xcos
+pt_BR.DescriptionParallel =Parallel Computing with Scilab
+pt_BR.DescriptionModulesManager =Tools for management of extern modules
+pt_BR.DescriptionModuleJVM =JVM Module
 ;
 pt_BR.ConsoleIconName =Scilab Console
 ;
@@ -101,15 +101,15 @@ pt_BR.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 pt_BR.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-pt_BR.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+pt_BR.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-pt_BR.DescriptionAssociateTstDem =Associate *.tst files with scilab
+pt_BR.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-pt_BR.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+pt_BR.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-pt_BR.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+pt_BR.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-pt_BR.DescriptionAssociateScicos =Associate *.cos *.cosf files with scilab
+pt_BR.DescriptionAssociateScicos =Associate *.cos *.cosf files with Scilab
 ;
 pt_BR.DescriptionDefaultInstall =Installation (Default)
 pt_BR.DescriptionFullInstall =Full installation
index a8980b8..ce55cc7 100644 (file)
@@ -17,9 +17,9 @@ ru_RU.LANGUAGE =ru_RU
 
 ru_RU.MsgBoxJRENotFound =Java Runtime Environment not detected.
 ru_RU.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/ru/download/
-ru_RU.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-ru_RU.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-ru_RU.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+ru_RU.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+ru_RU.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+ru_RU.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 ru_RU.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 ru_RU.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ ru_RU.DescriptionTclTK =TCL/TK in Scilab
 ru_RU.DescriptionSpreadsheet =Spreadsheet Toolbox
 ru_RU.DescriptionJVM =Java Runtime
 ru_RU.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-ru_RU.DescriptionFftwModule = FFTW interface for Scilab
-ru_RU.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-ru_RU.DescriptionRefFftwLibrary = Reference FFTW library
+ru_RU.DescriptionFftwModule =FFTW interface for Scilab
+ru_RU.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+ru_RU.DescriptionRefFftwLibrary =Reference FFTW library
 ru_RU.DescriptionParametersTlbx =Parameters Toolbox
 ru_RU.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 ru_RU.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 ru_RU.DescriptionDevTools =Development Tools
 ru_RU.DescriptionTests =Tests for Scilab
-ru_RU.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-ru_RU.DescriptionComConnector = COM connector
-ru_RU.DescriptionSciNotes = SciNotes: Editor for Scilab
-ru_RU.DescriptionXcos = XCos 1.1
-ru_RU.DescriptionParallel = Parallel Computing with Scilab
-ru_RU.DescriptionModulesManager = Tools for management of extern modules 
-ru_RU.DescriptionModuleJVM = JVM Module
+ru_RU.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+ru_RU.DescriptionComConnector =COM connector
+ru_RU.DescriptionSciNotes =SciNotes: Editor for Scilab
+ru_RU.DescriptionXcos =Xcos
+ru_RU.DescriptionParallel =Parallel Computing with Scilab
+ru_RU.DescriptionModulesManager =Tools for management of extern modules
+ru_RU.DescriptionModuleJVM =JVM Module
 ;
 ru_RU.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ ru_RU.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 ru_RU.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-ru_RU.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+ru_RU.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-ru_RU.DescriptionAssociateTstDem =Associate *.tst files with scilab
+ru_RU.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-ru_RU.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+ru_RU.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-ru_RU.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+ru_RU.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-ru_RU.DescriptionAssociateScicos =Associate *.cos *.cosf files with scilab
+ru_RU.DescriptionAssociateScicos =Associate *.cos *.cosf files with Scilab
 ;
 ru_RU.DescriptionDefaultInstall =Installation (Default)
 ru_RU.DescriptionFullInstall =Full installation
index 683bd10..19a42e2 100644 (file)
@@ -17,9 +17,9 @@ uk_UA.LANGUAGE =uk_UA
 
 uk_UA.MsgBoxJRENotFound =Java Runtime Environment not detected.
 uk_UA.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-uk_UA.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-uk_UA.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-uk_UA.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+uk_UA.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+uk_UA.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+uk_UA.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 uk_UA.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 uk_UA.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ uk_UA.DescriptionTclTK =TCL/TK in Scilab
 uk_UA.DescriptionSpreadsheet =Spreadsheet Toolbox
 uk_UA.DescriptionJVM =Java Runtime
 uk_UA.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-uk_UA.DescriptionFftwModule = FFTW interface for Scilab
-uk_UA.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-uk_UA.DescriptionRefFftwLibrary = Reference FFTW library
+uk_UA.DescriptionFftwModule =FFTW interface for Scilab
+uk_UA.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+uk_UA.DescriptionRefFftwLibrary =Reference FFTW library
 uk_UA.DescriptionParametersTlbx =Parameters Toolbox
 uk_UA.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 uk_UA.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 uk_UA.DescriptionDevTools =Development Tools
 uk_UA.DescriptionTests =Tests for Scilab
-uk_UA.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-uk_UA.DescriptionComConnector = COM connector
-uk_UA.DescriptionSciNotes = SciNotes: Editor for Scilab
-uk_UA.DescriptionXcos = XCos 1.1
-uk_UA.DescriptionParallel = Parallel Computing with Scilab
-uk_UA.DescriptionModulesManager = Tools for management of extern modules 
-uk_UA.DescriptionModuleJVM = JVM Module
+uk_UA.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+uk_UA.DescriptionComConnector =COM connector
+uk_UA.DescriptionSciNotes =SciNotes: Editor for Scilab
+uk_UA.DescriptionXcos =Xcos
+uk_UA.DescriptionParallel =Parallel Computing with Scilab
+uk_UA.DescriptionModulesManager =Tools for management of extern modules
+uk_UA.DescriptionModuleJVM =JVM Module
 ;
 uk_UA.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ uk_UA.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 uk_UA.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-uk_UA.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+uk_UA.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-uk_UA.DescriptionAssociateTstDem =Associate *.tst files with scilab
+uk_UA.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-uk_UA.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+uk_UA.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-uk_UA.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+uk_UA.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-uk_UA.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+uk_UA.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 uk_UA.DescriptionDefaultInstall =Installation (Default)
 uk_UA.DescriptionFullInstall =Full installation
index d02a17a..ca382f4 100644 (file)
@@ -16,9 +16,9 @@ zh_CN.LANGUAGE =zh_CN
 
 zh_CN.MsgBoxJRENotFound =Java Runtime Environment not detected.
 zh_CN.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/zh_CN/download/
-zh_CN.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-zh_CN.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-zh_CN.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+zh_CN.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+zh_CN.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+zh_CN.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 zh_CN.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 zh_CN.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -65,21 +65,21 @@ zh_CN.DescriptionTclTK =TCL/TK in Scilab
 zh_CN.DescriptionSpreadsheet =Spreadsheet Toolbox
 zh_CN.DescriptionJVM =Java Runtime
 zh_CN.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-zh_CN.DescriptionFftwModule = FFTW interface for Scilab
-zh_CN.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-zh_CN.DescriptionRefFftwLibrary = Reference FFTW library
+zh_CN.DescriptionFftwModule =FFTW interface for Scilab
+zh_CN.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+zh_CN.DescriptionRefFftwLibrary =Reference FFTW library
 zh_CN.DescriptionParametersTlbx =Parameters Toolbox
 zh_CN.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 zh_CN.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 zh_CN.DescriptionDevTools =Development Tools
 zh_CN.DescriptionTests =Tests for Scilab
-zh_CN.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-zh_CN.DescriptionComConnector = COM connector
-zh_CN.DescriptionSciNotes = SciNotes: Editor for Scilab
-zh_CN.DescriptionXcos = XCos 1.1
-zh_CN.DescriptionParallel = Parallel Computing with Scilab
-zh_CN.DescriptionModulesManager = Tools for management of extern modules 
-zh_CN.DescriptionModuleJVM = JVM Module
+zh_CN.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+zh_CN.DescriptionComConnector =COM connector
+zh_CN.DescriptionSciNotes =SciNotes: Editor for Scilab
+zh_CN.DescriptionXcos =Xcos
+zh_CN.DescriptionParallel =Parallel Computing with Scilab
+zh_CN.DescriptionModulesManager =Tools for management of extern modules
+zh_CN.DescriptionModuleJVM =JVM Module
 ;
 zh_CN.ConsoleIconName =Scilab Console
 ;
@@ -101,15 +101,15 @@ zh_CN.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 zh_CN.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-zh_CN.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+zh_CN.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-zh_CN.DescriptionAssociateTstDem =Associate *.tst files with scilab
+zh_CN.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-zh_CN.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+zh_CN.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-zh_CN.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+zh_CN.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-zh_CN.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+zh_CN.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 zh_CN.DescriptionDefaultInstall =Installation (Default)
 zh_CN.DescriptionFullInstall =Full installation
index ea56c64..b3f7443 100644 (file)
@@ -17,9 +17,9 @@ zh_TW.LANGUAGE =zh_TW
 
 zh_TW.MsgBoxJRENotFound =Java Runtime Environment not detected.
 zh_TW.MsgBoxJREURL =Please download & Install JRE at http://www.java.com/en/download/
-zh_TW.MsgBoxJREReinstall = Reinstall Scilab after your JRE update.
-zh_TW.MsgBoxSSERequired = CPU SSE2 instructions are required for Scilab to run correctly.
-zh_TW.MsgBoxX64Ready = For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
+zh_TW.MsgBoxJREReinstall =Reinstall Scilab after your JRE update.
+zh_TW.MsgBoxSSERequired =CPU SSE2 instructions are required for Scilab to run correctly.
+zh_TW.MsgBoxX64Ready =For increase performance, it will be better to use Scilab x64 bits version on this Operating system.
 
 zh_TW.MsgBoxJavaDetection1 =Java is not installed on this computer and this program needs it.
 zh_TW.MsgBoxJavaDetection2 =Please choose to install Java Runtime:
@@ -66,21 +66,21 @@ zh_TW.DescriptionTclTK =TCL/TK in Scilab
 zh_TW.DescriptionSpreadsheet =Spreadsheet Toolbox
 zh_TW.DescriptionJVM =Java Runtime
 zh_TW.DescriptionAtlas =Atlas library 3.8.0 CPU optimized
-zh_TW.DescriptionFftwModule = FFTW interface for Scilab
-zh_TW.DescriptionFftwMKLDownload = Download FFTW library optimized by Intel Math Kernel Library
-zh_TW.DescriptionRefFftwLibrary = Reference FFTW library
+zh_TW.DescriptionFftwModule =FFTW interface for Scilab
+zh_TW.DescriptionFftwMKLDownload =Download FFTW library optimized by Intel Math Kernel Library
+zh_TW.DescriptionRefFftwLibrary =Reference FFTW library
 zh_TW.DescriptionParametersTlbx =Parameters Toolbox
 zh_TW.DescriptionGeneticTlbx =Genetic Algorithms Toolbox
 zh_TW.DescriptionSimulAnnealingTlbx =Simulated Annealing Toolbox
 zh_TW.DescriptionDevTools =Development Tools
 zh_TW.DescriptionTests =Tests for Scilab
-zh_TW.DescriptionTlbxSkeleton =A toolbox skeleton (to extend scilab)
-zh_TW.DescriptionComConnector = COM connector
-zh_TW.DescriptionSciNotes = SciNotes: Editor for Scilab
-zh_TW.DescriptionXcos = XCos 1.1
-zh_TW.DescriptionParallel = Parallel Computing with Scilab
-zh_TW.DescriptionModulesManager = Tools for management of extern modules 
-zh_TW.DescriptionModuleJVM = JVM Module
+zh_TW.DescriptionTlbxSkeleton =A toolbox skeleton (to extend Scilab)
+zh_TW.DescriptionComConnector =COM connector
+zh_TW.DescriptionSciNotes =SciNotes: Editor for Scilab
+zh_TW.DescriptionXcos =Xcos
+zh_TW.DescriptionParallel =Parallel Computing with Scilab
+zh_TW.DescriptionModulesManager =Tools for management of extern modules
+zh_TW.DescriptionModuleJVM =JVM Module
 ;
 zh_TW.ConsoleIconName =Scilab Console
 ;
@@ -102,15 +102,15 @@ zh_TW.DescriptionCreateDesktopIcon =Create a &desktop icon
 ;
 zh_TW.DescriptionQuickLaunch =Create a shortcut in Quick Launch Bar
 ;
-zh_TW.DescriptionAssociateSceSci =Associate *.sce,*.sci files with scilab
+zh_TW.DescriptionAssociateSceSci =Associate *.sce,*.sci files with Scilab
 ;
-zh_TW.DescriptionAssociateTstDem =Associate *.tst files with scilab
+zh_TW.DescriptionAssociateTstDem =Associate *.tst files with Scilab
 ;
-zh_TW.DescriptionAssociateBinSav =Associate *.bin, *.sav files with scilab
+zh_TW.DescriptionAssociateBinSav =Associate *.bin, *.sav files with Scilab
 ;
-zh_TW.DescriptionAssociateGraph =Associate *.graph *.graphb files with scilab
+zh_TW.DescriptionAssociateGraph =Associate *.graph *.graphb files with Scilab
 ;
-zh_TW.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with scilab
+zh_TW.DescriptionAssociateScicos =Associate *.xcos *.cos *.cosf files with Scilab
 ;
 zh_TW.DescriptionDefaultInstall =Installation (Default)
 zh_TW.DescriptionFullInstall =Full installation