Merge remote-tracking branch 'refs/remotes/origin/master' into YaSp 42/5942/2
Allan CORNET [Mon, 16 Jan 2012 15:59:19 +0000 (16:59 +0100)]
Conflicts:
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/console/sci_gateway/c/sci_lines.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/dynamic_gateways.c
scilab/modules/core/src/c/dynamic_gateways.h
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/helptools/data/pages/homepage-en_US.html
scilab/modules/helptools/data/pages/homepage-fr_FR.html
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/src/c/LibScilab_Import.def
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_browser/src/c/history_browser.vcxproj.filters
scilab/modules/io/includes/gw_io.h
scilab/modules/libscilab-cli/Makefile.am
scilab/modules/libscilab-cli/Makefile.in
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java
scilab/modules/types/src/jni/getScilabVariable.i
scilab/modules/ui_data/src/java/ui_data-JAVA.vcxproj

Change-Id: Id3705d91a589742c47f35fb10e1c3307e09f5cc9

32 files changed:
1  2 
scilab/Makefile.am
scilab/Makefile.in
scilab/configure
scilab/configure.ac
scilab/etc/classpath.xml.vc
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/src/java/action_binding-JAVA.vcxproj
scilab/modules/commons/src/java/commons-JAVA.vcxproj
scilab/modules/completion/src/java/completion-JAVA.vcxproj
scilab/modules/console/src/java/console-JAVA.vcxproj
scilab/modules/core/src/java/core-JAVA.vcxproj
scilab/modules/graph/src/java/graph-JAVA.vcxproj
scilab/modules/graphic_export/src/java/graphic_export-JAVA.vcxproj
scilab/modules/graphics/graphics.iss
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/src/java/gui-JAVA.vcxproj
scilab/modules/hdf5/src/java/hdf5-JAVA.vcxproj
scilab/modules/helptools/src/java/helptools-JAVA.vcxproj
scilab/modules/history_browser/history_browser.iss
scilab/modules/history_browser/includes/CommandHistory_Wrap.h
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
scilab/modules/history_browser/src/java/history_browser-JAVA.vcxproj
scilab/modules/history_browser/src/nohistory_browser/CommandHistory_Wrap_Fake.c
scilab/modules/javasci/src/java/javasci-JAVA.vcxproj
scilab/modules/jvm/src/java/jvm-JAVA.vcxproj
scilab/modules/localization/src/java/localization-JAVA.vcxproj
scilab/modules/renderer/src/java/renderer-JAVA.vcxproj
scilab/modules/scinotes/src/java/scinotes-JAVA.vcxproj
scilab/modules/types/src/java/types-JAVA.vcxproj
scilab/modules/xcos/src/java/xcos-JAVA.vcxproj

@@@ -45,49 -45,16 +45,48 @@@ scilab_bin_CFLAGS          = -I$(top_srcdir)/m
  # (causing issues on some platform)
  COMMON_LIBS = $(LTLIBINTL)
  
 -scilab_bin_SOURCES            = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +SCILAB_LIB=$(top_builddir)/modules/libscilab.la
- SCILAB_CLI_LIB=$(top_builddir)/modules/libscilab-cli/libscilab-cli.la
 +
 +COMMON_CPPFLAGS = \
 +    -I$(top_srcdir)/modules/console/includes/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +    -I$(top_srcdir)/modules/parse/includes/ \
 +    -I$(top_srcdir)/modules/ast/includes/ \
 +    -I$(top_srcdir)/modules/symbol/includes/ \
 +    -I$(top_srcdir)/modules/functions_manager/includes/ \
 +    -I$(top_srcdir)/modules/types/includes/ \
 +    -I$(top_srcdir)/modules/system_env/includes/ \
 +    -I$(top_srcdir)/modules/operations/includes/ \
 +    -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +    -I$(top_srcdir)/modules/fileio/includes/ \
 +    -I$(top_srcdir)/modules/string/includes/ \
 +    -I$(top_srcdir)/modules/history_manager/includes/ \
 +    -I$(top_srcdir)/modules/threads/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes/ \
 +    -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
 +    $(EIGEN_CPPFLAGS)
 +
 +scilab_bin_SOURCES = \
 +    $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +    $(top_srcdir)/modules/core/src/cpp/tasks.cpp
 +
 +if IS_MACOSX
 +scilab_bin_SOURCES            +=  $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +endif
  
