Merge remote branch 'origin/sas' into YaSp 71/1371/1
Bruno JOFRET [Mon, 19 Jul 2010 13:48:29 +0000 (15:48 +0200)]
Conflicts:
scilab/Makefile.in
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/api_scilab/api_scilab.vcproj
scilab/modules/api_scilab/includes/api_string.h
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/console.vcproj
scilab/modules/core/Makefile.in
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/src/c/SCIHOME.c
scilab/modules/core/src/c/callDynamicGateway.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/storeCommand.c
scilab/modules/core/src/c/tmpdir.c
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/double/src/c/LibScilab_Import.def
scilab/modules/double/src/c/double.vcproj
scilab/modules/double/src/c/double_Export.def
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/includes/vfinite.h
scilab/modules/elementary_functions/macros/dec2bin.sci
scilab/modules/elementary_functions/macros/dec2oct.sci
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_abs.c
scilab/modules/elementary_functions/sci_gateway/c/sci_acos.c
scilab/modules/elementary_functions/sci_gateway/c/sci_asin.c
scilab/modules/elementary_functions/sci_gateway/c/sci_atan.c
scilab/modules/elementary_functions/sci_gateway/c/sci_ceil.c
scilab/modules/elementary_functions/sci_gateway/c/sci_clean.c
scilab/modules/elementary_functions/sci_gateway/c/sci_conj.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cos.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cumprod.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cumsum.c
scilab/modules/elementary_functions/sci_gateway/c/sci_diag.c
scilab/modules/elementary_functions/sci_gateway/c/sci_dsearch.c
scilab/modules/elementary_functions/sci_gateway/c/sci_exp.c
scilab/modules/elementary_functions/sci_gateway/c/sci_expm.c
scilab/modules/elementary_functions/sci_gateway/c/sci_eye.c
scilab/modules/elementary_functions/sci_gateway/c/sci_floor.c
scilab/modules/elementary_functions/sci_gateway/c/sci_frexp.c
scilab/modules/elementary_functions/sci_gateway/c/sci_gsort.c
scilab/modules/elementary_functions/sci_gateway/c/sci_imag.c
scilab/modules/elementary_functions/sci_gateway/c/sci_imult.c
scilab/modules/elementary_functions/sci_gateway/c/sci_int.c
scilab/modules/elementary_functions/sci_gateway/c/sci_isreal.c
scilab/modules/elementary_functions/sci_gateway/c/sci_kron.c
scilab/modules/elementary_functions/sci_gateway/c/sci_log.c
scilab/modules/elementary_functions/sci_gateway/c/sci_log1p.c
scilab/modules/elementary_functions/sci_gateway/c/sci_matrix.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/c/sci_nearfloat.c
scilab/modules/elementary_functions/sci_gateway/c/sci_number_properties.c
scilab/modules/elementary_functions/sci_gateway/c/sci_ones.c
scilab/modules/elementary_functions/sci_gateway/c/sci_prod.c
scilab/modules/elementary_functions/sci_gateway/c/sci_rand.c
scilab/modules/elementary_functions/sci_gateway/c/sci_real.c
scilab/modules/elementary_functions/sci_gateway/c/sci_round.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sign.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sin.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sqrt.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sum.c
scilab/modules/elementary_functions/sci_gateway/c/sci_tan.c
scilab/modules/elementary_functions/sci_gateway/c/sci_testmatrix.c
scilab/modules/elementary_functions/sci_gateway/c/sci_tril.c
scilab/modules/elementary_functions/sci_gateway/c/sci_triu.c
scilab/modules/elementary_functions/sci_gateway/c/sci_zeros.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/cpp/elem_func/elem_func.vcproj
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/src/cpp/expandPathVariable.cpp
scilab/modules/functions/scripts/buildmacros/buildmacros.sce
scilab/modules/graphics/graphics.vcproj
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/images/icons/aboutscilab.png
scilab/modules/gui/macros/about.sci
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/c/sci_file.c
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/src/c/io.vcproj
scilab/modules/io/src/c/systemc.c
scilab/modules/javasci/includes/javasci_globals.h
scilab/modules/localization/src/localization.vcproj
scilab/modules/operations/operations.vcproj
scilab/modules/output_stream/includes/Scierror.h
scilab/modules/output_stream/includes/msgs.h
scilab/modules/output_stream/includes/sciprint.h
scilab/modules/output_stream/macros/prettyprint.sci
scilab/modules/output_stream/src/c/Scierror.c
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/output_stream/src/c/sciprint.c
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/signal_processing/sci_gateway/c/sci_fft.c
scilab/modules/sparse/includes/gw_sparse.h
scilab/modules/sparse/sci_gateway/c/gw_sparse.c
scilab/modules/sparse/sci_gateway/c/sci_spmax.c
scilab/modules/sparse/sci_gateway/c/sci_spmin.c
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
scilab/modules/windows_tools/src/c/spawncommand.c
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosNotify.cpp
scilab/modules/xpad/Makefile.am
scilab/modules/xpad/Makefile.in
scilab/modules/xpad/includes/gw_xpad.h
scilab/modules/xpad/sci_gateway/c/gw_xpad.c
scilab/modules/xpad/sci_gateway/cpp/sci_closeXpadFromScilab.cpp
scilab/modules/xpad/sci_gateway/cpp/sci_xpad.cpp
scilab/modules/xpad/src/c/xpad.vcproj

Change-Id: Ie7d0847781e0f4646c6d9c6a9aaf4a4ca80b383d

266 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/hashtable/Makefile.in
scilab/libs/libst/Makefile.in
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/abstractSyntaxTree/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/includes/gw_action_binding.h
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/api_scilab/Makefile.in
scilab/modules/api_scilab/includes/api_string.h
scilab/modules/arnoldi/Makefile.in
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.in
scilab/modules/cacsd/Makefile.in
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.in
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/console.vcproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/src/c/callDynamicGateway.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/getmodules.c
scilab/modules/core/src/c/inisci-c.c
scilab/modules/core/src/c/loadversion.c
scilab/modules/core/src/c/parse.c
scilab/modules/core/src/c/run.c
scilab/modules/core/src/fortran/core_f.vfproj
scilab/modules/data_structures/Makefile.in
scilab/modules/demo_tools/Makefile.in
scilab/modules/development_tools/Makefile.in
scilab/modules/development_tools/src/fake/Makefile.in
scilab/modules/differential_equations/Makefile.in
scilab/modules/double/Makefile.in
scilab/modules/double/src/c/LibScilab_Import.def
scilab/modules/double/src/c/double.vcproj
scilab/modules/dynamic_link/Makefile.in
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/macros/dec2bin.sci
scilab/modules/elementary_functions/macros/dec2oct.sci
scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c
scilab/modules/elementary_functions/sci_gateway/c/sci_abs.c
scilab/modules/elementary_functions/sci_gateway/c/sci_chinesehat.c
scilab/modules/elementary_functions/sci_gateway/c/sci_clean.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cos.c
scilab/modules/elementary_functions/sci_gateway/c/sci_cumprod.c
scilab/modules/elementary_functions/sci_gateway/c/sci_diag.c
scilab/modules/elementary_functions/sci_gateway/c/sci_dsearch.c
scilab/modules/elementary_functions/sci_gateway/c/sci_expm.c
scilab/modules/elementary_functions/sci_gateway/c/sci_floor.c
scilab/modules/elementary_functions/sci_gateway/c/sci_isequalbitwise.c
scilab/modules/elementary_functions/sci_gateway/c/sci_matrix.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/c/sci_nearfloat.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sqrt.c
scilab/modules/elementary_functions/sci_gateway/c/sci_sum.c
scilab/modules/elementary_functions/src/c/api_scilab_Import.def
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj
scilab/modules/elementary_functions/src/fortran/integer_Import.def
scilab/modules/elementary_functions/src/fortran/slatec/Elementary_functions_Import.def
scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.vfproj
scilab/modules/elementary_functions/src/fortran/sparse_f_Import.def
scilab/modules/elementary_functions/src/fortran/string_Import.def
scilab/modules/fftw/Makefile.in
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
scilab/modules/functions/Makefile.in
scilab/modules/functions/scripts/buildmacros/BuildMacros.vcproj
scilab/modules/functions/src/c/functions.vcproj
scilab/modules/functions/src/c/getmacroslist.c
scilab/modules/functions_manager/Makefile.in
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphics/LibScilab_Import.def
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/etc/main_menubar.xml
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/window/SwingScilabWindow.java
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/src/c/helptools.vcproj
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/c/LibScilab_Import.def
scilab/modules/history_browser/src/c/history_browser.vcproj
scilab/modules/history_browser/src/cpp/CommandHistory_Wrap.cpp
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/history_manager/src/cpp/HistoryFile.cpp
scilab/modules/history_manager/src/cpp/HistoryManager.cpp
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/Makefile.in
scilab/modules/intersci/Makefile.in
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/src/c/io.vcproj
scilab/modules/javasci/Javasci.vcproj
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/includes/javasci_globals.h
scilab/modules/javasci/src/c/javasci_Scilab.c
scilab/modules/javasci/src/c/javasci_Scilab2.c
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/libjvm.vcproj
scilab/modules/jvm/src/c/loadClasspath.c
scilab/modules/jvm/src/c/loadLibrarypath.c
scilab/modules/jvm/src/c/loadOnUseClassPath.c
scilab/modules/linear_algebra/Makefile.in
scilab/modules/localization/Makefile.in
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/matio/src/c/CreateBooleanVariable.c
scilab/modules/matio/src/c/CreateCellVariable.c
scilab/modules/matio/src/c/CreateDoubleVariable.c
scilab/modules/matio/src/c/CreateHyperMatrixVariable.c
scilab/modules/matio/src/c/CreateIntegerVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.c
scilab/modules/matio/src/c/CreateMatlabVariable.h
scilab/modules/matio/src/c/CreateSparseVariable.c
scilab/modules/matio/src/c/CreateStructVariable.c
scilab/modules/matio/src/c/GetCellVariable.c
scilab/modules/matio/src/c/GetCharVariable.c
scilab/modules/matio/src/c/GetDoubleVariable.c
scilab/modules/matio/src/c/GetIntegerVariable.c
scilab/modules/matio/src/c/GetMatlabVariable.c
scilab/modules/matio/src/c/GetMatlabVariable.h
scilab/modules/matio/src/c/GetMlistVariable.c
scilab/modules/matio/src/c/GetSparseVariable.c
scilab/modules/mexlib/Makefile.in
scilab/modules/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/optimization/Makefile.in
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/includes/Scierror.h
scilab/modules/output_stream/includes/msgs.h
scilab/modules/output_stream/macros/prettyprint.sci
scilab/modules/output_stream/src/c/LibScilab_Import.def
scilab/modules/output_stream/src/c/Scierror.c
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/includes/gw_parallel.h
scilab/modules/parallel/sci_gateway/c/gw_parallel.c
scilab/modules/parallel/src/c/parallel.vcproj
scilab/modules/parallel/src/cpp/parallel_run.hxx
scilab/modules/parameters/Makefile.in
scilab/modules/parse/Makefile.in
scilab/modules/polynomials/Makefile.in
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.vcproj
scilab/modules/randlib/Makefile.in
scilab/modules/renderer/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/c/gw_scinotes.c
scilab/modules/scinotes/sci_gateway/cpp/sci_closeSciNotesFromScilab.cpp
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/scinotes/src/c/LibScilab_Import.def
scilab/modules/scinotes/src/c/scinotes.vcproj
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/LibScilab_Import.def
scilab/modules/shell/src/c/others/zzledt.c
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/signal_processing/Makefile.in
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.in
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/includes/gw_sparse.h
scilab/modules/sparse/sci_gateway/c/gw_sparse.c
scilab/modules/sparse/sci_gateway/c/sci_spmax.c
scilab/modules/sparse/sci_gateway/c/sci_spmin.c
scilab/modules/special_functions/Makefile.in
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/string/Makefile.in
scilab/modules/string/src/c/string.vcproj
scilab/modules/symbol/Makefile.in
scilab/modules/symbolic/Makefile.in
scilab/modules/system_env/Makefile.in
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/texmacs/Makefile.in
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/sci_sleep.c
scilab/modules/time/sci_gateway/c/sci_xpause.c
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/includes/gw_ui_data.h
scilab/modules/ui_data/sci_gateway/c/gw_ui_data.c
scilab/modules/ui_data/sci_gateway/cpp/sci_browsevar.cpp
scilab/modules/ui_data/sci_gateway/cpp/sci_editvar.cpp
scilab/modules/ui_data/sci_gateway/cpp/sci_updateEditvarValue.cpp
scilab/modules/ui_data/src/c/LibScilab_Import.def
scilab/modules/ui_data/src/c/ui_data.vcproj
scilab/modules/umfpack/Makefile.in
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/windows_tools/src/c/scilab_windows/System_env_Import.def
scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj
scilab/modules/windows_tools/src/c/scilab_windows/spawncommand.c
scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/includes/gw_xcos.h
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalCategoryAdd.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDelete.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalDisable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalEnable.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalGenerateIcon.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosPalMove.cpp
scilab/modules/xcos/sci_gateway/cpp/xcosUtilities.cpp
scilab/modules/xcos/src/c/xcos.vcproj

Simple merge
@@@ -68,19 -54,15 +68,19 @@@ scilab_bin_SOURCES         =       $(top_srcdir)/mo
  
  scilab_bin_LDADD              = $(COMMON_LIBS) $(SCILAB_LIB)
  
 +scilab_bin_CPPFLAGS           = $(COMMON_CPPFLAGS)
 +
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES        = $(top_srcdir)/modules/shell/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
+ scilab_cli_bin_CFLAGS                 = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes     
  scilab_cli_bin_LDADD          = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
  
 +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 
 +# Don't do it for scilab_cli_bin. We want to be able to call it without
  # the java libs
        scilab_bin_LDADD += $(JAVA_JNI_LIBS)
  endif