- scilab_bin_LDADD              = $(COMMON_LIBS) $(SCILAB_LIB) $(FLIBS)
+ scilab_bin_LDADD              = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
  
 +scilab_bin_CPPFLAGS           = $(COMMON_CPPFLAGS)
 +
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES        = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +
 +scilab_cli_bin_SOURCES        =       $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +                                                      $(top_srcdir)/modules/core/src/cpp/tasks.cpp
  
  scilab_cli_bin_CFLAGS                 = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
- scilab_cli_bin_LDADD          = $(COMMON_LIBS) $(SCILAB_CLI_LIB) $(FLIBS)
+ scilab_cli_bin_LDADD          = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
  
 +scilab_cli_bin_CPPFLAGS       = -DWITHOUT_GUI $(COMMON_CPPFLAGS)
  
  if NEED_JAVA
  # Don't do it for scilab_cli_bin. We want to be able to call it without
@@@ -205,27 -198,22 +205,27 @@@ am_scilab_bin_OBJECTS = scilab_bin-scil
  scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
  am__DEPENDENCIES_1 =
  am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB) \
-       $(am__DEPENDENCIES_1)
+ scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+       $(top_builddir)/modules/libscilab.la $(am__DEPENDENCIES_1)
 -scilab_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_bin_CFLAGS) \
 -      $(CFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 -am_scilab_cli_bin_OBJECTS = scilab_cli_bin-mainscic.$(OBJEXT)
 +scilab_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 +am_scilab_cli_bin_OBJECTS = scilab_cli_bin-scilab.$(OBJEXT) \
 +      scilab_cli_bin-tasks.$(OBJEXT)
  scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
- scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB) \
-       $(am__DEPENDENCIES_1)
+ scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+       $(top_builddir)/modules/libscilab-cli.la $(am__DEPENDENCIES_1)
 -scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \
 -      $(CFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
 +scilab_cli_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
  am__scilab_static_bin_SOURCES_DIST =  \
 -      $(top_srcdir)/modules/console/src/c/others/mainscic.c
 -am__objects_1 = scilab_static_bin-mainscic.$(OBJEXT)
 -@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_1)
 +      $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
 +      $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +@IS_MACOSX_TRUE@am__objects_2 =  \
 +@IS_MACOSX_TRUE@      scilab_static_bin-initMacOSXEnv.$(OBJEXT)
 +am__objects_3 = scilab.$(OBJEXT) tasks.$(OBJEXT) $(am__objects_2)
 +@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_3)
  scilab_static_bin_OBJECTS = $(am_scilab_static_bin_OBJECTS)
  @ENABLE_STATIC_TRUE@scilab_static_bin_DEPENDENCIES =  \
  @ENABLE_STATIC_TRUE@  $(top_builddir)/modules/libscilab.la
@@@ -624,39 -597,13 +624,38 @@@ scilab_bin_CFLAGS = -I$(top_srcdir)/mod
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
  # (causing issues on some platform)
  COMMON_LIBS = $(LTLIBINTL)
 -scilab_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +SCILAB_LIB = $(top_builddir)/modules/libscilab.la
- SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli/libscilab-cli.la
 +COMMON_CPPFLAGS = \
 +    -I$(top_srcdir)/modules/console/includes/ \
 +      -I$(top_srcdir)/modules/output_stream/includes/ \
 +    -I$(top_srcdir)/modules/parse/includes/ \
 +    -I$(top_srcdir)/modules/ast/includes/ \
 +    -I$(top_srcdir)/modules/symbol/includes/ \
 +    -I$(top_srcdir)/modules/functions_manager/includes/ \
 +    -I$(top_srcdir)/modules/types/includes/ \
 +    -I$(top_srcdir)/modules/system_env/includes/ \
 +    -I$(top_srcdir)/modules/operations/includes/ \
 +    -I$(top_srcdir)/modules/elementary_functions/includes/ \
 +    -I$(top_srcdir)/modules/fileio/includes/ \
 +    -I$(top_srcdir)/modules/string/includes/ \
 +    -I$(top_srcdir)/modules/history_manager/includes/ \
 +    -I$(top_srcdir)/modules/threads/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes/ \
 +    -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
 +    $(EIGEN_CPPFLAGS)
 +
 +scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp $(am__append_3)
- scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB) $(FLIBS)
+ scilab_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab.la $(FLIBS)
 +scilab_bin_CPPFLAGS = $(COMMON_CPPFLAGS)
  
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES = $(top_srcdir)/modules/console/src/c/others/mainscic.c
 +scilab_cli_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +                                                      $(top_srcdir)/modules/core/src/cpp/tasks.cpp
 +
  scilab_cli_bin_CFLAGS = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes
- scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB) $(FLIBS)
+ scilab_cli_bin_LDADD = $(COMMON_LIBS) $(top_builddir)/modules/libscilab-cli.la $(FLIBS)
 +scilab_cli_bin_CPPFLAGS = -DWITHOUT_GUI $(COMMON_CPPFLAGS)
  @ENABLE_STATIC_TRUE@scilab_static_bin_LDFLAGS = -static -static-libgcc --start-group
  @ENABLE_STATIC_TRUE@scilab_static_bin_CFLAGS = -Wl,--start-group `$(CXX) -print-file-name=libstdc++.a`
  @ENABLE_STATIC_TRUE@scilab_static_bin_LDADD = $(top_builddir)/modules/libscilab.la
@@@ -12593,7 -12190,7 +12589,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12596 "configure"
 -// #line 12193 "configure"
++// #line 12592 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -12687,7 -12284,7 +12683,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12690 "configure"
 -// #line 12287 "configure"
++// #line 12686 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12741 "configure"
 -// #line 12338 "configure"
++// #line 12737 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -12815,7 -12408,7 +12807,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12818 "configure"
 -// #line 12411 "configure"
++// #line 12810 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -12968,7 -12561,7 +12960,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12971 "configure"
 -// #line 12564 "configure"
++// #line 12963 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 13026 "configure"
 -// #line 12619 "configure"
++// #line 13018 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
@@@ -13107,7 -12696,7 +13095,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13110 "configure"
 -// #line 12699 "configure"
++// #line 13098 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -13201,7 -12790,7 +13189,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 13204 "configure"
 -// #line 12793 "configure"
++// #line 13192 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 13255 "configure"
 -// #line 12844 "configure"
++// #line 13243 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
@@@ -13325,7 -12910,7 +13309,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13328 "configure"
 -// #line 12913 "configure"
++// #line 13312 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13432,7 -13013,7 +13412,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13435 "configure"
 -// #line 13016 "configure"
++// #line 13415 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13540,7 -13117,7 +13516,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13543 "configure"
 -// #line 13120 "configure"
++// #line 13519 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -13647,7 -13220,7 +13619,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13650 "configure"
 -// #line 13223 "configure"
++// #line 13622 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -13861,7 -13430,7 +13829,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13864 "configure"
 -// #line 13433 "configure"
++// #line 13832 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -14024,7 -13589,7 +13988,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14027 "configure"
 -// #line 13592 "configure"
++// #line 13991 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -14131,7 -13692,7 +14091,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14134 "configure"
 -// #line 13695 "configure"
++// #line 14094 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -14239,7 -13796,7 +14195,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14242 "configure"
 -// #line 13799 "configure"
++// #line 14198 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -14344,7 -13897,7 +14296,7 @@@ $as_echo_n "checking jrosetta-api... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14347 "configure"
 -// #line 13900 "configure"
++// #line 14299 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -14452,7 -14001,7 +14400,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14455 "configure"
 -// #line 14004 "configure"
++// #line 14403 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -14545,7 -14094,7 +14493,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14548 "configure"
 -// #line 14097 "configure"