@@@ -607,31 -592,13 +611,31 @@@ $(LTLIBINTL
  
  SCILAB_LIB = $(top_builddir)/modules/libscilab.la
  SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli.la
 -scilab_bin_SOURCES = $(top_srcdir)/modules/shell/src/c/others/mainscic.c
 +COMMON_CPPFLAGS = -I$(top_srcdir)/modules/shell/includes/ \
 +                                              -I$(top_srcdir)/modules/console/includes/ \
 +                                              -I$(top_srcdir)/modules/output_stream/includes/ \
 +                                              -I$(top_srcdir)/modules/parse/includes/ \
 +                                              -I$(top_srcdir)/modules/abstractSyntaxTree/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/
 +
 +scilab_bin_SOURCES = $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +                                                      $(top_srcdir)/modules/core/src/cpp/tasks.cpp
 +
  scilab_bin_LDADD = $(COMMON_LIBS) $(SCILAB_LIB)
 +scilab_bin_CPPFLAGS = $(COMMON_CPPFLAGS)
  
  # Match scilab -nwni (ie command line without graphics)
 -scilab_cli_bin_SOURCES = $(top_srcdir)/modules/shell/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
+ scilab_cli_bin_CFLAGS = -DWITHOUT_GUI -I$(top_srcdir)/modules/io/includes     
  scilab_cli_bin_LDADD = $(COMMON_LIBS) $(SCILAB_CLI_LIB)
 +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
@@@ -10,19 -12,35 +10,31 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildMacros", "modules\functions\scripts\buildmacros\BuildMacros.vcproj", "{66F2FB48-5D68-4445-A856-119F685A371B}"
        ProjectSection(ProjectDependencies) = postProject
++              {14373D41-991A-412E-8EA7-A832D98047B8} = {14373D41-991A-412E-8EA7-A832D98047B8}
                {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
                {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77} = {9BA6F7E4-AE64-4FD9-A5A7-0996A8B73B77}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elementary_functions", "modules\elementary_functions\src\c\elementary_functions.vcproj", "{5B110267-7C18-437C-B87D-DBA2B50729E9}"
        ProjectSection(ProjectDependencies) = postProject
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
+               {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
 -              {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+               {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
 -              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
        EndProjectSection
  EndProject
  Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "elementary_functions_f", "modules\elementary_functions\src\fortran\elementary_functions_f.vfproj", "{DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}"
        ProjectSection(ProjectDependencies) = postProject
 -              {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
+               {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
 -              {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+               {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
 -              {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics", "modules\statistics\src\c\statistics.vcproj", "{FE9EB721-B3C1-41D8-B585-3FB3A0083CEC}"
@@@ -276,6 -291,9 +298,8 @@@ Project("{6989167D-11E4-40FE-8C1A-2192A
  EndProject
  Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "signal_processing_f", "modules\signal_processing\src\fortran\signal_processing_f.vfproj", "{959384FC-016C-4B01-B848-1B18D26B6CC4}"
        ProjectSection(ProjectDependencies) = postProject
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 -              {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606} = {A3AD381E-C0DD-45BB-ACB2-C0A0DB33A606}
+               {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
  EndProject
@@@ -586,9 -641,9 +655,10 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "modules\double\src\c\double.vcproj", "{E61FEBA7-C98E-4C42-96CA-FC03F0DB26B2}"
        ProjectSection(ProjectDependencies) = postProject
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {8AB8ECEC-8C22-475E-80D0-E14696F5A19B} = {8AB8ECEC-8C22-475E-80D0-E14696F5A19B}
                {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
        EndProjectSection
  EndProject
@@@ -604,7 -661,8 +676,9 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean", "modules\boolean\src\c\boolean.vcproj", "{8AB8ECEC-8C22-475E-80D0-E14696F5A19B}"
        ProjectSection(ProjectDependencies) = postProject
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
++              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
  EndProject
  Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "boolean_f", "modules\boolean\src\fortran\boolean_f.vfproj", "{45ECEB36-A12B-42F5-9D7A-216A0E70601D}"
@@@ -873,8 -939,9 +956,10 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_binding", "modules\action_binding\src\c\action_binding.vcproj", "{8A654CC5-22C1-4972-A8CF-1B89F78B5383}"
        ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@@ -942,7 -1010,7 +1029,8 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks", "modules\scicos_blocks\src\c\scicos_blocks.vcproj", "{70F677F1-B535-4D0F-A16F-5093B799A540}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA} = {C781737A-7C97-4CF9-ACBC-F68C2BBF0FFA}
@@@ -1074,184 -1142,23 +1169,185 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
        EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes-Ant", "modules\scinotes\src\java\scinotes-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "modules\operations\operations.vcproj", "{1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}"
        ProjectSection(ProjectDependencies) = postProject
 -              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
 -              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
        EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func", "modules\elementary_functions\src\cpp\elem_func\elem_func.vcproj", "{E1284D3E-4B3F-446B-B541-F661A8A166A7}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "abstractSyntaxTree", "modules\abstractSyntaxTree\abstractSyntaxTree.vcproj", "{0D3FA25B-8116-44EC-A45E-260789DAA3D9}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func_gw", "modules\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcproj", "{9881F0CE-A1AC-4744-B709-7C1453A77B95}"
        ProjectSection(ProjectDependencies) = postProject
 +              {D5DD1407-3926-4F6C-AD7B-3A6B2DE56049} = {D5DD1407-3926-4F6C-AD7B-3A6B2DE56049}
 +              {51240B08-5E4E-439B-B745-C870D5B513BF} = {51240B08-5E4E-439B-B745-C870D5B513BF}
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
 +              {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
 +              {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
 +              {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
 +              {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
 +              {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_manager", "modules\functions_manager\functions_manager.vcproj", "{8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {764FAC09-369D-4C11-A0FF-CE097D9A4FAF} = {764FAC09-369D-4C11-A0FF-CE097D9A4FAF}
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
 +              {28305722-6486-481D-BD0F-B4398D8A09C5} = {28305722-6486-481D-BD0F-B4398D8A09C5}
 +              {09E6CF32-EF2F-4C63-A2B8-B04964768BD6} = {09E6CF32-EF2F-4C63-A2B8-B04964768BD6}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 -              {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
 +              {719EC179-3AD3-4C6B-BBD8-B44C96B1A204} = {719EC179-3AD3-4C6B-BBD8-B44C96B1A204}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2} = {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5} = {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}
 +              {3E933EB6-D427-4828-9B30-B6B9987491F6} = {3E933EB6-D427-4828-9B30-B6B9987491F6}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0} = {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}
 +              {9881F0CE-A1AC-4744-B709-7C1453A77B95} = {9881F0CE-A1AC-4744-B709-7C1453A77B95}
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294} = {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {215274D7-05EC-4D1E-B7BB-B2C957DA960B} = {215274D7-05EC-4D1E-B7BB-B2C957DA960B}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420} = {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}
 +              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11} = {C000FDF7-4D32-4630-9595-560D9CC66D11}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse", "modules\parse\parse.vcproj", "{74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbol", "modules\symbol\symbol.vcproj", "{2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcproj", "{64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_env", "modules\system_env\system_env.vcproj", "{7CA60AEF-9AFA-4D06-AF28-613C0AA27640}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
 +              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 +              {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_yasp", "modules\core\core_yasp.vcproj", "{14373D41-991A-412E-8EA7-A832D98047B8}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA} = {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA}
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {45CA5B12-7601-4968-AE16-16069FD1A152} = {45CA5B12-7601-4968-AE16-16069FD1A152}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
 +              {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
 +              {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
 +              {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
 +              {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD} = {8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}
 +              {445D3B85-C9B1-498B-9C88-0A3C2390B1CC} = {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}
 +              {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E} = {1B98DC87-44F5-48AE-B5D0-29DD8AD86F5E}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2} = {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
 +              {3E933EB6-D427-4828-9B30-B6B9987491F6} = {3E933EB6-D427-4828-9B30-B6B9987491F6}
 +              {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
 +              {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33} = {8CCDD3C2-B025-4A12-A986-1AA28D7C0C33}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
 +              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_gw", "modules\boolean\src\cpp\boolean_gw.vcproj", "{09E6CF32-EF2F-4C63-A2B8-B04964768BD6}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {8AB8ECEC-8C22-475E-80D0-E14696F5A19B} = {8AB8ECEC-8C22-475E-80D0-E14696F5A19B}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\src\cpp\core_gw.vcproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_gw", "modules\io\src\cpp\io_gw.vcproj", "{719EC179-3AD3-4C6B-BBD8-B44C96B1A204}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
 +              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2} = {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
@@@ -1273,62 -1179,6 +1369,43 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {968FD6C1-5845-4B22-B61E-F6DE987D47AD} = {968FD6C1-5845-4B22-B61E-F6DE987D47AD}
        EndProjectSection
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\xpad.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
-       ProjectSection(ProjectDependencies) = postProject
-               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
-               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
-               {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
-               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
-               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
-               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
-               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
-               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
-       EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
-       ProjectSection(ProjectDependencies) = postProject
-               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
-               {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
-               {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
-               {899DECF1-D4DC-4C84-BB3C-3A343401A5B4} = {899DECF1-D4DC-4C84-BB3C-3A343401A5B4}
-       EndProjectSection
- EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types_gw", "modules\types\sci_gateway\cpp\types_gw\types_gw.vcproj", "{C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_gw", "modules\functions\sci_gateway\cpp\functions_gw.vcproj", "{67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
++              {E1284D3E-4B3F-446B-B541-F661A8A166A7} = {E1284D3E-4B3F-446B-B541-F661A8A166A7}
 +              {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A}
 +              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
 +              {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2} = {74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}
 +              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
 +              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream_gw", "modules\output_stream\sci_gateway\cpp\output_stream_gw\output_stream_gw.vcproj", "{C000FDF7-4D32-4630-9595-560D9CC66D11}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
 +      EndProjectSection
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
@@@ -1371,35 -1206,80 +1448,102 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel", "modules\parallel\src\c\parallel.vcproj", "{56A2E2F3-26CF-45D5-BE7A-534C39CD7003}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio_gw", "modules\fileio\sci_gateway\cpp\fileio_gw.vcproj", "{6D9647CE-9CB9-4B16-B34D-8542484EFBB0}"
        ProjectSection(ProjectDependencies) = postProject
 -              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
 -              {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
 -              {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
 -              {A09E8584-0713-48A5-97BA-ACED0F3728F8} = {A09E8584-0713-48A5-97BA-ACED0F3728F8}
 -              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
 +              {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
 -              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
        EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-java-tests", "modules\graph\tests\java\graph-JAVA-tests.vcproj", "{AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "time_gw", "modules\time\sci_gateway\cpp\time_gw.vcproj", "{28305722-6486-481D-BD0F-B4398D8A09C5}"
        ProjectSection(ProjectDependencies) = postProject
 -              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
 -              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 +              {05D8F60B-332A-4161-B946-B8AB30ED439C} = {05D8F60B-332A-4161-B946-B8AB30ED439C}
 +              {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD} = {C6E2BC17-34D8-46E4-85F3-6293CB21ADCD}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
        EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-java-tests", "modules\hdf5\tests\java\hdf5-JAVA-tests.vcproj", "{78D46B73-ADD7-40CF-8436-B66897B18D9A}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "string_gw", "modules\string\sci_gateway\cpp\string_gw.vcproj", "{AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}"
        ProjectSection(ProjectDependencies) = postProject
 -              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 -              {9B6500B0-66F6-44F0-910D-47A1435B4E02} = {9B6500B0-66F6-44F0-910D-47A1435B4E02}
 +              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
 +              {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
 +              {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
 +              {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
 +              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
 +              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
 +              {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
 +      EndProjectSection
 +EndProject
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\history_browser\src\c\history_browser.vcproj", "{AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}"
++      ProjectSection(ProjectDependencies) = postProject
++              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
+       EndProjectSection
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-java-tests", "modules\xcos\tests\java\xcos-JAVA-tests.vcproj", "{DABDF840-2A2F-4B38-90B2-A4393E6DF38B}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser-Ant", "modules\history_browser\src\java\history_browser-JAVA.vcproj", "{95C21D50-FFD1-4FCE-A545-49FA1F825B28}"
+       ProjectSection(ProjectDependencies) = postProject
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
++              {63965A84-E354-4CBC-BFAC-FDFC8224573F} = {63965A84-E354-4CBC-BFAC-FDFC8224573F}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 -              {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D} = {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}
++              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
+       EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data", "modules\ui_data\src\c\ui_data.vcproj", "{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
+               {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
+       EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data-Ant", "modules\ui_data\src\java\ui_data-JAVA.vcproj", "{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
+       ProjectSection(ProjectDependencies) = postProject
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1} = {142D643B-A9EC-49DB-9D48-A925A20F63B1}
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {ABCB724E-8534-4420-AC12-7C33A606ABA3} = {ABCB724E-8534-4420-AC12-7C33A606ABA3}
 -              {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
+               {2EA61E81-0F0C-4006-985C-12785093CD2F} = {2EA61E81-0F0C-4006-985C-12785093CD2F}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
++              {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
+       EndProjectSection
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser-Ant", "modules\history_browser\src\java\history_browser-JAVA.vcproj", "{95C21D50-FFD1-4FCE-A545-49FA1F825B28}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
+       ProjectSection(ProjectDependencies) = postProject
 -              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {63965A84-E354-4CBC-BFAC-FDFC8224573F} = {63965A84-E354-4CBC-BFAC-FDFC8224573F}
 -              {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
 -              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
++              {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
++              {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
++              {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
++              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
++              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
++              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
++              {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
++              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
++              {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
+       EndProjectSection
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\history_browser\src\c\history_browser.vcproj", "{AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes-Ant", "modules\scinotes\src\java\scinotes-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
+       ProjectSection(ProjectDependencies) = postProject
 -              {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
++              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
++              {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
++              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
+       EndProjectSection
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "modules\operations\operations.vcproj", "{1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}"
 -EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func", "modules\elementary_functions\src\cpp\elem_func\elem_func.vcproj", "{E1284D3E-4B3F-446B-B541-F661A8A166A7}"
++Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel", "modules\parallel\src\c\parallel.vcproj", "{56A2E2F3-26CF-45D5-BE7A-534C39CD7003}"
+       ProjectSection(ProjectDependencies) = postProject
 -              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
++              {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
++              {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
++              {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
++              {A09E8584-0713-48A5-97BA-ACED0F3728F8} = {A09E8584-0713-48A5-97BA-ACED0F3728F8}
++              {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
++              {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
++              {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+       EndProjectSection
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|Win32.Build.0 = Release|Win32
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.ActiveCfg = Release|x64
                {F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}.Release|x64.Build.0 = Release|x64
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.ActiveCfg = Debug|Win32
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.Build.0 = Debug|Win32
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.ActiveCfg = Debug|x64
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.Build.0 = Debug|x64
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.ActiveCfg = Release|Win32
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.Build.0 = Release|Win32
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.ActiveCfg = Release|x64
-               {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.Build.0 = Release|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.Build.0 = Debug|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.ActiveCfg = Debug|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.Build.0 = Debug|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.ActiveCfg = Release|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.Build.0 = Release|Win32
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.ActiveCfg = Release|x64
-               {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.Build.0 = Release|x64
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|Win32.Build.0 = Debug|Win32
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|x64.ActiveCfg = Debug|x64
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Debug|x64.Build.0 = Debug|x64
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|Win32.ActiveCfg = Release|Win32
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|Win32.Build.0 = Release|Win32
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|x64.ActiveCfg = Release|x64
 +              {C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}.Release|x64.Build.0 = Release|x64
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|Win32.Build.0 = Debug|Win32
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|x64.ActiveCfg = Debug|x64
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Debug|x64.Build.0 = Debug|x64
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|Win32.ActiveCfg = Release|Win32
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|Win32.Build.0 = Release|Win32
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|x64.ActiveCfg = Release|x64
 +              {67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}.Release|x64.Build.0 = Release|x64
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|Win32.Build.0 = Debug|Win32
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|x64.ActiveCfg = Debug|x64
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Debug|x64.Build.0 = Debug|x64
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|Win32.ActiveCfg = Release|Win32
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|Win32.Build.0 = Release|Win32
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|x64.ActiveCfg = Release|x64
 +              {C000FDF7-4D32-4630-9595-560D9CC66D11}.Release|x64.Build.0 = Release|x64
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|Win32.ActiveCfg = Debug|Win32
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Debug|x64.ActiveCfg = Debug|x64
                {9E0DE362-60A0-4584-9FF1-BB537DA94F40}.Release|Win32.ActiveCfg = Release|Win32
                {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|Win32.Build.0 = Release|Win32
                {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.ActiveCfg = Release|x64
                {A09E8584-0713-48A5-97BA-ACED0F3728F8}.Release|x64.Build.0 = Release|x64
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.Build.0 = Debug|Win32
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.ActiveCfg = Debug|x64
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.Build.0 = Debug|x64
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.ActiveCfg = Release|Win32
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.Build.0 = Release|Win32
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
 -              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
 -              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Debug|x64.ActiveCfg = Debug|x64
 -              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Release|Win32.ActiveCfg = Release|Win32
 -              {AB7EBA0D-1B00-4B1B-BB00-62AB38E2309A}.Release|x64.ActiveCfg = Release|x64
 -              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Debug|x64.ActiveCfg = Debug|x64
 -              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Release|Win32.ActiveCfg = Release|Win32
 -              {78D46B73-ADD7-40CF-8436-B66897B18D9A}.Release|x64.ActiveCfg = Release|x64
 -              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Debug|x64.ActiveCfg = Debug|x64
 -              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|Win32.ActiveCfg = Release|Win32
 -              {DABDF840-2A2F-4B38-90B2-A4393E6DF38B}.Release|x64.ActiveCfg = Release|x64
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|Win32.Build.0 = Debug|Win32
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|x64.ActiveCfg = Debug|x64
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Debug|x64.Build.0 = Debug|x64
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|Win32.ActiveCfg = Release|Win32
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|Win32.Build.0 = Release|Win32
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|x64.ActiveCfg = Release|x64
 +              {6D9647CE-9CB9-4B16-B34D-8542484EFBB0}.Release|x64.Build.0 = Release|x64
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|Win32.Build.0 = Debug|Win32
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|x64.ActiveCfg = Debug|x64
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Debug|x64.Build.0 = Debug|x64
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|Win32.ActiveCfg = Release|Win32
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|Win32.Build.0 = Release|Win32
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|x64.ActiveCfg = Release|x64
 +              {28305722-6486-481D-BD0F-B4398D8A09C5}.Release|x64.Build.0 = Release|x64
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|Win32.Build.0 = Debug|Win32
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|x64.ActiveCfg = Debug|x64
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Debug|x64.Build.0 = Debug|x64
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|Win32.ActiveCfg = Release|Win32
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|Win32.Build.0 = Release|Win32
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|x64.ActiveCfg = Release|x64
 +              {AEC1F7B5-28F2-4C1F-A436-98D0352FD3F5}.Release|x64.Build.0 = Release|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.ActiveCfg = Debug|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.Build.0 = Debug|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.ActiveCfg = Debug|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.Build.0 = Debug|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.ActiveCfg = Release|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.Build.0 = Release|Win32
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.ActiveCfg = Release|x64
++              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.Build.0 = Release|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.ActiveCfg = Debug|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.Build.0 = Debug|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.ActiveCfg = Debug|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.Build.0 = Debug|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.ActiveCfg = Release|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.Build.0 = Release|Win32
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.ActiveCfg = Release|x64
++              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.Build.0 = Release|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.ActiveCfg = Debug|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|Win32.Build.0 = Debug|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.ActiveCfg = Debug|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Debug|x64.Build.0 = Debug|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|Win32.ActiveCfg = Release|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|Win32.Build.0 = Release|Win32
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|x64.ActiveCfg = Release|x64
+               {142D643B-A9EC-49DB-9D48-A925A20F63B1}.Release|x64.Build.0 = Release|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|Win32.ActiveCfg = Debug|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|Win32.Build.0 = Debug|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|x64.ActiveCfg = Debug|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Debug|x64.Build.0 = Debug|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.ActiveCfg = Release|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|Win32.Build.0 = Release|Win32
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.ActiveCfg = Release|x64
+               {405E6B33-DBA9-4850-A19F-19298DA5A64D}.Release|x64.Build.0 = Release|x64
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|Win32.Build.0 = Debug|Win32
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.ActiveCfg = Debug|x64
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Debug|x64.Build.0 = Debug|x64
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.ActiveCfg = Release|Win32
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|Win32.Build.0 = Release|Win32
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.ActiveCfg = Release|x64
 -              {95C21D50-FFD1-4FCE-A545-49FA1F825B28}.Release|x64.Build.0 = Release|x64
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|Win32.Build.0 = Debug|Win32
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.ActiveCfg = Debug|x64
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Debug|x64.Build.0 = Debug|x64
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.ActiveCfg = Release|Win32
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|Win32.Build.0 = Release|Win32
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.ActiveCfg = Release|x64
 -              {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}.Release|x64.Build.0 = Release|x64
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|Win32.Build.0 = Debug|Win32
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|x64.ActiveCfg = Debug|x64
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Debug|x64.Build.0 = Debug|x64
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|Win32.ActiveCfg = Release|Win32
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|Win32.Build.0 = Release|Win32
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|x64.ActiveCfg = Release|x64
 -              {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}.Release|x64.Build.0 = Release|x64
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|Win32.ActiveCfg = Debug|Win32
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|Win32.Build.0 = Debug|Win32
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|x64.ActiveCfg = Debug|x64
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Debug|x64.Build.0 = Debug|x64
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|Win32.ActiveCfg = Release|Win32
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|Win32.Build.0 = Release|Win32
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|x64.ActiveCfg = Release|x64
 -              {E1284D3E-4B3F-446B-B541-F661A8A166A7}.Release|x64.Build.0 = Release|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.ActiveCfg = Debug|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|Win32.Build.0 = Debug|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.ActiveCfg = Debug|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Debug|x64.Build.0 = Debug|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.ActiveCfg = Release|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|Win32.Build.0 = Release|Win32
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.ActiveCfg = Release|x64
++              {BAE68B54-2C1A-44D0-A0E9-05156A784E79}.Release|x64.Build.0 = Release|x64
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.ActiveCfg = Debug|Win32
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|Win32.Build.0 = Debug|Win32
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.ActiveCfg = Debug|x64
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Debug|x64.Build.0 = Debug|x64
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.ActiveCfg = Release|Win32
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|Win32.Build.0 = Release|Win32
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.ActiveCfg = Release|x64
++              {43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}.Release|x64.Build.0 = Release|x64
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.ActiveCfg = Debug|Win32
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|Win32.Build.0 = Debug|Win32
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.ActiveCfg = Debug|x64
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Debug|x64.Build.0 = Debug|x64
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.ActiveCfg = Release|Win32
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|Win32.Build.0 = Release|Win32
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.ActiveCfg = Release|x64
++              {56A2E2F3-26CF-45D5-BE7A-534C39CD7003}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@@ -10170,7 -9898,7 +10190,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 10173 "configure"
 -// #line 9901 "configure"
++// #line 10193 "configure"
  
  
  public class conftest {
@@@ -10236,7 -9964,7 +10256,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 10239 "configure"
 -// #line 9967 "configure"
++// #line 10259 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -10300,7 -10028,7 +10320,7 @@@ $as_echo_n "checking java API version..
  
  
      cat << \EOF > conftest.java
- // #line 10303 "configure"
 -// #line 10031 "configure"
++// #line 10323 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
  
      cat << \EOF > conftest.java
- // #line 10348 "configure"
 -// #line 10076 "configure"
++// #line 10368 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
@@@ -11604,7 -11332,7 +11624,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11607 "configure"
 -// #line 11335 "configure"
++// #line 11627 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -11697,7 -11425,7 +11717,7 @@@ $as_echo_n "checking minimal version (1
     export ac_java_classpath="$JGRAPHX:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11700 "configure"
 -// #line 11428 "configure"
++// #line 11720 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -11769,7 -11497,7 +11789,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11772 "configure"
 -// #line 11500 "configure"
++// #line 11792 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -11876,7 -11604,7 +11896,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11879 "configure"
 -// #line 11607 "configure"
++// #line 11899 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -11983,7 -11711,7 +12003,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 11986 "configure"
 -// #line 11714 "configure"
++// #line 12006 "configure"
  import com.jgoodies.looks.common.RenderingUtils;
  
  public class conftest {
@@@ -12091,7 -11819,7 +12111,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12094 "configure"
 -// #line 11822 "configure"
++// #line 12114 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -12198,7 -11926,7 +12218,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12201 "configure"
 -// #line 11929 "configure"
++// #line 12221 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -12408,7 -12136,7 +12428,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12411 "configure"
 -// #line 12139 "configure"
++// #line 12431 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -12570,7 -12298,7 +12590,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12573 "configure"
 -// #line 12301 "configure"
++// #line 12593 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12677,7 -12405,7 +12697,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12680 "configure"
 -// #line 12408 "configure"
++// #line 12700 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -12785,7 -12513,7 +12805,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12788 "configure"
 -// #line 12516 "configure"
++// #line 12808 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -12892,7 -12620,7 +12912,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12895 "configure"
 -// #line 12623 "configure"
++// #line 12915 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -13001,7 -12729,7 +13021,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13004 "configure"
 -// #line 12732 "configure"
++// #line 13024 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -13110,7 -12838,7 +13130,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13113 "configure"
 -// #line 12841 "configure"
++// #line 13133 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -13217,7 -12945,7 +13237,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13220 "configure"
 -// #line 12948 "configure"
++// #line 13240 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -13324,7 -13052,7 +13344,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13327 "configure"
 -// #line 13055 "configure"
++// #line 13347 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -13417,7 -13145,7 +13437,7 @@@ $as_echo_n "checking minimal version (1
     export ac_java_classpath="$BATIK:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13420 "configure"
 -// #line 13148 "configure"
++// #line 13440 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -13489,7 -13217,7 +13509,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13492 "configure"
 -// #line 13220 "configure"
++// #line 13512 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -13596,7 -13324,7 +13616,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13599 "configure"
 -// #line 13327 "configure"
++// #line 13619 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -13703,7 -13431,7 +13723,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13706 "configure"
 -// #line 13434 "configure"
++// #line 13726 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -13810,7 -13538,7 +13830,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13813 "configure"
 -// #line 13541 "configure"
++// #line 13833 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -13917,7 -13645,7 +13937,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13920 "configure"
 -// #line 13648 "configure"
++// #line 13940 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -14028,7 -13756,7 +14048,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14031 "configure"
 -// #line 13759 "configure"
++// #line 14051 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -14135,7 -13863,7 +14155,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14138 "configure"
 -// #line 13866 "configure"
++// #line 14158 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -14228,7 -13956,7 +14248,7 @@@ $as_echo_n "checking minimal version (0
     export ac_java_classpath="$JLATEXMATH:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14231 "configure"
 -// #line 13959 "configure"
++// #line 14251 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -14306,7 -14034,7 +14326,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14309 "configure"
 -// #line 14037 "configure"
++// #line 14329 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -14413,7 -14141,7 +14433,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14416 "configure"
 -// #line 14144 "configure"
++// #line 14436 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -14520,7 -14248,7 +14540,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14523 "configure"
 -// #line 14251 "configure"
++// #line 14543 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -14627,7 -14355,7 +14647,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14630 "configure"
 -// #line 14358 "configure"
++// #line 14650 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -14734,7 -14462,7 +14754,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14737 "configure"
 -// #line 14465 "configure"
++// #line 14757 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -14841,7 -14569,7 +14861,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14844 "configure"
 -// #line 14572 "configure"
++// #line 14864 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -14948,7 -14676,7 +14968,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14951 "configure"
 -// #line 14679 "configure"
++// #line 14971 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -18625,7 -18589,7 +18881,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18628 "configure"
 -// #line 18592 "configure"
++// #line 18884 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -18773,7 -18737,7 +19029,7 @@@ $as_echo_n "checking minimal version (1
     export ac_java_classpath="$JHDF5:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 18776 "configure"
 -// #line 18740 "configure"
++// #line 19032 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
  
        unset LD_LIBRARY_PATH
        LD_LIBRARY_PATH=$LD_LIBRARY_PATH_save
-     fi
+    fi
 +
  fi #HDF5_ENABLE
  
  #################
@@@ -23307,7 -23321,7 +23614,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 23310 "configure"
 -#line 23324 "configure"
++#line 23617 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -23619,7 -23633,7 +23926,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 23622 "configure"
 -#line 23636 "configure"
++#line 23929 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -24203,7 -24217,7 +24510,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 24206 "configure"
 -// #line 24220 "configure"
++// #line 24513 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -24310,7 -24324,7 +24617,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 24313 "configure"
 -// #line 24327 "configure"
++// #line 24620 "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 30589 "configure"
 -#line 30628 "configure"
++#line 30921 "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 30695 "configure"
 -#line 30734 "configure"
++#line 31027 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -36714,7 -36753,7 +37046,7 @@@ if test "$enable_stop_on_warning" = yes
     CPPFLAGS="$CPPFLAGS -Werror -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 modules/abstractSyntaxTree/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/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/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/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/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/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/xpad/Makefile modules/graph/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/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/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/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/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/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/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/abstractSyntaxTree/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/helptools/macros/xmlfiletohtml.sci modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/shell/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/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/pvm/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/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/maple2scilab/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/texmacs/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/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/jvm_options.xml scilab-lib.properties scilab-lib-doc.properties"
  
  
  # Detection of the module for the future version of Scilab 6
@@@ -1198,6 -1181,7 +1211,8 @@@ AC_JAVA_HDF5(
          echo "Check of the presence of libjhdf5.jnilib disabled under Mac OS X"
     else
        AC_JNI_HDF5()
+    fi
++
  fi #HDF5_ENABLE
  
  #################
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -19,11 -19,8 +19,10 @@@ SUBDIRS = cor
  SUBDIRS += \
  operations \
  output_stream \
- action_binding \
  arnoldi \
  elementary_functions \
 +matio \
 +functions_manager \
  string \
  api_scilab \
  dynamic_link \
@@@ -84,15 -82,16 +84,19 @@@ parameters 
  atoms \
  types \
  hdf5 \
 -graph\
 +graph \
  xcos \
- xpad \
 +system_env \
 +abstractSyntaxTree \
 +symbol \
 +parse \
- types
++types \
+ scinotes \
+ parallel \
+ modules_manager \
+ ui_data \
+ history_browser
  
 -
  #umfpack
  
  #if MPI
@@@ -190,20 -195,10 +200,21 @@@ ENGINE_LIBS =   $(top_builddir)/modules/f
        $(top_builddir)/modules/string/libscistring.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.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/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
-       $(top_builddir)/modules/functions_manager/libscifunctions_manager.la
++      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
+       $(top_builddir)/modules/parallel/libsciparallel.la
  
 -
  # These libraries are loaded dynamically from Scilab.
  ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/optimization/libscioptimization.la \
@@@ -151,20 -151,20 +151,21 @@@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARG
        distdir
  ETAGS = etags
  CTAGS = ctags
- DIST_SUBDIRS = core operations output_stream action_binding arnoldi \
+ DIST_SUBDIRS = core operations output_stream arnoldi \
 -      elementary_functions string api_scilab dynamic_link fileio \
 -      history_manager spreadsheet tclsci localization action_binding \
 -      renderer shell completion console graphic_export gui jvm \
 -      graphics optimization symbolic randlib statistics \
 -      special_functions interpolation linear_algebra integer \
 -      data_structures mexlib differential_equations cacsd \
 +      elementary_functions matio functions_manager string api_scilab \
 +      dynamic_link fileio history_manager spreadsheet tclsci \
-       localization renderer shell completion console graphic_export \
-       gui jvm graphics optimization symbolic randlib statistics \
-       special_functions interpolation linear_algebra integer \
-       data_structures mexlib differential_equations cacsd \
++      localization action_binding renderer shell completion console \
++      graphic_export gui jvm graphics optimization symbolic randlib \
++      statistics special_functions interpolation linear_algebra \
++      integer data_structures mexlib differential_equations cacsd \
        polynomials boolean double pvm io intersci signal_processing \
        call_scilab sound time sparse windows_tools functions \
        overloading maple2scilab m2sci texmacs development_tools \
        compatibility_functions helptools fftw umfpack demo_tools \
 -      genetic_algorithms simulated_annealing parameters matio atoms \
 -      types hdf5 graph xcos scinotes parallel modules_manager \
 -      ui_data history_browser scicos_blocks scicos . javasci
 +      genetic_algorithms simulated_annealing parameters atoms types \
-       hdf5 graph xcos xpad system_env abstractSyntaxTree symbol \
-       parse scicos_blocks scicos . javasci
++      hdf5 graph xcos system_env abstractSyntaxTree symbol parse \
++      scinotes parallel modules_manager ui_data history_browser \
++      scicos_blocks scicos . javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -440,21 -438,21 +445,22 @@@ yacc_present = @yacc_present
  
  # core is the main module of Scilab. All the compilation deps has been removed
  # since it already linked almost the whole world
- SUBDIRS = core operations output_stream action_binding arnoldi \
-       elementary_functions matio functions_manager string api_scilab \
-       dynamic_link fileio history_manager spreadsheet tclsci \
-       localization renderer shell completion console graphic_export \
-       gui jvm graphics optimization symbolic randlib statistics \
+ SUBDIRS = core operations output_stream arnoldi elementary_functions \
 -      string api_scilab dynamic_link fileio history_manager \
 -      spreadsheet tclsci localization action_binding renderer shell \
 -      completion console graphic_export gui jvm graphics \
 -      optimization symbolic randlib statistics special_functions \
 -      interpolation linear_algebra integer data_structures mexlib \
 -      differential_equations cacsd polynomials boolean double pvm io \
 -      intersci signal_processing core call_scilab interpolation \
 -      sound time randlib sparse windows_tools functions overloading \
 -      maple2scilab m2sci texmacs development_tools \
 -      compatibility_functions helptools fftw umfpack demo_tools \
 -      genetic_algorithms simulated_annealing parameters matio atoms \
 -      types hdf5 graph xcos scinotes parallel modules_manager \
 -      ui_data history_browser $(am__append_1) scicos . \
 -      $(am__append_2)
++      matio functions_manager string api_scilab dynamic_link fileio \
++      history_manager spreadsheet tclsci localization action_binding \
++      renderer shell completion console graphic_export gui jvm \
++      graphics optimization symbolic randlib statistics \
 +      special_functions interpolation linear_algebra integer \
 +      data_structures mexlib differential_equations cacsd \
 +      polynomials boolean double pvm io intersci signal_processing \
 +      core call_scilab interpolation sound time randlib sparse \
 +      windows_tools functions overloading maple2scilab m2sci texmacs \
 +      development_tools compatibility_functions helptools fftw \
 +      umfpack demo_tools genetic_algorithms simulated_annealing \
-       parameters atoms types hdf5 graph xcos xpad system_env \
-       abstractSyntaxTree symbol parse types $(am__append_1) scicos . \
-       $(am__append_2)
++      parameters atoms types hdf5 graph xcos system_env \
++      abstractSyntaxTree symbol parse types scinotes parallel \
++      modules_manager ui_data history_browser $(am__append_1) scicos \
++      . $(am__append_2)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
@@@ -522,19 -526,8 +534,20 @@@ ENGINE_LIBS = $(top_builddir)/modules/f
        $(top_builddir)/modules/string/libscistring.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.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/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
 +      $(top_builddir)/modules/types/libscitypes.la \
 +      $(top_builddir)/modules/system_env/libscisystem_env.la \
-       $(top_builddir)/modules/functions_manager/libscifunctions_manager.la
++      $(top_builddir)/modules/functions_manager/libscifunctions_manager.la \
+       $(top_builddir)/modules/parallel/libsciparallel.la
  
  
  # These libraries are loaded dynamically from Scilab.
index f275233,0000000..e8abb7c
mode 100644,000000..100644
--- /dev/null
@@@ -1,969 -1,0 +1,973 @@@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
 +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +@SET_MAKE@
 +
 +
 +VPATH = @srcdir@
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
 +check_PROGRAMS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +TESTS = testConstExp$(EXEEXT) testVarExp$(EXEEXT) \
 +      testControlExp$(EXEEXT)
 +subdir = modules/abstractSyntaxTree
 +DIST_COMMON = $(libsciabstractSyntaxTree_la_include_HEADERS) \
 +      $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
 +      $(top_srcdir)/m4/fftw.m4 $(top_srcdir)/m4/fortran.m4 \
 +      $(top_srcdir)/m4/giws.m4 $(top_srcdir)/m4/hdf5.m4 \
 +      $(top_srcdir)/m4/intel_compiler.m4 \
 +      $(top_srcdir)/m4/java-thirdparty.m4 $(top_srcdir)/m4/java.m4 \
 +      $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/libsmath.m4 \
 +      $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libxml2.m4 \
 +      $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 +      $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
 +      $(top_srcdir)/m4/ocaml.m4 $(top_srcdir)/m4/pcre.m4 \
 +      $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/pvm.m4 \
 +      $(top_srcdir)/m4/relocatable.m4 $(top_srcdir)/m4/swig.m4 \
 +      $(top_srcdir)/m4/symlinks.m4 $(top_srcdir)/m4/tcltk.m4 \
 +      $(top_srcdir)/m4/umfpack.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +      $(ACLOCAL_M4)
 +mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 +CONFIG_HEADER = $(top_builddir)/modules/core/includes/machine.h
 +CONFIG_CLEAN_FILES =
 +CONFIG_CLEAN_VPATH_FILES =
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 +      "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +LTLIBRARIES = $(pkglib_LTLIBRARIES)
 +libsciabstractSyntaxTree_la_LIBADD =
 +am_libsciabstractSyntaxTree_la_OBJECTS =  \
 +      libsciabstractSyntaxTree_la-libAst.lo \
 +      libsciabstractSyntaxTree_la-visitor_common.lo \
 +      libsciabstractSyntaxTree_la-printvisitor.lo \
 +      libsciabstractSyntaxTree_la-debugvisitor.lo \
 +      libsciabstractSyntaxTree_la-mutevisitor.lo \
 +      libsciabstractSyntaxTree_la-shortcutvisitor.lo
 +libsciabstractSyntaxTree_la_OBJECTS =  \
 +      $(am_libsciabstractSyntaxTree_la_OBJECTS)
 +libsciabstractSyntaxTree_la_LINK = $(LIBTOOL) --tag=CXX \
 +      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) \
 +      $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testConstExp_OBJECTS = testConstExp-testConstExp.$(OBJEXT)
 +testConstExp_OBJECTS = $(am_testConstExp_OBJECTS)
 +testConstExp_DEPENDENCIES = $(check_LDADD)
 +testConstExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testConstExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +am_testControlExp_OBJECTS = testControlExp-testControlExp.$(OBJEXT)
 +testControlExp_OBJECTS = $(am_testControlExp_OBJECTS)
 +testControlExp_DEPENDENCIES = $(check_LDADD)
 +testControlExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 +      $(testControlExp_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +am_testVarExp_OBJECTS = testVarExp-testVarExp.$(OBJEXT)
 +testVarExp_OBJECTS = $(am_testVarExp_OBJECTS)
 +testVarExp_DEPENDENCIES = $(check_LDADD)
 +testVarExp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(testVarExp_CXXFLAGS) \
 +      $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
 +depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 +am__depfiles_maybe = depfiles
 +am__mv = mv -f
 +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 +      $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 +      --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 +      $(LDFLAGS) -o $@
 +SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +DIST_SOURCES = $(libsciabstractSyntaxTree_la_SOURCES) \
 +      $(testConstExp_SOURCES) $(testControlExp_SOURCES) \
 +      $(testVarExp_SOURCES)
 +HEADERS = $(libsciabstractSyntaxTree_la_include_HEADERS)
 +ETAGS = etags
 +CTAGS = ctags
 +am__tty_colors = \
 +red=; grn=; lgn=; blu=; std=
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +ALL_LINGUAS = @ALL_LINGUAS@
 +AMTAR = @AMTAR@
 +ANT = @ANT@
 +ANTLR = @ANTLR@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
 +AWK = @AWK@
 +BATIK = @BATIK@
 +BLAS_LIBS = @BLAS_LIBS@
 +BSH = @BSH@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CHECKSTYLE = @CHECKSTYLE@
 +COMMONS_BEANUTILS = @COMMONS_BEANUTILS@
 +COMMONS_IO = @COMMONS_IO@
 +COMMONS_LOGGING = @COMMONS_LOGGING@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEMOTOOLS_ENABLE = @DEMOTOOLS_ENABLE@
 +DEPDIR = @DEPDIR@
 +DOCBOOK_ROOT = @DOCBOOK_ROOT@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +F77 = @F77@
 +FFLAGS = @FFLAGS@
 +FFTW3_LIB = @FFTW3_LIB@
 +FFTW_ENABLE = @FFTW_ENABLE@
 +FGREP = @FGREP@
 +FLEXDOCK = @FLEXDOCK@
 +FLIBS = @FLIBS@
 +FOP = @FOP@
 +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 +GIWS_BIN = @GIWS_BIN@
 +GLUEGEN_RT = @GLUEGEN_RT@
 +GMSGFMT = @GMSGFMT@
 +GMSGFMT_015 = @GMSGFMT_015@
 +GRAPHICS_ENABLE = @GRAPHICS_ENABLE@
 +GREP = @GREP@
 +GUI_ENABLE = @GUI_ENABLE@
 +HDF5_CFLAGS = @HDF5_CFLAGS@
 +HDF5_ENABLE = @HDF5_ENABLE@
 +HDF5_LIBS = @HDF5_LIBS@
 +HELP_ENABLE = @HELP_ENABLE@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +INTLLIBS = @INTLLIBS@
 +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 +JAR = @JAR@
 +JAVA = @JAVA@
 +JAVAC = @JAVAC@
 +JAVAH = @JAVAH@
 +JAVASCI_ENABLE = @JAVASCI_ENABLE@
 +JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
 +JAVA_ENABLE = @JAVA_ENABLE@
 +JAVA_G = @JAVA_G@
 +JAVA_HOME = @JAVA_HOME@
 +JAVA_JNI_INCLUDE = @JAVA_JNI_INCLUDE@
 +JAVA_JNI_LIBS = @JAVA_JNI_LIBS@
 +JDB = @JDB@
 +JEUCLID_CORE = @JEUCLID_CORE@
 +JGRAPHX = @JGRAPHX@
 +JHALL = @JHALL@
 +JHDF5 = @JHDF5@
 +JLATEXMATH = @JLATEXMATH@
 +JLATEXMATH_FOP = @JLATEXMATH_FOP@
 +JOGL = @JOGL@
 +JROSETTA_API = @JROSETTA_API@
 +JROSETTA_ENGINE = @JROSETTA_ENGINE@
 +JUNIT = @JUNIT@
 +LAPACK_LIBS = @LAPACK_LIBS@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LEX = @LEX@
 +LEXLIB = @LEXLIB@
 +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 +LIBICONV = @LIBICONV@
 +LIBINTL = @LIBINTL@
 +LIBM = @LIBM@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOOKS = @LOOKS@
 +LTLIBICONV = @LTLIBICONV@
 +LTLIBINTL = @LTLIBINTL@
 +LTLIBOBJS = @LTLIBOBJS@
 +MAINT = @MAINT@
 +MAKEINFO = @MAKEINFO@
 +MATIO_CFLAGS = @MATIO_CFLAGS@
 +MATIO_ENABLE = @MATIO_ENABLE@
 +MATIO_LIBS = @MATIO_LIBS@
 +MKDIR_P = @MKDIR_P@
 +MSGCAT = @MSGCAT@
 +MSGFMT = @MSGFMT@
 +MSGFMT_015 = @MSGFMT_015@
 +MSGMERGE = @MSGMERGE@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OCAMLC = @OCAMLC@
 +OCAMLDEP = @OCAMLDEP@
 +OCAMLLEX = @OCAMLLEX@
 +OCAMLOPT = @OCAMLOPT@
 +OCAMLYACC = @OCAMLYACC@
++OPENMP_CFLAGS = @OPENMP_CFLAGS@
++OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
++OPENMP_ENABLE = @OPENMP_ENABLE@
++OPENMP_LIBS = @OPENMP_LIBS@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PCRE_CFLAGS = @PCRE_CFLAGS@
 +PCRE_CONFIG = @PCRE_CONFIG@
 +PCRE_LIBS = @PCRE_LIBS@
 +PCRE_VERSION = @PCRE_VERSION@
 +PKG_CONFIG = @PKG_CONFIG@
 +POSUB = @POSUB@
 +POW_LIB = @POW_LIB@
 +PVMGETARCH = @PVMGETARCH@
 +PVM_ARCH = @PVM_ARCH@
 +PVM_ENABLE = @PVM_ENABLE@
 +PVM_INCLUDE = @PVM_INCLUDE@
 +PVM_LIB = @PVM_LIB@
 +PYTHON = @PYTHON@
 +QDOX = @QDOX@
 +RANLIB = @RANLIB@
 +RELOCATABLE = @RELOCATABLE@
 +RT_LIB = @RT_LIB@
 +SAXON = @SAXON@
 +SCICOS_ENABLE = @SCICOS_ENABLE@
 +SCILAB_LIBRARY_VERSION = @SCILAB_LIBRARY_VERSION@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SET_RELOCATABLE = @SET_RELOCATABLE@
 +SHELL = @SHELL@
 +SKINLF = @SKINLF@
 +SPLINT = @SPLINT@
 +STRIP = @STRIP@
 +SWIG_BIN = @SWIG_BIN@
 +SWIG_JAVA = @SWIG_JAVA@
 +SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
 +TCLTK_LIBS = @TCLTK_LIBS@
 +TCL_INC_PATH = @TCL_INC_PATH@
 +TESTNG = @TESTNG@
 +TK_INC_PATH = @TK_INC_PATH@
 +UMFPACK_ENABLE = @UMFPACK_ENABLE@
 +UMFPACK_LIB = @UMFPACK_LIB@
 +USE_NLS = @USE_NLS@
 +VERSION = @VERSION@
 +WITH_OCAML = @WITH_OCAML@
 +WITH_TKSCI = @WITH_TKSCI@
 +XGETTEXT = @XGETTEXT@
 +XGETTEXT_015 = @XGETTEXT_015@
 +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 +XMKMF = @XMKMF@
 +XMLGRAPHICS_COMMONS = @XMLGRAPHICS_COMMONS@
 +XML_APIS_EXT = @XML_APIS_EXT@
 +XML_CONFIG = @XML_CONFIG@
 +XML_FLAGS = @XML_FLAGS@
 +XML_LIBS = @XML_LIBS@
 +XML_VERSION = @XML_VERSION@
 +X_CFLAGS = @X_CFLAGS@
 +X_EXTRA_LIBS = @X_EXTRA_LIBS@
 +X_LIBS = @X_LIBS@
 +X_PRE_LIBS = @X_PRE_LIBS@
 +YACC = @YACC@
 +YFLAGS = @YFLAGS@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +ac_ct_F77 = @ac_ct_F77@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +cxx_present = @cxx_present@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
 +pkglib_LTLIBRARIES = libsciabstractSyntaxTree.la
 +libsciabstractSyntaxTree_la_SOURCES = src/cpp/libAst.cpp \
 +                              src/cpp/visitor_common.cpp \
 +                              src/cpp/printvisitor.cpp \
 +                              src/cpp/debugvisitor.cpp \
 +                              src/cpp/mutevisitor.cpp \
 +                              src/cpp/shortcutvisitor.cpp
 +
 +libsciabstractSyntaxTree_la_CXXFLAGS = -I$(top_srcdir)/modules/symbol/includes \
 +                      -I $(top_srcdir)/modules/types/includes \
 +                      -I $(top_srcdir)/modules/functions_manager/includes \
 +                      -I $(top_srcdir)/modules/elementary_functions/includes \
 +                      -I $(top_srcdir)/modules/operations/includes \
 +                      -I $(top_srcdir)/modules/output_stream/includes \
 +                      -I includes \
 +                      -I src/cpp
 +
 +libsciabstractSyntaxTree_la_includedir = $(pkgincludedir)/abstractSyntaxTree
 +libsciabstractSyntaxTree_la_include_HEADERS = 
 +
 +####################
 +####################
 +check_INCLUDES = -I$(top_srcdir)/modules/symbol/includes \
 +                      -Iincludes/ \
 +                      -Isrc/cpp
 +
 +check_LDADD = $(top_builddir)/modules/symbol/libsciSymbol.la \
 +                      $(top_builddir)/modules/abstractSyntaxTree/libsciabstractSyntaxTree.la \
 +                      $(top_builddir)/modules/types/libsciTypes.la
 +
 +testConstExp_SOURCES = src/cpp/testConstExp.cpp
 +testConstExp_CXXFLAGS = $(check_INCLUDES)
 +testConstExp_LDADD = $(check_LDADD)
 +testVarExp_SOURCES = src/cpp/testVarExp.cpp
 +testVarExp_CXXFLAGS = $(check_INCLUDES)
 +testVarExp_LDADD = $(check_LDADD)
 +testControlExp_SOURCES = src/cpp/testControlExp.cpp
 +testControlExp_CXXFLAGS = $(check_INCLUDES)
 +testControlExp_LDADD = $(check_LDADD)
 +all: all-am
 +
 +.SUFFIXES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +      @for dep in $?; do \
 +        case '$(am__configure_deps)' in \
 +          *$$dep*) \
 +            ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 +              && { if test -f $@; then exit 0; else break; fi; }; \
 +            exit 1;; \
 +        esac; \
 +      done; \
 +      echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile'; \
 +      $(am__cd) $(top_srcdir) && \
 +        $(AUTOMAKE) --foreign modules/abstractSyntaxTree/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +      @case '$?' in \
 +        *config.status*) \
 +          cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 +        *) \
 +          echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +          cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +      esac;
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
 +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      list2=; for p in $$list; do \
 +        if test -f $$p; then \
 +          list2="$$list2 $$p"; \
 +        else :; fi; \
 +      done; \
 +      test -z "$$list2" || { \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
 +      }
 +
 +uninstall-pkglibLTLIBRARIES:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +      for p in $$list; do \
 +        $(am__strip_dir) \
 +        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
 +        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
 +      done
 +
 +clean-pkglibLTLIBRARIES:
 +      -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
 +      @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 +        dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +        test "$$dir" != "$$p" || dir=.; \
 +        echo "rm -f \"$${dir}/so_locations\""; \
 +        rm -f "$${dir}/so_locations"; \
 +      done
 +libsciabstractSyntaxTree.la: $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_DEPENDENCIES) 
 +      $(libsciabstractSyntaxTree_la_LINK) -rpath $(pkglibdir) $(libsciabstractSyntaxTree_la_OBJECTS) $(libsciabstractSyntaxTree_la_LIBADD) $(LIBS)
 +
 +clean-checkPROGRAMS:
 +      @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list || exit $$?; \
 +      test -n "$(EXEEXT)" || exit 0; \
 +      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +      echo " rm -f" $$list; \
 +      rm -f $$list
 +testConstExp$(EXEEXT): $(testConstExp_OBJECTS) $(testConstExp_DEPENDENCIES) 
 +      @rm -f testConstExp$(EXEEXT)
 +      $(testConstExp_LINK) $(testConstExp_OBJECTS) $(testConstExp_LDADD) $(LIBS)
 +testControlExp$(EXEEXT): $(testControlExp_OBJECTS) $(testControlExp_DEPENDENCIES) 
 +      @rm -f testControlExp$(EXEEXT)
 +      $(testControlExp_LINK) $(testControlExp_OBJECTS) $(testControlExp_LDADD) $(LIBS)
 +testVarExp$(EXEEXT): $(testVarExp_OBJECTS) $(testVarExp_DEPENDENCIES) 
 +      @rm -f testVarExp$(EXEEXT)
 +      $(testVarExp_LINK) $(testVarExp_OBJECTS) $(testVarExp_LDADD) $(LIBS)
 +
 +mostlyclean-compile:
 +      -rm -f *.$(OBJEXT)
 +
 +distclean-compile:
 +      -rm -f *.tab.c
 +
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testConstExp-testConstExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testControlExp-testControlExp.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testVarExp-testVarExp.Po@am__quote@
 +
 +.cpp.o:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ $<
 +
 +.cpp.obj:
 +@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 +
 +.cpp.lo:
 +@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LTCXXCOMPILE) -c -o $@ $<
 +
 +libsciabstractSyntaxTree_la-libAst.lo: src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-libAst.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-libAst.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/libAst.cpp' object='libsciabstractSyntaxTree_la-libAst.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-libAst.lo `test -f 'src/cpp/libAst.cpp' || echo '$(srcdir)/'`src/cpp/libAst.cpp
 +
 +libsciabstractSyntaxTree_la-visitor_common.lo: src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-visitor_common.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-visitor_common.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/visitor_common.cpp' object='libsciabstractSyntaxTree_la-visitor_common.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-visitor_common.lo `test -f 'src/cpp/visitor_common.cpp' || echo '$(srcdir)/'`src/cpp/visitor_common.cpp
 +
 +libsciabstractSyntaxTree_la-printvisitor.lo: src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-printvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-printvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/printvisitor.cpp' object='libsciabstractSyntaxTree_la-printvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-printvisitor.lo `test -f 'src/cpp/printvisitor.cpp' || echo '$(srcdir)/'`src/cpp/printvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-debugvisitor.lo: src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-debugvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-debugvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/debugvisitor.cpp' object='libsciabstractSyntaxTree_la-debugvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-debugvisitor.lo `test -f 'src/cpp/debugvisitor.cpp' || echo '$(srcdir)/'`src/cpp/debugvisitor.cpp
 +
 +libsciabstractSyntaxTree_la-mutevisitor.lo: src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-mutevisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-mutevisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/mutevisitor.cpp' object='libsciabstractSyntaxTree_la-mutevisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-mutevisitor.lo `test -f 'src/cpp/mutevisitor.cpp' || echo '$(srcdir)/'`src/cpp/mutevisitor.cpp
 +
 +libsciabstractSyntaxTree_la-shortcutvisitor.lo: src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -MT libsciabstractSyntaxTree_la-shortcutvisitor.lo -MD -MP -MF $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Tpo $(DEPDIR)/libsciabstractSyntaxTree_la-shortcutvisitor.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/shortcutvisitor.cpp' object='libsciabstractSyntaxTree_la-shortcutvisitor.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciabstractSyntaxTree_la_CXXFLAGS) $(CXXFLAGS) -c -o libsciabstractSyntaxTree_la-shortcutvisitor.lo `test -f 'src/cpp/shortcutvisitor.cpp' || echo '$(srcdir)/'`src/cpp/shortcutvisitor.cpp
 +
 +testConstExp-testConstExp.o: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.o -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.o `test -f 'src/cpp/testConstExp.cpp' || echo '$(srcdir)/'`src/cpp/testConstExp.cpp
 +
 +testConstExp-testConstExp.obj: src/cpp/testConstExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -MT testConstExp-testConstExp.obj -MD -MP -MF $(DEPDIR)/testConstExp-testConstExp.Tpo -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testConstExp-testConstExp.Tpo $(DEPDIR)/testConstExp-testConstExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testConstExp.cpp' object='testConstExp-testConstExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testConstExp_CXXFLAGS) $(CXXFLAGS) -c -o testConstExp-testConstExp.obj `if test -f 'src/cpp/testConstExp.cpp'; then $(CYGPATH_W) 'src/cpp/testConstExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testConstExp.cpp'; fi`
 +
 +testControlExp-testControlExp.o: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.o -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.o `test -f 'src/cpp/testControlExp.cpp' || echo '$(srcdir)/'`src/cpp/testControlExp.cpp
 +
 +testControlExp-testControlExp.obj: src/cpp/testControlExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -MT testControlExp-testControlExp.obj -MD -MP -MF $(DEPDIR)/testControlExp-testControlExp.Tpo -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testControlExp-testControlExp.Tpo $(DEPDIR)/testControlExp-testControlExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testControlExp.cpp' object='testControlExp-testControlExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testControlExp_CXXFLAGS) $(CXXFLAGS) -c -o testControlExp-testControlExp.obj `if test -f 'src/cpp/testControlExp.cpp'; then $(CYGPATH_W) 'src/cpp/testControlExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testControlExp.cpp'; fi`
 +
 +testVarExp-testVarExp.o: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.o -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.o' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.o `test -f 'src/cpp/testVarExp.cpp' || echo '$(srcdir)/'`src/cpp/testVarExp.cpp
 +
 +testVarExp-testVarExp.obj: src/cpp/testVarExp.cpp
 +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -MT testVarExp-testVarExp.obj -MD -MP -MF $(DEPDIR)/testVarExp-testVarExp.Tpo -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/testVarExp-testVarExp.Tpo $(DEPDIR)/testVarExp-testVarExp.Po
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/testVarExp.cpp' object='testVarExp-testVarExp.obj' libtool=no @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 +@am__fastdepCXX_FALSE@        $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testVarExp_CXXFLAGS) $(CXXFLAGS) -c -o testVarExp-testVarExp.obj `if test -f 'src/cpp/testVarExp.cpp'; then $(CYGPATH_W) 'src/cpp/testVarExp.cpp'; else $(CYGPATH_W) '$(srcdir)/src/cpp/testVarExp.cpp'; fi`
 +
 +mostlyclean-libtool:
 +      -rm -f *.lo
 +
 +clean-libtool:
 +      -rm -rf .libs _libs
 +install-libsciabstractSyntaxTree_la_includeHEADERS: $(libsciabstractSyntaxTree_la_include_HEADERS)
 +      @$(NORMAL_INSTALL)
 +      test -z "$(libsciabstractSyntaxTree_la_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      for p in $$list; do \
 +        if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +        echo "$$d$$p"; \
 +      done | $(am__base_list) | \
 +      while read files; do \
 +        echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)'"; \
 +        $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" || exit $$?; \
 +      done
 +
 +uninstall-libsciabstractSyntaxTree_la_includeHEADERS:
 +      @$(NORMAL_UNINSTALL)
 +      @list='$(libsciabstractSyntaxTree_la_include_HEADERS)'; test -n "$(libsciabstractSyntaxTree_la_includedir)" || list=; \
 +      files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +      test -n "$$files" || exit 0; \
 +      echo " ( cd '$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)' && rm -f" $$files ")"; \
 +      cd "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)" && rm -f $$files
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +      list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      mkid -fID $$unique
 +tags: TAGS
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      set x; \
 +      here=`pwd`; \
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      shift; \
 +      if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +        test -n "$$unique" || unique=$$empty_fix; \
 +        if test $$# -gt 0; then \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            "$$@" $$unique; \
 +        else \
 +          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +            $$unique; \
 +        fi; \
 +      fi
 +ctags: CTAGS
 +CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +              $(TAGS_FILES) $(LISP)
 +      list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +      unique=`for i in $$list; do \
 +          if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +        done | \
 +        $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 +            END { if (nonempty) { for (i in files) print i; }; }'`; \
 +      test -z "$(CTAGS_ARGS)$$unique" \
 +        || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +           $$unique
 +
 +GTAGS:
 +      here=`$(am__cd) $(top_builddir) && pwd` \
 +        && $(am__cd) $(top_srcdir) \
 +        && gtags -i $(GTAGS_ARGS) "$$here"
 +
 +distclean-tags:
 +      -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +
 +check-TESTS: $(TESTS)
 +      @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 +      srcdir=$(srcdir); export srcdir; \
 +      list=' $(TESTS) '; \
 +      $(am__tty_colors); \
 +      if test -n "$$list"; then \
 +        for tst in $$list; do \
 +          if test -f ./$$tst; then dir=./; \
 +          elif test -f $$tst; then dir=; \
 +          else dir="$(srcdir)/"; fi; \
 +          if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xpass=`expr $$xpass + 1`; \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=XPASS; \
 +            ;; \
 +            *) \
 +              col=$$grn; res=PASS; \
 +            ;; \
 +            esac; \
 +          elif test $$? -ne 77; then \
 +            all=`expr $$all + 1`; \
 +            case " $(XFAIL_TESTS) " in \
 +            *[\ \     ]$$tst[\ \      ]*) \
 +              xfail=`expr $$xfail + 1`; \
 +              col=$$lgn; res=XFAIL; \
 +            ;; \
 +            *) \
 +              failed=`expr $$failed + 1`; \
 +              col=$$red; res=FAIL; \
 +            ;; \
 +            esac; \
 +          else \
 +            skip=`expr $$skip + 1`; \
 +            col=$$blu; res=SKIP; \
 +          fi; \
 +          echo "$${col}$$res$${std}: $$tst"; \
 +        done; \
 +        if test "$$all" -eq 1; then \
 +          tests="test"; \
 +          All=""; \
 +        else \
 +          tests="tests"; \
 +          All="All "; \
 +        fi; \
 +        if test "$$failed" -eq 0; then \
 +          if test "$$xfail" -eq 0; then \
 +            banner="$$All$$all $$tests passed"; \
 +          else \
 +            if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 +            banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 +          fi; \
 +        else \
 +          if test "$$xpass" -eq 0; then \
 +            banner="$$failed of $$all $$tests failed"; \
 +          else \
 +            if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 +            banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 +          fi; \
 +        fi; \
 +        dashes="$$banner"; \
 +        skipped=""; \
 +        if test "$$skip" -ne 0; then \
 +          if test "$$skip" -eq 1; then \
 +            skipped="($$skip test was not run)"; \
 +          else \
 +            skipped="($$skip tests were not run)"; \
 +          fi; \
 +          test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$skipped"; \
 +        fi; \
 +        report=""; \
 +        if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 +          report="Please report to $(PACKAGE_BUGREPORT)"; \
 +          test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 +            dashes="$$report"; \
 +        fi; \
 +        dashes=`echo "$$dashes" | sed s/./=/g`; \
 +        if test "$$failed" -eq 0; then \
 +          echo "$$grn$$dashes"; \
 +        else \
 +          echo "$$red$$dashes"; \
 +        fi; \
 +        echo "$$banner"; \
 +        test -z "$$skipped" || echo "$$skipped"; \
 +        test -z "$$report" || echo "$$report"; \
 +        echo "$$dashes$$std"; \
 +        test "$$failed" -eq 0; \
 +      else :; fi
 +
 +distdir: $(DISTFILES)
 +      @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +      list='$(DISTFILES)'; \
 +        dist_files=`for file in $$list; do echo $$file; done | \
 +        sed -e "s|^$$srcdirstrip/||;t" \
 +            -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +      case $$dist_files in \
 +        */*) $(MKDIR_P) `echo "$$dist_files" | \
 +                         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +                         sort -u` ;; \
 +      esac; \
 +      for file in $$dist_files; do \
 +        if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +        if test -d $$d/$$file; then \
 +          dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +          if test -d "$(distdir)/$$file"; then \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +            cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +            find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +          fi; \
 +          cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +        else \
 +          test -f "$(distdir)/$$file" \
 +          || cp -p $$d/$$file "$(distdir)/$$file" \
 +          || exit 1; \
 +        fi; \
 +      done
 +check-am: all-am
 +      $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 +      $(MAKE) $(AM_MAKEFLAGS) check-TESTS
 +check: check-am
 +all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 +installdirs:
 +      for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(libsciabstractSyntaxTree_la_includedir)"; do \
 +        test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +      done
 +install: install-am
 +install-exec: install-exec-am
 +install-data: install-data-am
 +uninstall: uninstall-am
 +
 +install-am: all-am
 +      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-am
 +install-strip:
 +      $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +        install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +        `test -z '$(STRIP)' || \
 +          echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 +mostlyclean-generic:
 +
 +clean-generic:
 +
 +distclean-generic:
 +      -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +      -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +
 +maintainer-clean-generic:
 +      @echo "This command is intended for maintainers to use"
 +      @echo "it deletes files that may require special tools to rebuild."
 +clean: clean-am
 +
 +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES mostlyclean-am
 +
 +distclean: distclean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +      distclean-tags
 +
 +dvi: dvi-am
 +
 +dvi-am:
 +
 +html: html-am
 +
 +html-am:
 +
 +info: info-am
 +
 +info-am:
 +
 +install-data-am: install-libsciabstractSyntaxTree_la_includeHEADERS
 +
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
 +
 +install-exec-am: install-pkglibLTLIBRARIES
 +
 +install-html: install-html-am
 +
 +install-html-am:
 +
 +install-info: install-info-am
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-am
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-am
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-am
 +      -rm -rf ./$(DEPDIR)
 +      -rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-am
 +
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +      mostlyclean-libtool
 +
 +pdf: pdf-am
 +
 +pdf-am:
 +
 +ps: ps-am
 +
 +ps-am:
 +
 +uninstall-am: uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +.MAKE: check-am install-am install-strip
 +
 +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 +      clean-checkPROGRAMS clean-generic clean-libtool \
 +      clean-pkglibLTLIBRARIES ctags distclean distclean-compile \
 +      distclean-generic distclean-libtool distclean-tags distdir dvi \
 +      dvi-am html html-am info info-am install install-am \
 +      install-data install-data-am install-dvi install-dvi-am \
 +      install-exec install-exec-am install-html install-html-am \
 +      install-info install-info-am \
 +      install-libsciabstractSyntaxTree_la_includeHEADERS install-man \
 +      install-pdf install-pdf-am install-pkglibLTLIBRARIES \
 +      install-ps install-ps-am install-strip installcheck \
 +      installcheck-am installdirs maintainer-clean \
 +      maintainer-clean-generic mostlyclean mostlyclean-compile \
 +      mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 +      tags uninstall uninstall-am \
 +      uninstall-libsciabstractSyntaxTree_la_includeHEADERS \
 +      uninstall-pkglibLTLIBRARIES
 +
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
@@@ -18,11 -23,12 +23,16 @@@ src/jni/GiwsException.cp
  # List of the gateway c files
  CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
  
+ GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
+ GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
  #### SWIG Declaration ####
  SWIG_WRAPPERS = src/jni/InterpreterManagement.i
++
 +else
 +# List of the c files
 +ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c
  endif
  
  if SWIG
@@@ -117,21 -130,28 +130,31 @@@ libsciaction_binding_la_DEPENDENCIES 
        $(top_builddir)/libs/MALLOC/libscimalloc.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la
  am__libsciaction_binding_la_SOURCES_DIST =  \
 +      src/noaction_binding/noaction_binding.c \
-       src/c/InterpreterManagement.c \
-       src/jni/InterpreterManagement_wrap.c
+       src/c/InterpreterManagement.c src/jni/Signal.cpp \
+       src/jni/Signal.hxx src/jni/GiwsException.cpp \
+       src/jni/InterpreterManagement_wrap.c \
+       sci_gateway/c/gw_action_binding.c \
+       sci_gateway/cpp/sci_notify.cpp
 +@GUI_FALSE@am__objects_1 =  \
 +@GUI_FALSE@   libsciaction_binding_la-noaction_binding.lo
  @GUI_TRUE@am__objects_1 =  \
  @GUI_TRUE@    libsciaction_binding_la-InterpreterManagement.lo
- @GUI_TRUE@am__objects_2 = libsciaction_binding_la-InterpreterManagement_wrap.lo
- am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+ @GUI_TRUE@am__objects_2 = libsciaction_binding_la-Signal.lo \
+ @GUI_TRUE@    libsciaction_binding_la-GiwsException.lo
+ @GUI_TRUE@am__objects_3 = libsciaction_binding_la-InterpreterManagement_wrap.lo
+ @GUI_TRUE@am__objects_4 =  \
+ @GUI_TRUE@    libsciaction_binding_la-gw_action_binding.lo
+ @GUI_TRUE@am__objects_5 = libsciaction_binding_la-sci_notify.lo
+ am_libsciaction_binding_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+       $(am__objects_3) $(am__objects_4) $(am__objects_5)
  libsciaction_binding_la_OBJECTS =  \
        $(am_libsciaction_binding_la_OBJECTS)
- libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-       $(libsciaction_binding_la_CFLAGS) $(CFLAGS) \
-       $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o $@
+ libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(libsciaction_binding_la_LDFLAGS) $(LDFLAGS) -o \
+       $@
+ @GUI_TRUE@am_libsciaction_binding_la_rpath = -rpath $(pkglibdir)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
@@@ -398,16 -428,21 +436,25 @@@ target_alias = @target_alias
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 +yacc_present = @yacc_present@
  @GUI_TRUE@USEANT = 1
  # List of the c files
 +@GUI_FALSE@ACTION_BINDING_C_SOURCES = src/noaction_binding/noaction_binding.c
 +
 +# List of the c files
  @GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
  
+ # List of the c++ file
+ @GUI_TRUE@ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
+ @GUI_TRUE@src/jni/Signal.hxx \
+ @GUI_TRUE@src/jni/GiwsException.cpp
  # List of the gateway c files
  @GUI_TRUE@CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
+ @GUI_TRUE@GATEWAY_C_SOURCES = sci_gateway/c/gw_action_binding.c
+ @GUI_TRUE@GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_notify.cpp
  
  #### SWIG Declaration ####
  @GUI_TRUE@SWIG_WRAPPERS = src/jni/InterpreterManagement.i
@@@ -587,9 -649,13 +661,14 @@@ mostlyclean-compile
  distclean-compile:
        -rm -f *.tab.c
  
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-GiwsException.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-InterpreterManagement_wrap.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-Signal.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-gw_action_binding.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsciaction_binding_la-sci_notify.Plo@am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
  
+ libsciaction_binding_disable_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_disable_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
+ @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_disable_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
 +libsciaction_binding_la-noaction_binding.lo: src/noaction_binding/noaction_binding.c
- @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
++@am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-noaction_binding.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
 +@am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_la-noaction_binding.Plo
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/noaction_binding/noaction_binding.c' object='libsciaction_binding_la-noaction_binding.lo' libtool=yes @AMDEPBACKSLASH@
 +@AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
++@am__fastdepCC_FALSE@ $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -c -o libsciaction_binding_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.c' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.c
 +
  libsciaction_binding_la-InterpreterManagement.lo: src/c/InterpreterManagement.c
- @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
+ @am__fastdepCC_TRUE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(libsciaction_binding_la_CFLAGS) $(CFLAGS) -MT libsciaction_binding_la-InterpreterManagement.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo -c -o libsciaction_binding_la-InterpreterManagement.lo `test -f 'src/c/InterpreterManagement.c' || echo '$(srcdir)/'`src/c/InterpreterManagement.c
  @am__fastdepCC_TRUE@  $(am__mv) $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Tpo $(DEPDIR)/libsciaction_binding_la-InterpreterManagement.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     source='src/c/InterpreterManagement.c' object='libsciaction_binding_la-InterpreterManagement.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
index 0000000,3029f00..4b75535
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,23 +1,23 @@@
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2010 - DIGITEO - Allan SIMON
+ * 
+ * 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    
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+ #ifndef __GW_ACTION_BINDING__
+ #define __GW_ACTION_BINDING__
+ /*--------------------------------------------------------------------------*/
+ #include "dynlib_action_binding.h"
+ /*--------------------------------------------------------------------------*/
+ ACTION_BINDING_IMPEXP int gw_action_binding(void);
 -ACTION_BINDING_IMPEXP int sci_notify(char* fname, unsigned long l);
++ACTION_BINDING_IMPEXP int sci_notify(char *fname, int*_piKey);
+ /*--------------------------------------------------------------------------*/
+ #endif /* __GW_ACTION_BINDING__ */
+ /*--------------------------------------------------------------------------*/
index 0000000,b908024..25f494e
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,115 +1,116 @@@
+ /*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009 - DIGITEO - Vincent COUVERT
+ *
+ * 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
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+ /*--------------------------------------------------------------------------*/
+ #include "Signal.hxx"
+ extern "C"
+ {
+ #include "gw_action_binding.h"
+ #include "stack-c.h"
+ #include "api_common.h"
+ #include "api_string.h"
+ #include "localization.h"
+ #include "Scierror.h"
+ #include "MALLOC.h"
+ #include "freeArrayOfString.h"
+ #include "getScilabJavaVM.h"
++#include "api_oldstack.h"
+ }
+ /*--------------------------------------------------------------------------*/
+ using namespace org_scilab_modules_action_binding_utils;
+ /*--------------------------------------------------------------------------*/
 -int sci_notify(char *fname,unsigned long fname_len)
++int sci_notify(char *fname, int*_piKey)
+ {
+       CheckRhs(1,1);
+       CheckLhs(0,1);
+       int m1 = 0, n1 = 0;
+       int *piAddressVarOne = NULL;
+       char **pStVarOne = NULL;
+       int *lenStVarOne = NULL;
+       int iType = 0;
+       SciErr sciErr;
 -      sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddressVarOne);
++      sciErr = getVarAddressFromPosition(_piKey, 1, &piAddressVarOne);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
 -      sciErr = getVarType(pvApiCtx, piAddressVarOne, &iType);
++      sciErr = getVarType(_piKey, piAddressVarOne, &iType);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
+       if ( iType != sci_strings )
+       {
+               Scierror(999,_("%s: Wrong type for input argument #%d: A string expected.\n"),fname,1);
+               return 0;
+       }
+       /* get dimensions */
 -      sciErr = getMatrixOfString(pvApiCtx, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
++      sciErr = getMatrixOfString(_piKey, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
+       if ( m1 * n1 != 1 )
+       {
+               Scierror(999,_("%s: Wrong type for input argument #%d: A string expected.\n"),fname,1);
+               return 0;
+       }
+       lenStVarOne = (int*)MALLOC(sizeof(int));
+       if (lenStVarOne == NULL)
+       {
+               Scierror(999,_("%s: No more memory.\n"), fname);
+               return 0;
+       }
+       /* get lengths */
 -      sciErr = getMatrixOfString(pvApiCtx, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
++      sciErr = getMatrixOfString(_piKey, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
+       pStVarOne = (char **)MALLOC(sizeof(char*));
+       if (pStVarOne == NULL)
+       {
+               Scierror(999,_("%s: No more memory.\n"), fname);
+               return 0;
+       }
+       pStVarOne[0] = (char*)MALLOC(sizeof(char*) * (lenStVarOne[0] + 1));
+       /* get strings */
 -      sciErr = getMatrixOfString(pvApiCtx, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
++      sciErr = getMatrixOfString(_piKey, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
+       if(sciErr.iErr)
+       {
+               printError(&sciErr, 0);
+               return 0;
+       }
+       Signal::notify(getScilabJavaVM(), pStVarOne[0]);
+       freeArrayOfString(pStVarOne, 1);
+       LhsVar(1) = 0;
+       PutLhsVar();
+       return 0;
+ }
+ /*--------------------------------------------------------------------------*/
Simple merge
  extern "C" {
  #endif
  
 -/*******************************/
++
 +#include "dynlib_api_scilab.h"
 +/*****************************/
  /*   string matrix functions   */
- /*****************************/
+ /*******************************/
  
  /**
   * Get strings variable data
Simple merge
Simple merge
Simple merge
Simple merge
   *
   */
  #include <stdio.h>
+ #include <stdlib.h>
  #include "call_scilab.h"
  #include "MALLOC.h"
 -#include "scilabmode.h"
 +#include "sci_mode.h"
  #include "fromc.h"
  #include "LaunchScilabSignal.h"
  #include "localization.h"
Simple merge
@@@ -74,8 -74,8 +74,9 @@@ libsciconsole_la_CFLAGS=      $(JAVA_JNI_I
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
 -                              -I$(top_srcdir)/modules/fileio/includes \
 -                              -I$(top_srcdir)/modules/output_stream/includes
 +                              -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/system_env/includes
++                              -I$(top_srcdir)/modules/system_env/includes \
++                              -I$(top_srcdir)/modules/fileio/includes 
  
  # Name of the library
  pkglib_LTLIBRARIES = libsciconsole-disable.la
@@@ -480,8 -481,8 +487,9 @@@ libsciconsole_la_CFLAGS = $(JAVA_JNI_IN
                                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
 -                              -I$(top_srcdir)/modules/fileio/includes \
 -                              -I$(top_srcdir)/modules/output_stream/includes
 +                              -I$(top_srcdir)/modules/output_stream/includes \
-                               -I$(top_srcdir)/modules/system_env/includes
++                              -I$(top_srcdir)/modules/system_env/includes \
++                              -I$(top_srcdir)/modules/fileio/includes 
  
  
  # Name of the library
@@@ -45,7 -45,7 +45,7 @@@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
++                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes;../../../fileio/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
++                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes;../../../fileio/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
++                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes;../../../fileio/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../fileio/includes;../../../localization/includes;../../../windows_tools/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
++                              AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../windows_tools/includes;../../../system_env/includes;../../../fileio/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
@@@ -362,10 -357,14 +362,11 @@@ includes/getos.h 
  includes/machine.h \
  includes/mode_exec.h \
  includes/PATH_MAX.h \
 -includes/SCIHOME.h \
  includes/scilabDefaults.h \
 -includes/scilabmode.h \
  includes/scisparse.h \
  includes/sciquit.h \
 -includes/setgetSCIpath.h \
  includes/stack-c.h \
+ includes/sci_types.h \
  includes/stack-def.h \
  includes/stack.h \
  includes/stack1.h \
@@@ -288,36 -298,36 +291,36 @@@ am__objects_4 = clunit.lo getlin.lo all
        logops.lo atome.lo hndlops.lo cmplxt.lo skpins.lo folhp.lo \
        cvname.lo funs.lo fact.lo inibrk.lo typ2cod.lo prompt.lo \
        intstr.lo createref.lo btof.lo matzs.lo getnum.lo btofm.lo \
-       getsym.lo findequal.lo stackg.lo find.lo israt.lo setlnb.lo \
-       mrknmd.lo stackgl.lo allops.lo mname.lo command.lo ref2val.lo \
-       stack.lo isbrk.lo majmin.lo xerbla.lo dtosci.lo bexec.lo \
-       varfunptr.lo getfun.lo savlod.lo error.lo cvdm.lo tradsl.lo \
-       mkindx.lo whatln.lo errmgr.lo defmat.lo mklist.lo sigbas.lo \
-       indxg.lo matz.lo istrue.lo inisci.lo ptover.lo getfunction.lo \
-       stackp.lo dbasin.lo macro.lo extlarg.lo getstr.lo cvwm.lo \
-       storeglobal.lo lst2vars.lo basnms.lo matc.lo ptrback.lo \
-       getch.lo ftob.lo seteol.lo basin.lo clause.lo compcl.lo \
-       termf.lo expsum.lo copyvar.lo putid.lo itosci.lo stackr2d.lo \
-       stacki2d.lo stackc2i.lo isinstring.lo $(am__objects_3)
+       getsym.lo findequal.lo stackg.lo find.lo setlnb.lo mrknmd.lo \
+       stackgl.lo allops.lo mname.lo command.lo ref2val.lo stack.lo \
+       isbrk.lo majmin.lo xerbla.lo dtosci.lo bexec.lo varfunptr.lo \
+       getfun.lo savlod.lo error.lo cvdm.lo tradsl.lo mkindx.lo \
+       whatln.lo errmgr.lo defmat.lo mklist.lo sigbas.lo indxg.lo \
+       matz.lo istrue.lo inisci.lo ptover.lo getfunction.lo stackp.lo \
+       dbasin.lo macro.lo extlarg.lo getstr.lo cvwm.lo storeglobal.lo \
+       lst2vars.lo basnms.lo matc.lo ptrback.lo getch.lo ftob.lo \
+       seteol.lo basin.lo clause.lo compcl.lo termf.lo expsum.lo \
+       copyvar.lo putid.lo itosci.lo stackr2d.lo stacki2d.lo \
 -      stackc2i.lo isinstring.lo $(am__objects_4)
++      stackc2i.lo isinstring.lo $(am__objects_3)
 +am__objects_5 = libscicore_la-core_gw.lo \
 +      libscicore_la-hashtable_core.lo libscicore_la-namstr.lo \
 +      libscicore_la-search_functions.lo \
 +      libscicore_la-storeCommand.lo libscicore_la-banner.lo \
 +      libscicore_la-overload.lo
  am__objects_6 = libscicore_la-sci_stacksize.lo \
        libscicore_la-sci_resume.lo libscicore_la-sci_mtlb_mode.lo \
 -      libscicore_la-sci_banner.lo libscicore_la-sci_where.lo \
 -      libscicore_la-sci_errcatch.lo libscicore_la-sci_getos.lo \
 +      libscicore_la-sci_where.lo libscicore_la-sci_errcatch.lo \
        libscicore_la-sci_format.lo libscicore_la-sci_getmemory.lo \
        libscicore_la-sci_havewindow.lo libscicore_la-sci_delbpt.lo \
 -      libscicore_la-sci_macr2lst.lo libscicore_la-sci_isdef.lo \
 -      libscicore_la-sci_isglobal.lo libscicore_la-sci_who.lo \
 -      libscicore_la-sci_errclear.lo libscicore_la-sci_global.lo \
 -      libscicore_la-sci_funcprot.lo libscicore_la-sci_newfun.lo \
 -      libscicore_la-sci_warning.lo libscicore_la-sci_dispbpt.lo \
 -      libscicore_la-sci_intppty.lo libscicore_la-sci_ieee.lo \
 -      libscicore_la-sci_gstacksize.lo libscicore_la-sci_lasterror.lo \
 -      libscicore_la-sci_funptr.lo libscicore_la-sci_return.lo \
 -      libscicore_la-sci_exists.lo libscicore_la-sci_getmd5.lo \
 -      libscicore_la-sci_clear.lo libscicore_la-sci_clearfun.lo \
 -      libscicore_la-sci_setbpt.lo libscicore_la-sci_getmodules.lo \
 +      libscicore_la-sci_macr2lst.lo libscicore_la-sci_who.lo \
 +      libscicore_la-sci_errclear.lo libscicore_la-sci_funcprot.lo \
 +      libscicore_la-sci_newfun.lo libscicore_la-sci_warning.lo \
 +      libscicore_la-sci_dispbpt.lo libscicore_la-sci_intppty.lo \
 +      libscicore_la-sci_ieee.lo libscicore_la-sci_gstacksize.lo \
 +      libscicore_la-sci_lasterror.lo libscicore_la-sci_funptr.lo \
 +      libscicore_la-sci_return.lo libscicore_la-sci_getmd5.lo \
 +      libscicore_la-sci_clearfun.lo libscicore_la-sci_setbpt.lo \
        libscicore_la-sci_what.lo libscicore_la-sci_predef.lo \
 -      libscicore_la-sci_clearglobal.lo libscicore_la-sci_arg.lo \
        libscicore_la-sci_type.lo libscicore_la-sci_typename.lo \
        libscicore_la-sci_mode.lo libscicore_la-sci_macr2tree.lo \
        libscicore_la-sci_iserror.lo libscicore_la-sci_getversion.lo \
@@@ -859,10 -855,14 +867,11 @@@ includes/getos.h 
  includes/machine.h \
  includes/mode_exec.h \
  includes/PATH_MAX.h \
 -includes/SCIHOME.h \
  includes/scilabDefaults.h \
 -includes/scilabmode.h \
  includes/scisparse.h \
  includes/sciquit.h \
 -includes/setgetSCIpath.h \
  includes/stack-c.h \
+ includes/sci_types.h \
  includes/stack-def.h \
  includes/stack.h \
  includes/stack1.h \
@@@ -58,19 -71,12 +58,18 @@@ int C2F(sci_islittleendian)(char *fname
  int C2F(sci_librarieslist)(char *fname,unsigned long fname_len);
  int C2F(sci_libraryinfo)(char *fname,unsigned long fname_len);
  int C2F(sci_getvariablesonstack)(char *fname,unsigned long fname_len);
 -int C2F(sci_getdebuginfo)(char *fname,unsigned long fname_len);
  int C2F(sci_readgateway)(char *fname,unsigned long fname_len);
 -int C2F(sci_exit)(char *fname,unsigned long fname_len);
  int C2F(sci_comp)(char *fname,unsigned long fname_len);
 -/*--------------------------------------------------------------------------*/
 +
 +int C2F(sci_typename)(char *fname,int* _piKey);
 +int C2F(sci_funcprot)(char *fname,int* _piKey);
 +int C2F(sci_newfun)(char *fname, int* _piKey);
 +
 +//Yasp
 +int sci_type(char *fname, int* _piKey);
 +int sci_getdebuginfo(char *fname, int* _piKey);
 +int sci_getversion(char *fname, int* _piKey);
 +/*--------------------------------------------------------------------------*/ 
  #endif /*  __GW_CORE__ */
  /*--------------------------------------------------------------------------*/
  
@@@ -88,7 -88,13 +88,7 @@@ int gw_core(void
                        Fin = 6;
                }
        }
--
 -      if(pvApiCtx == NULL)
 -      {
 -              pvApiCtx = (StrCtx*)MALLOC(sizeof(StrCtx));
 -      }
 -
 -      pvApiCtx->pstName = (char*)Tab[Fin-1].name;
++      
        callFunctionFromGateway(Tab, SIZE_CURRENT_GENERIC_TABLE(Tab));
        return 0;
  }
  #include "callDynamicGateway.h"
  #include "MALLOC.h"
  #include "Scierror.h"
+ #include "sciprint.h"
  #include "localization.h"
- #include "sci_path.h"
 -#include "setgetSCIpath.h"
  #include "getshortpathname.h"
  #include "BOOL.h"
  #include "charEncoding.h"
  /*--------------------------------------------------------------------------*/
  dynamic_gateway_error_code callDynamicGateway(char *moduleName,
-                                                                                         char *dynLibName,
-                                                                                         char *gw_name,
-                                                                                         DynLibHandle *hlib,
-                                                                                         PROC_GATEWAY *ptrGateway)
+                                               char *dynLibName,
+                                               char *gw_name,
+                                               DynLibHandle *hlib,
+                                               PROC_GATEWAY *ptrGateway)
  {
-       if (*hlib == NULL)
-       {
-               /* Under Linux/Unix, load thanks to dlopen */
+     if (*hlib == NULL)
+     {
+         /* Under Linux/Unix, load thanks to dlopen */
  #ifdef _MSC_VER
-               wchar_t *wcdynLibName = to_wide_string(dynLibName);
-               if (wcdynLibName)
-               {
-                       *hlib = LoadDynLibraryW(wcdynLibName); 
-                       FREE(wcdynLibName);
-                       wcdynLibName = NULL;
-               }
-               if (*hlib == NULL)
-               {
-                       return DYN_GW_LOAD_LIBRARY_ERROR;
-               }
+         wchar_t *wcdynLibName = to_wide_string(dynLibName);
+         if (wcdynLibName)
+         {
+             *hlib = LoadDynLibraryW(wcdynLibName); 
+             FREE(wcdynLibName);
+             wcdynLibName = NULL;
+         }
+         if (*hlib == NULL)
+         {
+             return DYN_GW_LOAD_LIBRARY_ERROR;
+         }
  #else
-               *hlib = LoadDynLibrary(dynLibName); 
+         *hlib = LoadDynLibrary(dynLibName); 
  
-               if (*hlib == NULL) 
-               {
+         if (*hlib == NULL) 
+         {
              char *previousError = GetLastDynLibError();
  
-                       /* Haven't been able to find the lib with dlopen... 
-                        * This can happen for two reasons:
-                        * - the lib must be dynamically linked
-                        * - Some silly issues under Suse (see bug #2875)
-                        * Note that we are handling only the "source tree build"
-                        * because libraries are split (they are in the same directory 
-                        * in the binary)
-                        */
-                       char *SciPath = getSCI();
-                       #define PATHTOMODULE "/modules/"
-                       #define LT_OBJDIR "/.libs/"
-                       
-                       /* Build the full path to the library */
-                       char *pathToLib=(char*) MALLOC((strlen(SciPath)+strlen(PATHTOMODULE)+strlen(moduleName)+strlen(LT_OBJDIR)+strlen(dynLibName)+1)*sizeof(char));
-                       sprintf(pathToLib,"%s%s%s%s%s",SciPath,PATHTOMODULE,moduleName,LT_OBJDIR,dynLibName);
+             /* Haven't been able to find the lib with dlopen... 
+              * This can happen for two reasons:
+              * - the lib must be dynamically linked
+              * - Some silly issues under Suse (see bug #2875)
+              * Note that we are handling only the "source tree build"
+              * because libraries are split (they are in the same directory 
+              * in the binary)
+              */
 -            char *SciPath = getSCIpath();
++            char *SciPath = getSCI();
+             #define PATHTOMODULE "/modules/"
+             #ifndef LT_OBJDIR
+             #define LT_OBJDIR ".libs/"
+             #endif
  
-                       *hlib = LoadDynLibrary(pathToLib);
-                     
-                       if (*hlib == NULL) 
-                       {
+             /* Build the full path to the library */
+             char *pathToLib=(char*) MALLOC((strlen(SciPath)+strlen(PATHTOMODULE)+strlen(moduleName)+strlen("/")+strlen(LT_OBJDIR)+strlen(dynLibName)+1)*sizeof(char));
+             sprintf(pathToLib,"%s%s%s/%s%s",SciPath,PATHTOMODULE,moduleName,LT_OBJDIR,dynLibName);
+             *hlib = LoadDynLibrary(pathToLib);
+               
+             if (*hlib == NULL) 
+             {
                  if (previousError != NULL)
                  {
                      sciprint("A previous error has been detected while loading %s: %s\n",dynLibName, previousError);
@@@ -46,7 -46,7 +46,7 @@@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../operations/includes"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../operations/includes"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../operations/includes"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes"
 -                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../io/includes;../../../operations/includes"
++                              AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes;../../../operations/includes;../../../parse/includes;../../../abstractSyntaxTree/includes;../../../types/includes;../../../symbol/includes;../../../system_env/includes;../../../io/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h> /* getenv ! */
- #include "../../../io/includes/getenvc.h"
- #include "../../../fileio/includes/FileExist.h"
+ #include "getenvc.h"
+ #include "FileExist.h"
  #include "localization.h"
- #include "Os_specific.h"
  #include "core_math.h" 
 -#include "setgetSCIpath.h"
 +#include "sci_path.h"
 +#include "sci_home.h"
  #include "MALLOC.h"
  #include "inisci-c.h"
 -#include "SCIHOME.h"
 -#include "scilabmode.h"
 +#include "sci_mode.h"
  #include "PATH_MAX.h"
  #include "scilabDefaults.h"
  /*--------------------------------------------------------------------------*/
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -8,15 -8,13 +8,15 @@@ EXPORT
  callFunctionFromGateway
  com_
  iop_
- matlog_
++
++
 +iAllocComplexMatrixOfDouble
 +errgst_
 +iIsComplex
  getrhscvar_
 -stack_
  getrhsvar_
  iAllocMatrixOfDouble
 -iIsComplex
 -putlhsvar_
 +stack_
  intersci_
 +putlhsvar_
  cha1_
 -errgst_
 -iAllocComplexMatrixOfDouble
  #define __GW_ELEMENTARIES_FUNCTIONS__
  /*--------------------------------------------------------------------------*/
  #include "machine.h"
+ #include "dynlib_elementary_functions.h"
  /*--------------------------------------------------------------------------*/
- int gw_elementary_functions(void);
+ ELEMENTARY_FUNCTIONS_IMPEXP int gw_elementary_functions(void);
  /*--------------------------------------------------------------------------*/
- int C2F(sci_chinesehat)(char *fname,unsigned long fname_len);
- int C2F(sci_spones)(char *fname,unsigned long fname_len);
- int C2F(sci_isequalbitwise)(char *fname, unsigned long fname_len);
 -int sci_abs(char *fname,unsigned long fname_len);
 -int sci_real(char *fname,unsigned long fname_len);
 -int sci_imag(char *fname,unsigned long fname_len);
 -int sci_conj(char *fname,unsigned long fname_len);
 -int sci_round(char *fname,unsigned long fname_len);
 -int sci_int(char *fname,unsigned long fname_len);
 -int sci_size(char *fname,unsigned long fname_len);
 -int sci_sum(char *fname,unsigned long fname_len);
 -int sci_prod(char *fname,unsigned long fname_len);
 -int sci_diag(char *fname,unsigned long fname_len);
 -int sci_triu(char *fname,unsigned long fname_len);
 -int sci_tril(char *fname,unsigned long fname_len);
 -int sci_eye(char *fname,unsigned long fname_len);
 -int sci_rand(char *fname,unsigned long fname_len);
 -int sci_ones(char *fname,unsigned long fname_len);
 -int sci_maxi(char *fname,unsigned long fname_len);
 -int sci_kron(char *fname,unsigned long fname_len);
 -int sci_scimatrix(char *fname,unsigned long fname_len);
 -int sci_sin(char *fname,unsigned long fname_len);
 -int sci_cos(char *fname,unsigned long fname_len);
 -int sci_atan(char *fname,unsigned long fname_len);
 -int sci_exp(char *fname,unsigned long fname_len);
 -int sci_sqrt(char *fname,unsigned long fname_len);
 -int sci_log(char *fname,unsigned long fname_len);
+ int sci_chinesehat(char *fname,unsigned long fname_len);
 -int sci_sign(char *fname,unsigned long fname_len);
 -int sci_clean(char *fname,unsigned long fname_len);
 -int sci_floor(char *fname,unsigned long fname_len);
 -int sci_ceil(char *fname,unsigned long fname_len);
 -int sci_expm(char *fname,unsigned long fname_len);
 -int sci_cumsum(char *fname,unsigned long fname_len);
 -int sci_cumprod(char *fname,unsigned long fname_len);
 -int sci_testmatrix(char *fname,unsigned long fname_len);
 -int sci_isreal(char *fname,unsigned long fname_len);
 -int sci_frexp(char *fname,unsigned long fname_len);
 -int sci_zeros(char *fname,unsigned long fname_len);
 -int sci_tan(char *fname,unsigned long fname_len);
 -int sci_log1p(char *fname,unsigned long fname_len);
 -int sci_imult(char *fname,unsigned long fname_len);
 -int sci_asin(char *fname,unsigned long fname_len);
 -int sci_acos(char *fname,unsigned long fname_len);
 -int sci_number_properties(char *fname,unsigned long fname_len);
 -int sci_nearfloat(char *fname,unsigned long fname_len);
 -int sci_dsearch(char *fname,unsigned long fname_len);
 -int sci_isequal(char *fname,unsigned long fname_len);
+ int sci_spones(char *fname,unsigned long fname_len);
 -int sci_gsort(char *fname, unsigned long fname_len);
+ int sci_isequalbitwise(char *fname, unsigned long fname_len);
 -int sci_rat(char *fname, unsigned long fname_len);
 +
 +// YaSp
- int sci_abs(char *fname, int* _piKey);
- int sci_acos(char *fname, int* _piKey);
- int sci_asin(char *fname, int* _piKey);
- int sci_atan(char *fname, int* _piKey);
- int sci_ceil(char *fname, int* _piKey);
- int sci_clean(char *fname, int* _piKey);
- int sci_conj(char *fname, int* _piKey);
- int sci_cos(char *fname, int* _piKey);
- int sci_cumprod(char *fname, int* _piKey);
- int sci_cumsum(char *fname, int* _piKey);
- int sci_diag(char *fname, int* _piKey);
- int sci_dsearch(char *fname, int* _piKey);
- int sci_exp(char *fname, int* _piKey);
- int sci_expm(char *fname, int* _piKey);
- int sci_eye(char *fname, int* _piKey);
- int sci_floor(char *fname, int* _piKey);
- int sci_frexp(char *fname, int* _piKey);
- int sci_gsort(char *fname, int* _piKey);
- int sci_imag(char *fname, int* _piKey);
- int sci_imult(char *fname, int* _piKey);
- int sci_int(char *fname, int* _piKey);
- //int sci_isequal(char *fname, int* _piKey); C++ interface
- int sci_isreal(char *fname, int* _piKey);
- int sci_kron(char *fname, int* _piKey);
- int sci_log(char *fname, int* _piKey);
- int sci_log1p(char *fname, int* _piKey);
- int sci_scimatrix(char *fname, int* _piKey);
- int sci_maxi(char *fname, int* _piKey);
- int sci_mini(char *fname, int* _piKey);
- int sci_nearfloat(char *fname, int* _piKey);
- int sci_number_properties(char *fname, int* _piKey);
- int sci_ones(char *fname, int* _piKey);
- int sci_prod(char *fname, int* _piKey);
- int sci_rand(char *fname, int* _piKey);
- int sci_real(char *fname, int* _piKey);
- int sci_round(char *fname, int* _piKey);
- int sci_sign(char *fname, int* _piKey);
- int sci_sin(char *fname, int* _piKey);
- int sci_sqrt(char *fname, int* _piKey);
- int sci_sum(char *fname, int* _piKey);
- int sci_tan(char *fname, int* _piKey);
- int sci_testmatrix(char *fname, int* _piKey);
- int sci_tril(char *fname, int* _piKey);
- int sci_triu(char *fname, int* _piKey);
- int sci_zeros(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_abs(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_acos(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_asin(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_atan(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_ceil(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_clean(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_conj(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_cos(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_cumprod(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_cumsum(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_diag(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_dsearch(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_exp(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_expm(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_eye(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_floor(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_frexp(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_gsort(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_imag(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_imult(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_int(char *fname, int* _piKey);
++//ELEMENTARY_FUNCTIONS_IMPEXP int sci_isequal(char *fname, int* _piKey); C++ interface
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_isreal(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_kron(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_log(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_log1p(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_scimatrix(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_maxi(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_mini(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_nearfloat(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_number_properties(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_ones(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_prod(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_rand(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_real(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_round(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_sign(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_sin(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_sqrt(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_sum(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_tan(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_testmatrix(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_tril(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_triu(char *fname, int* _piKey);
++ELEMENTARY_FUNCTIONS_IMPEXP int sci_zeros(char *fname, int* _piKey);
 +
  #endif /*  __GW_ELEMENTARIES_FUNCTIONS__ */
  /*--------------------------------------------------------------------------*/
  
@@@ -30,7 -30,7 +30,8 @@@ function y=dec2bin(x,n
        rhs = argn(2);
        
        // check the number of input arguments
 -      if (rhs<1 | rhs>2) then
++
 +      if rhs<1 | rhs>2 then
                error(msprintf(gettext("%s: Wrong number of input argument(s): %d or %d expected.\n"),"dec2bin",1,2));
        end
        
@@@ -40,7 -40,7 +40,8 @@@ function y = dec2oct(x
                        x_bin_length   = length(x_bin);
                        
                        // Add 0 to the right of the string
 -                      while (modulo(length(x_bin),3) ~= 0) ,
++
 +                      while modulo(length(x_bin),3) <> 0
                                x_bin = '0' + x_bin;
                        end
                        
   *
   */
  /*--------------------------------------------------------------------------*/
 +#include <stdlib.h>
  #include "gw_elementary_functions.h"
  #include "callFunctionFromGateway.h"
+ #include "recursionFunction.h"
+ #include "stack-c.h"
  /*--------------------------------------------------------------------------*/
  static gw_generic_table Tab[] =
  {
 -      {sci_abs, "abs"},
 -      {sci_real, "real"},
 -      {sci_imag, "imag"},
 -      {sci_conj, "conj"},
 -      {sci_round, "round"},
 -      {sci_int, "int"},
 -      {sci_size, "size"},
 -      {sci_sum, "sum"},
 -      {sci_prod, "prod"},
 -      {sci_diag, "diag"},
 -      {sci_triu, "triu"},
 -      {sci_tril, "tril"},
 -      {sci_eye, "eye"},
 -      {sci_rand, "rand"},
 -      {sci_ones, "ones"},
 -      {sci_maxi, "max"},
 -      {sci_maxi, "min"},
 -      {sci_kron, "kron"},
 -      {sci_kron, "kron"},
 -      {sci_kron, "kron"},
 -      {sci_sin, "sin"},
 -      {sci_cos, "cos"},
 -      {sci_atan, "atan"},
 -      {sci_exp, "exp"},
 -      {sci_sqrt, "sqrt"},
 -      {sci_log, "log"},
 -      {sci_chinesehat, "^"},
 -      {sci_sign, "sign"},
 -      {sci_clean, "clean"},
 -      {sci_floor, "floor"},
 -      {sci_ceil, "ceil"},
 -      {sci_expm, "expm"},
 -      {sci_cumsum, "cumsum"},
 -      {sci_cumprod, "cumprod"},
 -      {sci_testmatrix, "testmatrix"},
 -      {sci_isreal, "isreal"},
 -      {sci_frexp, "frexp"},
 -      {sci_zeros, "zeros"},
 -      {sci_tan, "tan"},
 -      {sci_log1p, "log1p"},
 -      {sci_imult, "imult"},
 -      {sci_asin, "asin"},
 -      {sci_acos, "acos"},
 -      {sci_number_properties, "number_properties"},
 -      {sci_nearfloat, "nearfloat"},
 -      {sci_dsearch, "dsearch"},
 -      {sci_isequal, "isequal"},
 -      {sci_spones, "spones"},
 -      {sci_gsort, "gsort"},
 -      {sci_isequalbitwise, "isequalbitwise"},
 -    {sci_scimatrix, "matrix"},        
 -    {sci_rat, "rat"},
 -    {sci_maxi, "maxi"},
 -    {sci_maxi, "mini"}
 +      {NULL, ""}, //abs
 +      {NULL, ""}, //real
 +      {NULL, ""}, //imag
 +      {NULL, ""}, //conj
 +      {NULL, ""}, //round
 +      {NULL, ""}, //int
 +      {NULL, ""}, //size
 +      {NULL, ""}, //sum
 +      {NULL, ""}, //prod
 +      {NULL, ""}, //diag
 +      {NULL, ""}, //trui
 +      {NULL, ""}, //tril
 +      {NULL, ""}, //eye
 +      {NULL, ""}, //rand
 +      {NULL ,""}, //ones
 +      {NULL ,""}, //maxi
 +      {NULL ,""}, //mini
 +      {NULL ,""}, //kron
 +      {NULL ,""}, //kron
 +      {NULL ,""}, //kron
 +      {NULL ,""}, //kron
 +      {NULL ,""}, //sin
 +      {NULL ,""}, //cos
 +      {NULL ,""}, //atan
 +      {NULL ,""}, //exp
 +      {NULL ,""}, //sqrt
 +      {NULL ,""}, //log
-       {C2F(sci_chinesehat),"^"},
++      {sci_chinesehat,"^"},
 +      {NULL, ""}, //sign
 +      {NULL, ""}, //clean
 +      {NULL, ""}, //floor
 +      {NULL, ""}, //ceil
 +      {NULL, ""}, //expm
 +      {NULL, ""}, //cumsum
 +      {NULL, ""}, //cumprod
 +      {NULL, ""}, //testmatrix
 +      {NULL, ""}, //isreal
 +      {NULL, ""}, //frexp
 +      {NULL, ""}, //zeros
 +      {NULL, ""}, //tan
 +      {NULL, ""}, //log1p
 +      {NULL, ""}, //imult
 +      {NULL, ""}, //asin
 +      {NULL, ""}, //acos
 +      {NULL, ""}, //number_properties
 +      {NULL, ""}, //nearfloat
 +      {NULL, ""}, //dsearch
 +      {NULL, ""}, //isequal
-       {C2F(sci_spones),"spones"},
++      {sci_spones,"spones"},
 +      {NULL, ""}, //gsort
-       {C2F(sci_isequalbitwise),"isequalbitwise"},
++      {sci_isequalbitwise,"isequalbitwise"},
 +      {NULL, ""} //matrix
  };
  /*--------------------------------------------------------------------------*/
  int gw_elementary_functions(void)
  /*--------------------------------------------------------------------------*/
  #include "gw_elementary_functions.h"
  #include "stack-c.h"
 +#include "MALLOC.h"
  #include "api_scilab.h"
  #include "basic_functions.h"
 +#include "api_oldstack.h"
  
 -SciErr abs_double(int* _piAddress);
 -SciErr abs_poly(int* _piAddress);
 -SciErr abs_sparse(int* _piAddress);
 +SciErr abs_double(int* _piKey, int* _piAddress);
 +SciErr abs_poly(int* _piKey, int* _piAddress);
 +SciErr abs_sparse(int* _piKey, int* _piAddress);
  
--/*--------------------------------------------------------------------------*/
- /*--------------------------------------------------------------------------*/
 -int sci_abs(char *fname,unsigned long fname_len)
 +int sci_abs(char *fname, int* _piKey)
  {
        SciErr sciErr;
        int iType                       = 0;
@@@ -83,10 -83,10 +83,10 @@@ int clean_poly(int* _piKey, int* _piAdd
        return 0;
  }
  
 -int clean_sparse(int* _piAddress)
 +int clean_sparse(int* _piKey, int* _piAddress)
  {
        C2F(ref2val)();
-       C2F(sci_spclean)("clean", 5);
+       sci_spclean("clean", 5);
        return 0;
  }
  
  #include "stack-c.h"
  #include "basic_functions.h"
  #include "api_scilab.h"
 +#include "api_oldstack.h"
 +
  /*--------------------------------------------------------------------------*/
 -int sci_cos(char *fname,unsigned long fname_len)
 +int sci_cos(char *fname, int* _piKey)
  {
        SciErr sciErr;
        int i;
  #include "basic_functions.h"
  #include "api_scilab.h"
  #include "Scierror.h"
 +#include "api_oldstack.h"
 +#include "api_oldstack.h"
  
 -int sci_cumprod(char *fname,unsigned long fname_len)
++
 +int sci_cumprod(char *fname, int*_piKey)
  {
        SciErr sciErr;
        int i;
@@@ -24,7 -23,7 +24,8 @@@ int diag_poly(int* _piKey, int* _piAddr
  
  extern int sci_pdiag(char *fname,unsigned long fname_len);
  
 -int sci_diag (char *fname,unsigned long fname_len)
++
 +int sci_diag(char *fname, int*_piKey)
  {
        SciErr sciErr;
        int iRows                                               = 0;
  #include "localization.h"
  #include "api_scilab.h"
  #include "Scierror.h"
 +#include "api_oldstack.h"
  
 -static SciErr getMode(int _iPos, char *_pcMode);
 +static int getMode(int* _piKey, int _iPos, char *_pcMode);
  
  /*--------------------------------------------------------------------------*/
 -int sci_dsearch (char *fname,unsigned long fname_len)
++
 +int sci_dsearch(char *fname, int* _piKey)
  {
        SciErr sciErr;
        int i;
@@@ -26,12 -25,11 +26,14 @@@ typedef struct 
        double c[41];
        int ndng;
  } DCOEFF_struct;
- DCOEFF_struct C2F(dcoeff);
+ __declspec(dllexport) DCOEFF_struct C2F(dcoeff);
  #endif
  
 +static double spdblExpmC[41] = {0};
 +static double sdblExpmN = 0;
 +
  /*--------------------------------------------------------------------------*/
  void vSwitchVal(double *_pdblVal, int _iPos1, int _iPos2);
  
  /*--------------------------------------------------------------------------*/
  #include "gw_elementary_functions.h"
  #include "stack-c.h"
 +#include "MALLOC.h"
  #include "basic_functions.h"
  #include "api_scilab.h"
 +#include "api_oldstack.h"
  
 -SciErr floor_poly(int* _piAddress);
 -SciErr floor_double(int* _piAddress);
 -SciErr floor_int(int* _piAddress);
 +SciErr floor_poly(int* _piKey, int* _piAddress);
 +SciErr floor_double(int* _piKey, int* _piAddress);
 +SciErr floor_int(int* _piKey, int* _piAddress);
  
 -int sci_floor (char *fname,unsigned long fname_len)
++
 +int sci_floor(char *fname,int* _piKey)
  {
        SciErr sciErr;
  
  
  #define MAX_INTERGER  2147483647
  
 -SciErr matrix_double(int* _piAddress, int _iRowsRet, int _iColsRet);
 -SciErr matrix_bsparse(int* _piAddress, int _iRowsRet, int _iColsRet);
 -SciErr matrix_sparse(int* _piAddress, int _iRowsRet, int _iColsRet);
 -SciErr matrix_poly(int* _piAddress, int _iRowsRet, int _iColsRet);
 -SciErr matrix_string(int* _piAddress, int _iRowsRet, int _iColsRet);
 -SciErr matrix_int(int* _piAddress, int _iRowsRet, int _iColsRet);
 -SciErr matrix_bool(int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_double(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_bsparse(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_sparse(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_poly(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_string(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_int(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
 +SciErr matrix_bool(int* _piKey, int* _piAddress, int _iRowsRet, int _iColsRet);
  
  /*--------------------------------------------------------------------------*/
- /*--------------------------------------------------------------------------*/
 -int sci_scimatrix(char *fname,unsigned long fname_len)
 +int sci_scimatrix(char *fname, int* _piKey)
  {
        SciErr sciErr;
        int iRows1                      = 0;
  #include "api_scilab.h"
  #include "Scierror.h"
  #include "localization.h"
 -#include "MALLOC.h"
 +#include "api_oldstack.h"
  
 +int func_comp(char* fname, int _iMini, int* _piKey);
  
 -SciErr compare_list(char* _pstName, int* _piAddress, int _iIsMini);
 -SciErr compare_multiple_double(char* _pstName, int _iIsMini);
 -SciErr compare_double_inside(int* _piAddress, int _iIsMini, int _iMode);
 +SciErr compare_list(int* _piKey, char* _pstName, int* _piAddress, int _iIsMini);
 +SciErr compare_multiple_double(int* _piKey, char* _pstName, int _iIsMini);
 +SciErr compare_double_inside(int* _piKey, int* _piAddress, int _iIsMini, int _iMode);
  
 -static SciErr compare_double(int _iIsMini, int** _piAddr, int _iNbItem);
 +static SciErr compare_double(int* _piKey, int _iIsMini, int** _piAddr, int _iNbItem);
  
  /*--------------------------------------------------------------------------*/
 -int sci_maxi (char *fname,unsigned long fname_len)
++
 +int sci_maxi(char *fname, int* _piKey)
 +{
 +      return func_comp(fname, 0, _piKey);
 +}
 +
 +int sci_mini(char *fname, int* _piKey)
 +{
 +      return func_comp(fname, 1, _piKey);
 +}
 +
 +
 +int func_comp(char* fname, int _iMini, int* _piKey)
  {
        SciErr sciErr;
        int i;
                }
                break;
        case sci_sparse:
 -              C2F(ref2val)();
                Fin -= 6; //Ugly !!!
-               if(_iMini)
-                       C2F(sci_spmin)(fname, _piKey);
 -              if(iMini)
 -                      sci_spmin(fname, fname_len);
++              if(iModeActive)
++                      sci_spmin(fname,_piKey);
                else
-                       C2F(sci_spmax)(fname, _piKey);
 -                      sci_spmax(fname, fname_len);
++                      sci_spmax(fname,_piKey);
                break;
        default:
                OverLoad(1);
  #include "basic_functions.h"
  #include "api_scilab.h"
  #include "Scierror.h"
 +#include "api_oldstack.h"
  
 -int sci_nearfloat (char *fname,unsigned long fname_len)
 +int sci_nearfloat(char *fname, int* _piKey)
  {
        SciErr sciErr;
        int i;
  #include "gw_elementary_functions.h"
  #include "stack-c.h"
  #include "basic_functions.h"
 +#include "api_scilab.h"
 +#include "api_oldstack.h"
  
 -#define _NEW_TONIO_
 -/*--------------------------------------------------------------------------*/
 -extern int C2F(intsqrt) (int *id);
 -/*--------------------------------------------------------------------------*/
 -int sci_sqrt(char *fname,unsigned long fname_len)
++
 +int sci_sqrt(char *fname,int* _piKey)
  {
 -      static int id[6];
 -#ifdef _NEW_TONIO_
 -      int iRows                       = 0;
 -      int iCols                       = 0;
 -      int iRealData           = 0;
 -      int iImgData            = 0;
 -      int iComplex            = 0;
 -      int iIndex                      = 0;
 -      int iComplexCase        = 0;
 +      SciErr sciErr;
 +      int i;
 +      int iRet                                                = 0;
 +      int iComplex                            = 0;
 +      int iRows                                               = 0;
 +      int iCols                                               = 0;
 +      int* piAddr                                     = NULL;
 +
 +      double* pdblReal                = NULL;
 +      double* pdblImg                 = NULL;
 +      double* pdblRealRet     = NULL;
 +      double* pdblImgRet      = NULL;
  
 -      double *pRealData               = NULL;
 -      double *pImgData                = NULL;
 -      double *pReturnRealData = NULL;
 -      double *pReturnImgdata  = NULL;
  
        CheckRhs(1,1);
        CheckLhs(1,1);
  #include "stack-c.h"
  #include "basic_functions.h"
  #include "Scierror.h"
 +#include "api_scilab.h"
 +#include "api_oldstack.h"
  
  /*--------------------------------------------------------------------------*/
 -int sum_matrix(int _iMode);
 -int sum_sparse();
 +int sum_matrix(int* _piKey, int* _piAddress, int _iMode);
 +int sum_sparse(int* _piKey, int* _piAddress);
  
  /*--------------------------------------------------------------------------*/
 -int sci_sum (char *fname,unsigned long fname_len)
 -{
 -      int iType                               = 0;
 -      int iMode                               = 0;
 +int sci_sum(char *fname, int* _piKey)
 +{
 +      SciErr sciErr;
 +      int iRet                = 0;
 +      int iMode               = 0;
 +      int iType               = 0;
 +      int* piAddr = NULL;
  
        CheckRhs(1,2);
        CheckLhs(1,1);
index 0000000,0000000..c6905cc
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,350 @@@
++      LIBRARY    api_scilab.dll
++
++
++EXPORTS
++      getMatrixOfBoolean
++      allocMatrixOfBoolean
++      createMatrixOfBoolean
++      createNamedMatrixOfBoolean
++      readNamedMatrixOfBoolean
++      isBooleanType
++      isNamedBooleanType
++      getScalarBoolean
++      getNamedScalarBoolean
++      createScalarBoolean
++      createNamedScalarBoolean
++      getBooleanSparseMatrix
++      allocBooleanSparseMatrix
++      createBooleanSparseMatrix
++      createNamedBooleanSparseMatrix
++      readNamedBooleanSparseMatrix
++      isBooleanSparseType
++      isNamedBooleanSparseType
++      getAllocatedBooleanSparseMatrix
++      getNamedAllocatedBooleanSparseMatrix
++      freeAllocatedBooleanSparse
++      getVarDimension
++      getNamedVarDimension
++      getVarAddressFromPosition
++      getVarNameFromPosition
++      getVarAddressFromName
++      getVarType
++      getNamedVarType
++      isVarComplex
++      isNamedVarComplex
++      isVarMatrixType
++      isNamedVarMatrixType
++      getProcessMode
++      getDimFromVar
++      getDimFromNamedVar
++      getRhsFromAddress
++      isRowVector
++      isNamedRowVector
++      isColumnVector
++      isNamedColumnVector
++      isVector
++      isNamedVector
++      isScalar
++      isNamedScalar
++      isSquareMatrix
++      isNamedSquareMatrix
++      checkVarDimension
++      isEmptyMatrix
++      isNamedEmptyMatrix
++      createEmptyMatrix
++      createNamedEmptyMatrix
++      isNamedVarExist
++      getMatrixOfDouble
++      getComplexMatrixOfDouble
++      getComplexZMatrixOfDouble
++      allocMatrixOfDouble
++      allocComplexMatrixOfDouble
++      createMatrixOfDouble
++      createComplexMatrixOfDouble
++      createComplexZMatrixOfDouble
++      createNamedMatrixOfDouble
++      createNamedComplexMatrixOfDouble
++      createNamedComplexZMatrixOfDouble
++      readNamedMatrixOfDouble
++      readNamedComplexMatrixOfDouble
++      isDoubleType
++      isNamedDoubleType
++      getScalarDouble
++      getScalarComplexDouble
++      getNamedScalarDouble
++      getNamedScalarComplexDouble
++      createScalarDouble
++      createScalarComplexDouble
++      createNamedScalarDouble
++      createNamedScalarComplexDouble
++      createScalarDoubleFromInteger
++      createScalarComplexDoubleFromInteger
++      createMatrixOfDoubleFromInteger
++      createMatrixOfComplexDoubleFromInteger
++      addStackSizeError
++      addErrorMessage
++      printError
++      getErrorMessage
++      getMatrixOfIntegerPrecision
++      getMatrixOfUnsignedInteger8
++      getMatrixOfUnsignedInteger16
++      getMatrixOfUnsignedInteger32
++      getMatrixOfUnsignedInteger64
++      getMatrixOfInteger8
++      getMatrixOfInteger16
++      getMatrixOfInteger32
++      getMatrixOfInteger64
++      createMatrixOfUnsignedInteger8
++      createMatrixOfUnsignedInteger16
++      createMatrixOfUnsignedInteger32
++      createMatrixOfUnsignedInteger64
++      createMatrixOfInteger8
++      createMatrixOfInteger16
++      createMatrixOfInteger32
++      createMatrixOfInteger64
++      allocMatrixOfInteger8
++      allocMatrixOfInteger16
++      allocMatrixOfInteger32
++      allocMatrixOfInteger64
++      allocMatrixOfUnsignedInteger8
++      allocMatrixOfUnsignedInteger16
++      allocMatrixOfUnsignedInteger32
++      allocMatrixOfUnsignedInteger64
++      createNamedMatrixOfUnsignedInteger8
++      createNamedMatrixOfUnsignedInteger16
++      createNamedMatrixOfUnsignedInteger32
++      createNamedMatrixOfUnsignedInteger64
++      createNamedMatrixOfInteger8
++      createNamedMatrixOfInteger16
++      createNamedMatrixOfInteger32
++      createNamedMatrixOfInteger64
++      getNamedMatrixOfIntegerPrecision
++      readNamedMatrixOfUnsignedInteger8
++      readNamedMatrixOfUnsignedInteger16
++      readNamedMatrixOfUnsignedInteger32
++      readNamedMatrixOfInteger8
++      readNamedMatrixOfInteger16
++      readNamedMatrixOfInteger32
++      readNamedMatrixOfInteger64
++      isIntegerType
++      isNamedIntegerType
++      getScalarInteger8
++      getScalarInteger16
++      getScalarInteger32
++      getScalarInteger64
++      getScalarUnsignedInteger8
++      getScalarUnsignedInteger16
++      getScalarUnsignedInteger32
++      getScalarUnsignedInteger64
++      getNamedScalarInteger8
++      getNamedScalarInteger16
++      getNamedScalarInteger32
++      getNamedScalarInteger64
++      getNamedScalarUnsignedInteger8
++      getNamedScalarUnsignedInteger16
++      getNamedScalarUnsignedInteger32
++      getNamedScalarUnsignedInteger64
++      createScalarInteger8
++      createScalarInteger16
++      createScalarInteger32
++      createScalarInteger64
++      createScalarUnsignedInteger8
++      createScalarUnsignedInteger16
++      createScalarUnsignedInteger32
++      createScalarUnsignedInteger64
++      createNamedScalarInteger8
++      createNamedScalarInteger16
++      createNamedScalarInteger32
++      createNamedScalarInteger64
++      createNamedScalarUnsignedInteger8
++      createNamedScalarUnsignedInteger16
++      createNamedScalarUnsignedInteger32
++      createNamedScalarUnsignedInteger64
++      getListItemNumber
++      getListItemAddress
++      createList
++      createMList
++      createTList
++      createNamedList
++      createNamedTList
++      createNamedMList
++      readNamedList
++      readNamedTList
++      readNamedMList
++      getListInList
++      getTListInList
++      getMListInList
++      getListInNamedList
++      getTListInNamedList
++      getMListInNamedList
++      createListInList
++      createTListInList
++      createMListInList
++      createListInNamedList
++      createTListInNamedList
++      createMListInNamedList
++      getMatrixOfDoubleInList
++      getComplexMatrixOfDoubleInList
++      allocMatrixOfDoubleInList
++      allocComplexMatrixOfDoubleInList
++      createMatrixOfDoubleInList
++      createComplexMatrixOfDoubleInList
++      createComplexZMatrixOfDoubleInList
++      createMatrixOfDoubleInNamedList
++      createComplexMatrixOfDoubleInNamedList
++      createComplexZMatrixOfDoubleInNamedList
++      readMatrixOfDoubleInNamedList
++      readComplexMatrixOfDoubleInNamedList
++      getMatrixOfStringInList
++      createMatrixOfStringInList
++      createMatrixOfStringInNamedList
++      readMatrixOfStringInNamedList
++      getMatrixOfBooleanInList
++      createMatrixOfBooleanInList
++      allocMatrixOfBooleanInList
++      createMatrixOfBooleanInNamedList
++      readMatrixOfBooleanInNamedList
++      getMatrixOfPolyInList
++      getComplexMatrixOfPolyInList
++      createMatrixOfPolyInList
++      createComplexMatrixOfPolyInList
++      createMatrixOfPolyInNamedList
++      createComplexMatrixOfPolyInNamedList
++      readMatrixOfPolyInNamedList
++      readComplexMatrixOfPolyInNamedList
++      allocMatrixOfUnsignedInteger8InList
++      allocMatrixOfUnsignedInteger16InList
++      allocMatrixOfUnsignedInteger32InList
++      allocMatrixOfUnsignedInteger64InList
++      allocMatrixOfInteger8InList
++      allocMatrixOfInteger16InList
++      allocMatrixOfInteger32InList
++      allocMatrixOfInteger64InList
++      createMatrixOfUnsignedInteger8InList
++      createMatrixOfUnsignedInteger16InList
++      createMatrixOfUnsignedInteger32InList
++      createMatrixOfUnsignedInteger64InList
++      createMatrixOfInteger8InList
++      createMatrixOfInteger16InList
++      createMatrixOfInteger32InList
++      createMatrixOfInteger64InList
++      getMatrixOfUnsignedInteger8InList
++      getMatrixOfUnsignedInteger16InList
++      getMatrixOfUnsignedInteger32InList
++      getMatrixOfUnsignedInteger64InList
++      getMatrixOfInteger8InList
++      getMatrixOfInteger16InList
++      getMatrixOfInteger32InList
++      getMatrixOfInteger64InList
++      createMatrixOfUnsignedInteger8InNamedList
++      createMatrixOfUnsignedInteger16InNamedList
++      createMatrixOfUnsignedInteger32InNamedList
++      createMatrixOfUnsignedInteger64InNamedList
++      createMatrixOfInteger8InNamedList
++      createMatrixOfInteger16InNamedList
++      createMatrixOfInteger32InNamedList
++      createMatrixOfInteger64InNamedList
++      readMatrixOfUnsignedInteger8InNamedList
++      readMatrixOfUnsignedInteger16InNamedList
++      readMatrixOfUnsignedInteger32InNamedList
++      readMatrixOfUnsignedInteger64InNamedList
++      readMatrixOfIntger8InNamedList
++      readMatrixOfIntger16InNamedList
++      readMatrixOfIntger32InNamedList
++      readMatrixOfIntger64InNamedList
++      createSparseMatrixInList
++      createComplexSparseMatrixInList
++      createSparseMatrixInNamedList
++      createComplexSparseMatrixInNamedList
++      getSparseMatrixInList
++      getComplexSparseMatrixInList
++      readSparseMatrixInNamedList
++      readComplexSparseMatrixInNamedList
++      createBooleanSparseMatrixInList
++      createBooleanSparseMatrixInNamedList
++      getBooleanSparseMatrixInList
++      readBooleanSparseMatrixInNamedList
++      getPointerInList
++      createPointerInList
++      readPointerInNamedList
++      createPointerInNamedList
++      api_Top
++      api_Rhs
++      api_Lhs
++      api_CheckRhs
++      api_CheckLhs
++      api_LhsVar
++      api_OverLoad
++      getPointer
++      allocPointer
++      createPointer
++      readNamedPointer
++      isPointerType
++      isNamedPointerType
++      getPolyVariableName
++      getMatrixOfPoly
++      getComplexMatrixOfPoly
++      createMatrixOfPoly
++      createComplexMatrixOfPoly
++      createNamedMatrixOfPoly
++      createNamedComplexMatrixOfPoly
++      readNamedMatrixOfPoly
++      readNamedComplexMatrixOfPoly
++      isPolyType
++      isNamedPolyType
++      getAllocatedSinglePoly
++      getAllocatedSingleComplexPoly
++      getAllocatedNamedSinglePoly
++      getAllocatedNamedSingleComplexPoly
++      getAllocatedMatrixOfPoly
++      getAllocatedMatrixOfComplexPoly
++      getAllocatedNamedMatrixOfPoly
++      getAllocatedNamedMatrixOfComplexPoly
++      freeAllocatedSinglePoly
++      freeAllocatedSingleComplexPoly
++      freeAllocatedMatrixOfPoly
++      freeAllocatedMatrixOfComplexPoly
++      getSparseMatrix
++      getComplexSparseMatrix
++      allocSparseMatrix
++      allocComplexSparseMatrix
++      createSparseMatrix
++      createComplexSparseMatrix
++      createNamedSparseMatrix
++      createNamedComplexSparseMatrix
++      readNamedSparseMatrix
++      readNamedComplexSparseMatrix
++      isSparseType
++      isNamedSparseType
++      getAllocatedSparseMatrix
++      getAllocatedComplexSparseMatrix
++      getNamedAllocatedSparseMatrix
++      getNamedAllocatedComplexSparseMatrix
++      freeAllocatedSparseMatrix
++      freeAllocatedComplexSparseMatrix
++      getMatrixOfString
++      createMatrixOfString
++      createNamedMatrixOfString
++      readNamedMatrixOfString
++      getMatrixOfWideString
++      createMatrixOfWideString
++      createNamedMatrixOfWideString
++      readNamedMatrixOfWideString
++      isStringType
++      isNamedStringType
++      getAllocatedSingleString
++      getAllocatedSingleWideString
++      getAllocatedMatrixOfString
++      getAllocatedMatrixOfWideString
++      getAllocatedNamedSingleString
++      getAllocatedNamedSingleWideString
++      getAllocatedNamedMatrixOfString
++      getAllocatedNamedMatrixOfWideString
++      createSingleString
++      createSingleWideString
++      createNamedSingleString
++      createNamedSingleWideString
++      freeAllocatedSingleString
++      freeAllocatedSingleWideString
++      freeAllocatedMatrixOfString
++      freeAllocatedMatrixOfWideString
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
 -                              CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elem_func_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elem_func.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sparse_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sparse.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)cacsd_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)cacsd_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
++                              CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elem_func_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elem_func.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sparse_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sparse.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)cacsd_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)cacsd_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)operations_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)operations.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../../../libs/elementary_functions.lib"
-                               SuppressStartupBanner="true"
+                               Name="VCLinkerTool"
 -                              AdditionalDependencies="LibScilab.lib elementary_functions_f.lib elem_func.lib sparse.lib cacsd_f.lib"
++                              AdditionalDependencies="LibScilab.lib elementary_functions_f.lib elem_func.lib sparse.lib cacsd_f.lib operations.lib api_scilab.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
 -                              CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elem_func_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elem_func.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sparse_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sparse.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)cacsd_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)cacsd_f.lib&quot; 1&gt;NUL 2&gt;NUL"
++                              CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)elem_func_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elem_func.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sparse_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sparse.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)cacsd_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)cacsd_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)operations_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)operations.lib&quot; 1&gt;NUL 2&gt;NUL"
                        />
                        <Tool
-                               Name="VCLibrarianTool"
-                               OutputFile="../../../../libs/elementary_functions.lib"
-                               SuppressStartupBanner="true"
+                               Name="VCLinkerTool"
 -                              AdditionalDependencies="LibScilab.lib elementary_functions_f.lib elem_func.lib sparse.lib cacsd_f.lib"
++                              AdditionalDependencies="LibScilab.lib elementary_functions_f.lib elem_func.lib sparse.lib cacsd_f.lib operations.lib api_scilab.lib"
+                               OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile=""
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
+                               TargetMachine="17"