++// #line 14496 "configure"
  import com.artenum.rosetta.util.ConfigurationBuilder;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14599 "configure"
 -// #line 14148 "configure"
++// #line 14547 "configure"
  import com.artenum.rosetta.util.ConfigurationBuilder;
  
  public class conftest {
@@@ -14671,7 -14216,7 +14615,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14674 "configure"
 -// #line 14219 "configure"
++// #line 14618 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -14780,7 -14321,7 +14720,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14783 "configure"
 -// #line 14324 "configure"
++// #line 14723 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -14887,7 -14424,7 +14823,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14890 "configure"
 -// #line 14427 "configure"
++// #line 14826 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14994,7 -14527,7 +14926,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14997 "configure"
 -// #line 14530 "configure"
++// #line 14929 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -15088,7 -14621,7 +15020,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15091 "configure"
 -// #line 14624 "configure"
++// #line 15023 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 15142 "configure"
 -// #line 14675 "configure"
++// #line 15074 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -15212,7 -14741,7 +15140,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15215 "configure"
 -// #line 14744 "configure"
++// #line 15143 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -15319,7 -14844,7 +15243,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15322 "configure"
 -// #line 14847 "configure"
++// #line 15246 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -15426,7 -14947,7 +15346,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15429 "configure"
 -// #line 14950 "configure"
++// #line 15349 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -15533,7 -15050,7 +15449,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15536 "configure"
 -// #line 15053 "configure"
++// #line 15452 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15640,7 -15153,7 +15552,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15643 "configure"
 -// #line 15156 "configure"
++// #line 15555 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15751,7 -15260,7 +15659,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15754 "configure"
 -// #line 15263 "configure"
++// #line 15662 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -15858,7 -15363,7 +15762,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15861 "configure"
 -// #line 15366 "configure"
++// #line 15765 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15952,7 -15457,7 +15856,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15955 "configure"
 -// #line 15460 "configure"
++// #line 15859 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 16006 "configure"
 -// #line 15511 "configure"
++// #line 15910 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -16082,7 -15583,7 +15982,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16085 "configure"
 -// #line 15586 "configure"
++// #line 15985 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -16189,7 -15686,7 +16085,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16192 "configure"
 -// #line 15689 "configure"
++// #line 16088 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -16296,7 -15789,7 +16188,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16299 "configure"
 -// #line 15792 "configure"
++// #line 16191 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -16403,7 -15892,7 +16291,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16406 "configure"
 -// #line 15895 "configure"
++// #line 16294 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -16510,7 -15995,7 +16394,7 @@@ $as_echo_n "checking beust-jcommander..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16513 "configure"
 -// #line 15998 "configure"
++// #line 16397 "configure"
  import com.beust.jcommander.JCommander;
  
  public class conftest {
@@@ -16617,7 -16098,7 +16497,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16620 "configure"
 -// #line 16101 "configure"
++// #line 16500 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -16724,7 -16201,7 +16600,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16727 "configure"
 -// #line 16204 "configure"
++// #line 16603 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -16831,7 -16304,7 +16703,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16834 "configure"
 -// #line 16307 "configure"
++// #line 16706 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -24900,7 -24167,7 +24772,7 @@@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_
  { $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 24903 "configure"
 -#line 24170 "configure"
++#line 24775 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -25210,7 -24477,7 +25082,7 @@@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CH
  $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
  
  cat > conftest.$ac_ext <<EOF
- #line 25213 "configure"
 -#line 24480 "configure"
++#line 25085 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -25791,7 -25054,7 +25659,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25794 "configure"
 -// #line 25057 "configure"
++// #line 25662 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25898,7 -25157,7 +25762,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25901 "configure"
 -// #line 25160 "configure"
++// #line 25765 "configure"
  import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
  
  public class conftest {
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 32207 "configure"
 -#line 31466 "configure"
++#line 32071 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
- #line 32313 "configure"
 -#line 31572 "configure"
++#line 32177 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -38758,7 -38012,7 +38622,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/libscilab-cli/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/operations/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
Simple merge
Simple merge
@@@ -97,9 -86,8 +97,9 @@@ modules_manager 
  ui_data \
  history_browser \
  xml \
- types \
- libscilab-cli
+ types
 +
  if XCOS
  SUBDIRS += scicos_blocks
  endif
@@@ -197,23 -182,11 +197,24 @@@ ENGINE_LIBS =   $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 +      $(top_builddir)/modules/threads/libscithreads.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
 -    $(top_builddir)/modules/statistics/libscistatistics.la \
 -    $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 -      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 +      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
 +      $(top_builddir)/modules/matio/libscimatio.la \
 +      $(top_builddir)/modules/operations/libscioperations.la \
 +      $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 +      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
 +      $(top_builddir)/modules/statistics/libscistatistics.la \
-       $(top_builddir)/modules/xml/libscixml.la
++      $(top_builddir)/modules/xml/libscixml.la \
++      $(top_builddir)/modules/types/libscitypes.la
  
  # These libraries are loaded dynamically from Scilab.
  ENGINE_LIBS_DYNAMIC_LOAD = \
@@@ -247,11 -220,15 +248,14 @@@ libscilab_la_LIBADD += $(NO_GUI_LIBS
  endif
  
  # Core modules
 -libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS) $(top_builddir)/modules/types/libscitypes.la $(top_builddir)/modules/libscilab-cli.la
 -
++libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS) $(top_builddir)/modules/types/libscitypes-java.la $(top_builddir)/modules/libscilab-cli.la
  
- libscilab_la_LIBADD += $(OTHER_LIBS) $(EXTERNAL_LIBS)
+ ################## libscilab-cli  ##################
  
- libscilab_la_LIBADD += $(top_builddir)/modules/libscilab-cli/libscilab-cli.la
- if ENABLE_STATIC
- libscilab_la_LIBADD += $(ALL_LIBS)
+ libscilab_cli_la_SOURCES =
+ libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
+ # Core modules
+ libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
  
- endif
@@@ -109,12 -108,16 +108,17 @@@ am__base_list = 
    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
  am__installdirs = "$(DESTDIR)$(pkglibdir)"
  LTLIBRARIES = $(pkglib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libscilab_la_DEPENDENCIES =  \
-       $(top_builddir)/modules/libscilab-cli/libscilab-cli.la \
-       $(am__append_5) $(am__append_6) $(EXTERNAL_LIBS) \
-       $(top_builddir)/modules/libscilab-cli/libscilab-cli.la \
-       $(am__DEPENDENCIES_1)
+ libscilab_cli_la_DEPENDENCIES = $(ENGINE_LIBS) $(NO_GUI_LIBS) \
+       $(EXTERNAL_LIBS)
+ am_libscilab_cli_la_OBJECTS =
+ libscilab_cli_la_OBJECTS = $(am_libscilab_cli_la_OBJECTS)
+ libscilab_cli_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+       $(libscilab_cli_la_LDFLAGS) $(LDFLAGS) -o $@
+ libscilab_la_DEPENDENCIES = $(am__append_5) $(am__append_6) \
 -      $(EXTERNAL_LIBS) $(top_builddir)/modules/types/libscitypes.la \
++      $(EXTERNAL_LIBS) \
++      $(top_builddir)/modules/types/libscitypes-java.la \
+       $(top_builddir)/modules/libscilab-cli.la
  am_libscilab_la_OBJECTS =
  libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
  libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@@ -146,21 -149,20 +150,21 @@@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARG
        distdir
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = prebuildjava fileio mexlib functions parameters boolean \
 -      cacsd signal_processing core call_scilab api_scilab \
 -      data_structures differential_equations double \
 -      elementary_functions integer intersci io linear_algebra \
 -      localization polynomials special_functions time windows_tools \
 -      sparse completion history_manager output_stream string hdf5 \
 -      fftw statistics dynamic_link console arnoldi spreadsheet \
 -      tclsci commons jvm action_binding renderer graphic_export gui \
 -      graphics optimization symbolic randlib interpolation sound \
 -      overloading m2sci development_tools compatibility_functions \
 -      helptools umfpack demo_tools genetic_algorithms \
 -      simulated_annealing matio atoms graph xcos scinotes parallel \
 -      modules_manager ui_data history_browser xml types \
 -      scicos_blocks scicos . javasci
 +DIST_SUBDIRS = prebuildjava threads operations output_stream arnoldi \
 +      elementary_functions functions_manager fileio mexlib functions \
 +      parameters boolean cacsd signal_processing core call_scilab \
 +      api_scilab data_structures differential_equations double \
 +      integer intersci io linear_algebra localization polynomials \
 +      special_functions time windows_tools sparse completion \
 +      history_manager string hdf5 fftw statistics dynamic_link \
 +      console spreadsheet tclsci commons jvm action_binding renderer \
 +      graphic_export gui graphics optimization symbolic randlib \
 +      interpolation sound overloading m2sci development_tools \
 +      compatibility_functions helptools umfpack demo_tools \
 +      genetic_algorithms simulated_annealing matio atoms graph xcos \
 +      system_env ast symbol parse scinotes parallel modules_manager \
-       ui_data history_browser xml types libscilab-cli scicos_blocks \
-       scicos . javasci
++      ui_data history_browser xml types scicos_blocks scicos . \
++      javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -457,10 -451,9 +461,10 @@@ SUBDIRS = prebuildjava threads operatio
        graphics optimization symbolic randlib interpolation sound \
        overloading m2sci development_tools compatibility_functions \
        helptools umfpack demo_tools genetic_algorithms \
 -      simulated_annealing matio atoms hdf5 graph xcos scinotes \
 -      parallel modules_manager ui_data history_browser xml types \
 -      $(am__append_1) scicos . $(am__append_2)
 +      simulated_annealing parameters matio atoms hdf5 graph xcos \
 +      system_env ast symbol parse scinotes parallel modules_manager \
-       ui_data history_browser xml types libscilab-cli \
-       $(am__append_1) scicos . $(am__append_2)
++      ui_data history_browser xml types $(am__append_1) scicos . \
++      $(am__append_2)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
@@@ -533,23 -523,11 +537,24 @@@ ENGINE_LIBS = $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 +      $(top_builddir)/modules/threads/libscithreads.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
 +      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/parallel/libsciparallel.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
 -    $(top_builddir)/modules/statistics/libscistatistics.la \
 -    $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 -      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 +      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
 +      $(top_builddir)/modules/matio/libscimatio.la \
 +      $(top_builddir)/modules/operations/libscioperations.la \
 +      $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 +      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
 +      $(top_builddir)/modules/statistics/libscistatistics.la \
-       $(top_builddir)/modules/xml/libscixml.la
++      $(top_builddir)/modules/xml/libscixml.la \
++      $(top_builddir)/modules/types/libscitypes.la
  
  
  # These libraries are loaded dynamically from Scilab.
@@@ -576,11 -554,16 +581,17 @@@ ENGINE_LIBS_DYNAMIC_LOAD = 
  #libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
  
  # Core modules
- libscilab_la_LIBADD =  \
-       $(top_builddir)/modules/libscilab-cli/libscilab-cli.la \
-       $(am__append_5) $(am__append_6) $(OTHER_LIBS) $(EXTERNAL_LIBS) \
-       $(top_builddir)/modules/libscilab-cli/libscilab-cli.la \
-       $(am__append_7)
+ libscilab_la_LIBADD = $(am__append_5) $(am__append_6) $(OTHER_LIBS) \
 -      $(EXTERNAL_LIBS) $(top_builddir)/modules/types/libscitypes.la \
++      $(EXTERNAL_LIBS) \
++      $(top_builddir)/modules/types/libscitypes-java.la \
+       $(top_builddir)/modules/libscilab-cli.la
+ ################## libscilab-cli  ##################
+ libscilab_cli_la_SOURCES = 
+ libscilab_cli_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS) -lstdc++
+ # Core modules
+ libscilab_cli_la_LIBADD = $(ENGINE_LIBS) $(NO_GUI_LIBS) $(OTHER_LIBS) $(EXTERNAL_LIBS)
  all: all-recursive
  
  .SUFFIXES:
@@@ -162,12 -162,11 +162,6 @@@ call ant clea
      <None Include="org\scilab\modules\action_binding\InterpreterManagement.java" />
      <None Include="org\scilab\modules\action_binding\InterpreterManagementJNI.java" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\action_binding.vcxproj">
 -      <Project>{8a654cc5-22c1-4972-a8cf-1b89f78b5383}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -153,12 -153,11 +153,6 @@@ call ant clea
    <ItemGroup>
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\commons.vcxproj">
 -      <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -167,12 -167,11 +167,6 @@@ call ant clea
      <None Include="org\scilab\modules\completion\CompletionJNI.java" />
      <None Include="..\..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\completion.vcxproj">
 -      <Project>{ccce1ead-8e62-4dc0-ab17-972c06ef0c89}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -198,28 -198,11 +198,6 @@@ call ant clea
      <None Include="org\scilab\modules\console\ValidationAction.java" />
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\action_binding\src\java\action_binding-JAVA.vcxproj">
-       <Project>{b2911268-79e2-4fe5-ad59-2c3cb7cb794e}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\commons\src\java\commons-JAVA.vcxproj">
-       <Project>{9188fa91-e039-485d-af1d-781cea92f541}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\completion\src\java\completion-JAVA.vcxproj">
-       <Project>{b5e4d0c2-8c6a-4437-81bf-dbfa95900c9d}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\history_manager\src\java\history_manager-JAVA.vcxproj">
-       <Project>{63965a84-e354-4cbc-bfac-fdfc8224573f}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\console.vcxproj">
 -      <Project>{445d3b85-c9b1-498b-9c88-0a3c2390b1cc}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -166,20 -166,11 +166,6 @@@ call ant clea
      <None Include="org\scilab\modules\core\Scilab.java" />
      <None Include="..\..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\gui\src\java\gui-JAVA.vcxproj">
-       <Project>{f01c26e3-e409-4e74-ba84-c7c4a71a7fdc}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\jvm\src\java\jvm-JAVA.vcxproj">
-       <Project>{e9783492-017e-4811-9cc7-6b71856f847c}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\core.vcxproj">
 -      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -165,16 -165,11 +165,6 @@@ call ant clea
    <ItemGroup>
      <None Include="..\..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\renderer\src\java\renderer-JAVA.vcxproj">
-       <Project>{4235a847-ed0e-43a3-b62b-e59cb857ede9}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\..\graphic_export.vcxproj">
 -      <Project>{5ad5654b-b2ee-4b84-81fc-f6a4c1073d96}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
Simple merge
Simple merge
Simple merge
@@@ -314,28 -314,11 +314,6 @@@ call ant clea
      <None Include="org\scilab\modules\gui\window\Window.java" />
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\console\src\java\console-JAVA.vcxproj">
-       <Project>{251d7c8f-9b69-4ce9-959e-57f343ddc883}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\graphic_export\src\java\graphic_export-JAVA.vcxproj">
-       <Project>{3e4ef47f-2284-4b43-abbb-20593ff0b51d}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\jvm\src\java\jvm-JAVA.vcxproj">
-       <Project>{e9783492-017e-4811-9cc7-6b71856f847c}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\renderer\src\java\renderer-JAVA.vcxproj">
-       <Project>{4235a847-ed0e-43a3-b62b-e59cb857ede9}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\gui.vcxproj">
 -      <Project>{45ca5b12-7601-4968-ae16-16069fd1a152}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -161,12 -161,11 +161,6 @@@ call ant clea
    <ItemGroup>
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\types\src\java\types-JAVA.vcxproj">
-       <Project>{abcb724e-8534-4420-ac12-7c33a606aba3}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\hdf5.vcxproj">
 -      <Project>{a824ea62-af07-4f43-9036-0e63990556bd}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -163,12 -163,11 +163,6 @@@ call ant clea
      <None Include="org\scilab\modules\helptools\HelpViewer.java" />
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\jvm\src\java\jvm-JAVA.vcxproj">
-       <Project>{e9783492-017e-4811-9cc7-6b71856f847c}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\helptools.vcxproj">
 -      <Project>{bed4a0f2-5129-487f-9f94-ec09480f04d7}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -172,12 -172,12 +172,6 @@@ call ant clea
      <None Include="javasci\SciStringArray.java" />
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
--    <ProjectReference Include="..\..\Javasci.vcxproj">
--      <Project>{0bd503ef-5cb6-4277-bac4-8955c97f247d}</Project>
--      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--    </ProjectReference>
--  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -168,16 -168,11 +168,6 @@@ call ant clea
      <None Include="org\scilab\modules\jvm\Scilab.java" />
      <None Include="..\..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\renderer\src\java\renderer-JAVA.vcxproj">
-       <Project>{4235a847-ed0e-43a3-b62b-e59cb857ede9}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\..\libjvm.vcxproj">
 -      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -162,12 -162,12 +162,6 @@@ call ant clea
      <None Include="..\..\build.xml" />
      <None Include="org\scilab\modules\localization\Messages.java" />
    </ItemGroup>
--  <ItemGroup>
--    <ProjectReference Include="..\localization.vcxproj">
--      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
--      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
--    </ProjectReference>
--  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -165,12 -165,11 +165,6 @@@ call ant clea
    <ItemGroup>
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\..\renderer.vcxproj">
 -      <Project>{b23b01c1-a545-4ba0-9950-7bcade201c5b}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -155,27 -155,11 +155,6 @@@ call ant clea
      <None Include="org\scilab\modules\scinotes\ScilabKeywordsJNI.java" />
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\action_binding\src\java\action_binding-JAVA.vcxproj">
-       <Project>{b2911268-79e2-4fe5-ad59-2c3cb7cb794e}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\core\src\java\core-JAVA.vcxproj">
-       <Project>{78d8b862-964a-4d0e-93d2-ca8a25ba1207}</Project>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\gui\src\java\gui-JAVA.vcxproj">
-       <Project>{f01c26e3-e409-4e74-ba84-c7c4a71a7fdc}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\helptools\src\java\helptools-JAVA.vcxproj">
-       <Project>{899decf1-d4dc-4c84-bb3c-3a343401a5b4}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\scinotes.vcxproj">
 -      <Project>{bae68b54-2c1a-44d0-a0e9-05156a784e79}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -161,16 -161,11 +161,6 @@@ call ant clea
    <ItemGroup>
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\jvm\src\java\jvm-JAVA.vcxproj">
-       <Project>{e9783492-017e-4811-9cc7-6b71856f847c}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\localization\src\java\localization-JAVA.vcxproj">
-       <Project>{fba3bc3f-8a2c-4d47-a50d-eb808be42f43}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\..\types.vcxproj">
 -      <Project>{626b9142-13a1-4765-a072-fb08952e7bb8}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
@@@ -157,24 -157,11 +157,6 @@@ call ant clea
    <ItemGroup>
      <None Include="..\..\build.xml" />
    </ItemGroup>
--  <ItemGroup>
-     <ProjectReference Include="..\..\..\graph\src\java\graph-JAVA.vcxproj">
-       <Project>{968fd6c1-5845-4b22-b61e-f6de987d47ad}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\hdf5\src\java\hdf5-JAVA.vcxproj">
-       <Project>{9b6500b0-66f6-44f0-910d-47a1435b4e02}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\jvm\src\java\jvm-JAVA.vcxproj">
-       <Project>{e9783492-017e-4811-9cc7-6b71856f847c}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-     <ProjectReference Include="..\..\..\types\src\java\types-JAVA.vcxproj">
-       <Project>{abcb724e-8534-4420-ac12-7c33a606aba3}</Project>
-       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-     </ProjectReference>
-   </ItemGroup>
 -    <ProjectReference Include="..\c\xcos.vcxproj">
 -      <Project>{494fa8c9-6c85-4175-be4c-9a113c7a3278}</Project>
 -    </ProjectReference>
 -  </ItemGroup>
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>