Merge remote-tracking branch 'origin/master' into YaSp 14/5214/5
Bruno JOFRET [Wed, 12 Oct 2011 09:48:46 +0000 (11:48 +0200)]
Conflicts:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/etc/scilab.start
scilab/libs/DetectFrameWork2/DetectFramework.vcxproj
scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
scilab/libs/LibScilab/LibScilab.vcxproj
scilab/libs/MALLOC/MALLOC.vcxproj
scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj
scilab/libs/dynamiclibrary/dynamiclibrary.vcxproj
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj.filters
scilab/modules/api_scilab/api_scilab.vcxproj
scilab/modules/api_scilab/src/cpp/api_boolean.cpp
scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_common.cpp
scilab/modules/api_scilab/src/cpp/api_double.cpp
scilab/modules/api_scilab/src/cpp/api_int.cpp
scilab/modules/api_scilab/src/cpp/api_list.cpp
scilab/modules/api_scilab/src/cpp/api_pointer.cpp
scilab/modules/api_scilab/src/cpp/api_poly.cpp
scilab/modules/api_scilab/src/cpp/api_sparse.cpp
scilab/modules/api_scilab/src/cpp/api_string.cpp
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/sci_gateway/c/sci_and.c
scilab/modules/boolean/sci_gateway/c/sci_or.c
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj.filters
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/c/completion.vcxproj.filters
scilab/modules/completion/src/nocompletion/nocompletion.vcxproj
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.in
scilab/modules/core/sci_gateway/c/sci_banner.c
scilab/modules/core/sci_gateway/c/sci_exit.c
scilab/modules/core/sci_gateway/c/sci_getdebuginfo.c
scilab/modules/core/sci_gateway/c/sci_getmodules.c
scilab/modules/core/sci_gateway/c/sci_getos.c
scilab/modules/core/sci_gateway/c/sci_getscilabmode.c
scilab/modules/core/sci_gateway/c/sci_getversion.c
scilab/modules/core/sci_gateway/c/sci_lasterror.c
scilab/modules/core/sci_gateway/c/sci_readgateway.c
scilab/modules/core/sci_gateway/c/sci_sciargs.c
scilab/modules/core/sci_gateway/c/sci_warning.c
scilab/modules/core/sci_gateway/c/sci_what.c
scilab/modules/core/sci_gateway/c/sci_with_module.c
scilab/modules/core/src/c/SCIHOME.c
scilab/modules/core/src/c/core.vcxproj
scilab/modules/core/src/c/core.vcxproj.filters
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/fortran/clause.f
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/data_structures/src/c/data_structures.vcxproj.filters
scilab/modules/data_structures/src/fortran/lstops.f
scilab/modules/development_tools/macros/test_run.sci
scilab/modules/differential_equations/Makefile.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/differential_equations/src/c/differential_equations.vcxproj.filters
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/src/c/double.vcxproj
scilab/modules/double/src/c/double.vcxproj.filters
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/sci_gateway/c/sci_addinter.c
scilab/modules/dynamic_link/sci_gateway/c/sci_c_link.c
scilab/modules/dynamic_link/sci_gateway/c/sci_getdynlibext.c
scilab/modules/dynamic_link/sci_gateway/c/sci_ilib_verbose.c
scilab/modules/dynamic_link/sci_gateway/c/sci_link.c
scilab/modules/dynamic_link/sci_gateway/c/sci_ulink.c
scilab/modules/dynamic_link/src/c/dynamic_link.c
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj.filters
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/sci_gsort.c
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/c/sci_size.c
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/src/nofftw/nofftw.vcxproj
scilab/modules/fileio/LibScilab_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_basename.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_createdir.c
scilab/modules/fileio/sci_gateway/c/sci_deletefile.c
scilab/modules/fileio/sci_gateway/c/sci_fileext.c
scilab/modules/fileio/sci_gateway/c/sci_fileinfo.c
scilab/modules/fileio/sci_gateway/c/sci_fileparts.c
scilab/modules/fileio/sci_gateway/c/sci_filesep.c
scilab/modules/fileio/sci_gateway/c/sci_findfiles.c
scilab/modules/fileio/sci_gateway/c/sci_getshortpathname.c
scilab/modules/fileio/sci_gateway/c/sci_isdir.c
scilab/modules/fileio/sci_gateway/c/sci_isfile.c
scilab/modules/fileio/sci_gateway/c/sci_mgetl.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_mscanf.c
scilab/modules/fileio/sci_gateway/c/sci_msscanf.c
scilab/modules/fileio/sci_gateway/c/sci_pathconvert.c
scilab/modules/fileio/sci_gateway/c/sci_pwd.c
scilab/modules/fileio/sci_gateway/c/sci_removedir.c
scilab/modules/fileio/src/c/fileinfo.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/mgetl.c
scilab/modules/fileio/tests/unit_tests/mtell.dia.ref
scilab/modules/fileio/tests/unit_tests/mtell.tst
scilab/modules/functions/sci_gateway/c/sci_whereis.c
scilab/modules/functions/src/c/LibScilab_Import.def
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/functions/src/c/functions.vcxproj.filters
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/src/nographic_export/nographic_export.vcxproj
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/cpp/sci_about.cpp
scilab/modules/gui/sci_gateway/cpp/sci_displaytree.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/helptools/sci_gateway/cpp/sci_buildDoc.cpp
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj.filters
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_browser/src/c/history_browser.vcxproj.filters
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj.filters
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/c/integer.vcxproj.filters
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/interpolation/src/c/interpolation.vcxproj.filters
scilab/modules/intersci/src/lib/intersci.vcxproj
scilab/modules/io/Makefile.in
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_host.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/c/io.vcxproj.filters
scilab/modules/javasci/Javasci.vcxproj
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/sci_gateway/c/sci_javaclasspath.c
scilab/modules/jvm/sci_gateway/c/sci_system_getproperty.c
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj.filters
scilab/modules/localization/sci_gateway/c/sci_getlanguage.c
scilab/modules/localization/sci_gateway/c/sci_gettext.c
scilab/modules/localization/sci_gateway/c/sci_setdefaultlanguage.c
scilab/modules/localization/sci_gateway/c/sci_setlanguage.c
scilab/modules/localization/src/c/LanguagePreferences_Windows.c
scilab/modules/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/c/mexlib.c
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/optimization/src/c/optimization.vcxproj.filters
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/src/c/errorTable.c
scilab/modules/output_stream/src/c/error_internal.c
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.vcxproj
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/polynomials/src/c/polynomials.vcxproj.filters
scilab/modules/pvm/LibScilab_Import.def
scilab/modules/pvm/Makefile.am
scilab/modules/pvm/Makefile.in
scilab/modules/pvm/pvm.iss
scilab/modules/pvm/pvm.vcxproj
scilab/modules/pvm/pvm.vcxproj.filters
scilab/modules/pvm/src/c/pvm.rc
scilab/modules/pvm/src/c/pvm_proc_ctrl.c
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/randlib/src/c/randlib.vcxproj.filters
scilab/modules/randlib/src/norandlib/norandlib.vcxproj
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.vcxproj
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/src/c/noscicos/noscicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/cpp/sci_closeSciNotesFromScilab.cpp
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj.filters
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj.filters
scilab/modules/sound/sound.vcxproj
scilab/modules/sound/src/nosound/nosound.vcxproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj.filters
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj.filters
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcxproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj.filters
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_ascii.c
scilab/modules/string/sci_gateway/c/sci_code2str.c
scilab/modules/string/sci_gateway/c/sci_convstr.c
scilab/modules/string/sci_gateway/c/sci_emptystr.c
scilab/modules/string/sci_gateway/c/sci_grep.c
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_isletter.c
scilab/modules/string/sci_gateway/c/sci_length.c
scilab/modules/string/sci_gateway/c/sci_part.c
scilab/modules/string/sci_gateway/c/sci_regexp.c
scilab/modules/string/sci_gateway/c/sci_str2code.c
scilab/modules/string/sci_gateway/c/sci_strcat.c
scilab/modules/string/sci_gateway/c/sci_strchr.c
scilab/modules/string/sci_gateway/c/sci_strcmp.c
scilab/modules/string/sci_gateway/c/sci_strcspn.c
scilab/modules/string/sci_gateway/c/sci_strindex.c
scilab/modules/string/sci_gateway/c/sci_string.c
scilab/modules/string/sci_gateway/c/sci_stripblanks.c
scilab/modules/string/sci_gateway/c/sci_strncpy.c
scilab/modules/string/sci_gateway/c/sci_strrev.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/c/sci_strspn.c
scilab/modules/string/sci_gateway/c/sci_strstr.c
scilab/modules/string/sci_gateway/c/sci_strsubst.c
scilab/modules/string/sci_gateway/c/sci_strtod.c
scilab/modules/string/sci_gateway/c/sci_strtok.c
scilab/modules/string/sci_gateway/c/sci_tokens.c
scilab/modules/string/src/c/string.vcxproj
scilab/modules/string/src/c/string.vcxproj.filters
scilab/modules/string/src/c/stringsstrrchr.c
scilab/modules/string/tests/unit_tests/string.tst
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/symbolic/src/c/symbolic.vcxproj.filters
scilab/modules/tclsci/tclsci.vcxproj
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/time/sci_gateway/c/sci_getdate.c
scilab/modules/time/sci_gateway/c/sci_realtime.c
scilab/modules/time/sci_gateway/c/sci_sleep.c
scilab/modules/time/sci_gateway/c/sci_timer.c
scilab/modules/time/sci_gateway/c/sci_xpause.c
scilab/modules/time/time.vcxproj
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/umfpack/src/c/umfpack.vcxproj
scilab/modules/umfpack/src/noumfpack/noumfpack.vcxproj
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/windows_tools/sci_gateway/c/sci_win64.c
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj
scilab/modules/windows_tools/src/c/scilab_windows/spawncommand.c
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcxproj
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp
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/src/c/xcos.vcxproj
scilab/test/good/about.sci
scilab/tools/SetupAtlas/SetupAtlas.vcxproj
scilab/tools/innosetup/code_modules.iss
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss

Change-Id: I3aff1b62ab6ef1c059e0ec311e54a67c78340e04

493 files changed:
1  2 
scilab/.gitignore
scilab/Makefile.am
scilab/Makefile.in
scilab/Scilab.sln
scilab/bin/scilab
scilab/configure
scilab/configure.ac
scilab/contrib/Makefile.in
scilab/etc/scilab.start
scilab/libs/DetectFrameWork2/DetectFramework.vcxproj
scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
scilab/libs/LibScilab/LibScilab.vcxproj
scilab/libs/MALLOC/MALLOC.vcxproj
scilab/libs/MALLOC/Makefile.in
scilab/libs/Makefile.in
scilab/libs/doublylinkedlist/Makefile.in
scilab/libs/doublylinkedlist/doublylinkedlist.vcxproj
scilab/libs/dynamiclibrary/Makefile.in
scilab/libs/dynamiclibrary/dynamiclibrary.vcxproj
scilab/libs/hashtable/Makefile.in
scilab/libs/hashtable/hashtable.vcxproj
scilab/libs/libst/Makefile.in
scilab/libs/libst/libst.vcxproj
scilab/modules/Makefile.am
scilab/modules/Makefile.in
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/action_binding/src/c/action_binding.vcxproj
scilab/modules/action_binding/src/c/action_binding.vcxproj.filters
scilab/modules/api_scilab/Makefile.in
scilab/modules/arnoldi/Makefile.in
scilab/modules/arnoldi/arnoldi.vcxproj
scilab/modules/ast/Makefile.in
scilab/modules/ast/ast-tools/ast-tools.vcxproj
scilab/modules/ast/ast.vcxproj
scilab/modules/atoms/Makefile.in
scilab/modules/boolean/Makefile.am
scilab/modules/boolean/Makefile.in
scilab/modules/boolean/sci_gateway/c/sci_and.c
scilab/modules/boolean/sci_gateway/c/sci_or.c
scilab/modules/boolean/src/c/boolean.vcxproj
scilab/modules/boolean/src/c/boolean.vcxproj.filters
scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
scilab/modules/cacsd/Makefile.am
scilab/modules/cacsd/Makefile.in
scilab/modules/cacsd/src/c/cacsd.vcxproj
scilab/modules/call_scilab/Makefile.in
scilab/modules/call_scilab/call_scilab.vcxproj
scilab/modules/commons/Makefile.in
scilab/modules/commons/src/c/commons.vcxproj
scilab/modules/commons/src/c/commons.vcxproj.filters
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommons.java
scilab/modules/commons/src/java/org/scilab/modules/commons/ScilabCommonsJNI.java
scilab/modules/commons/src/jni/ScilabCommons.i
scilab/modules/commons/src/jni/ScilabCommons_wrap.c
scilab/modules/compatibility_functions/Makefile.in
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completeLine.c
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/c/completion.vcxproj.filters
scilab/modules/completion/src/c/getfieldsdictionary.c
scilab/modules/completion/src/nocompletion/nocompletion.vcxproj
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/sci_gateway/c/sci_iswaitingforinput.c
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/c/console.vcxproj.filters
scilab/modules/console/src/java/org/scilab/modules/console/GuiManagement.java
scilab/modules/console/src/java/org/scilab/modules/console/GuiManagementJNI.java
scilab/modules/console/src/jni/GuiManagement_wrap.c
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/getversion.h
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/machine.h.in
scilab/modules/core/sci_gateway/c/sci_errclear.c
scilab/modules/core/sci_gateway/c/sci_funcprot.c
scilab/modules/core/sci_gateway/c/sci_getdebuginfo.c
scilab/modules/core/sci_gateway/c/sci_getmd5.c
scilab/modules/core/sci_gateway/c/sci_havewindow.c
scilab/modules/core/sci_gateway/c/sci_newfun.c
scilab/modules/core/sci_gateway/c/sci_predef.c
scilab/modules/core/sci_gateway/c/sci_readgateway.c
scilab/modules/core/sci_gateway/c/sci_typename.c
scilab/modules/core/sci_gateway/c/sci_warning.c
scilab/modules/core/sci_gateway/c/sci_what.c
scilab/modules/core/sci_gateway/c/sci_who.c
scilab/modules/core/src/c/callinterf.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/predef.c
scilab/modules/core/src/c/realmain.c
scilab/modules/core/src/c/stack3.c
scilab/modules/core/src/cpp/core_gw.vcxproj
scilab/modules/core/src/cpp/hashtable_core.cpp
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/data_structures/src/c/data_structures.vcxproj.filters
scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
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.am
scilab/modules/differential_equations/Makefile.in
scilab/modules/differential_equations/src/c/differential_equations.vcxproj
scilab/modules/differential_equations/src/c/differential_equations.vcxproj.filters
scilab/modules/double/Makefile.am
scilab/modules/double/Makefile.in
scilab/modules/double/src/c/double.vcxproj
scilab/modules/double/src/c/double.vcxproj.filters
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/macros/windows/dlwGenerateMakefile.sci
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj.filters
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj
scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj.filters
scilab/modules/elementary_functions/src/cpp/elem_func/elem_func.vcxproj
scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj
scilab/modules/fftw/Makefile.am
scilab/modules/fftw/Makefile.in
scilab/modules/fftw/fftw.vcxproj
scilab/modules/fftw/sci_gateway/c/sci_fftw_flags.c
scilab/modules/fftw/src/nofftw/nofftw.vcxproj
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/System_env_Import.def
scilab/modules/fileio/fileio.vcxproj
scilab/modules/fileio/fileio.vcxproj.filters
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c
scilab/modules/fileio/sci_gateway/c/sci_copyfile.c
scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c
scilab/modules/fileio/sci_gateway/c/sci_fullpath.c
scilab/modules/fileio/sci_gateway/c/sci_merror.c
scilab/modules/fileio/sci_gateway/c/sci_movefile.c
scilab/modules/fileio/sci_gateway/c/sci_newest.c
scilab/modules/fileio/sci_gateway/c/sci_pwd.c
scilab/modules/fileio/sci_gateway/c/sci_tempname.c
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj
scilab/modules/fileio/src/c/createtempfilename.c
scilab/modules/fileio/src/c/fprintfMat.c
scilab/modules/fileio/src/c/fscanfMat.c
scilab/modules/fileio/tests/unit_tests/mtell.dia.ref
scilab/modules/fileio/tests/unit_tests/mtell.tst
scilab/modules/functions/Makefile.am
scilab/modules/functions/Makefile.in
scilab/modules/functions/sci_gateway/c/sci_execstr.c
scilab/modules/functions/sci_gateway/c/sci_libraryinfo.c
scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj
scilab/modules/functions/src/c/LibScilab_Import.def
scilab/modules/functions/src/c/functions.vcxproj
scilab/modules/functions/src/c/functions.vcxproj.filters
scilab/modules/functions/src/c/functions_f_Import.def
scilab/modules/functions/src/c/isScilabFunction.c
scilab/modules/functions/src/fortran/functions_f.vfproj
scilab/modules/functions_manager/Makefile.in
scilab/modules/functions_manager/functions_manager.vcxproj
scilab/modules/genetic_algorithms/Makefile.in
scilab/modules/graph/Makefile.in
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcxproj
scilab/modules/graphic_export/graphic_export.vcxproj.filters
scilab/modules/graphic_export/src/nographic_export/nographic_export.vcxproj
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/src/c/SetProperty.c
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/c/sci_delmenu.c
scilab/modules/gui/sci_gateway/c/sci_setmenu.c
scilab/modules/gui/sci_gateway/c/sci_toolbar.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/gui/sci_gateway/cpp/sci_about.cpp
scilab/modules/gui/sci_gateway/cpp/sci_displaytree.cpp
scilab/modules/gui/sci_gateway/cpp/sci_printfigure.cpp
scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp
scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp
scilab/modules/gui/src/c/gui.vcxproj
scilab/modules/gui/src/c/gui.vcxproj.filters
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/hdf5/src/c/hdf5.vcxproj.filters
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/helptools/macros/xmltoformat.sci
scilab/modules/helptools/src/c/helptools.vcxproj
scilab/modules/helptools/src/c/helptools.vcxproj.filters
scilab/modules/history_browser/Makefile.am
scilab/modules/history_browser/Makefile.in
scilab/modules/history_browser/src/c/history_browser.vcxproj
scilab/modules/history_browser/src/c/history_browser.vcxproj.filters
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/sci_gateway/c/sci_historymanager.c
scilab/modules/history_manager/sci_gateway/c/sci_loadhistory.c
scilab/modules/history_manager/sci_gateway/c/sci_saveafterncommands.c
scilab/modules/history_manager/src/c/getCommentDateSession.c
scilab/modules/history_manager/src/c/history_manager.vcxproj
scilab/modules/history_manager/src/c/history_manager.vcxproj.filters
scilab/modules/integer/Makefile.am
scilab/modules/integer/Makefile.in
scilab/modules/integer/src/c/integer.vcxproj
scilab/modules/integer/src/c/integer.vcxproj.filters
scilab/modules/integer/src/cpp/integer_gw.vcxproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/interpolation/src/c/interpolation.vcxproj.filters
scilab/modules/intersci/Makefile.am
scilab/modules/intersci/Makefile.in
scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcxproj
scilab/modules/intersci/src/exe/interscin/interscin.vcxproj
scilab/modules/intersci/src/lib/intersci.vcxproj
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/sci_gateway/c/sci_getenv.c
scilab/modules/io/sci_gateway/c/sci_setenv.c
scilab/modules/io/src/c/io.vcxproj
scilab/modules/io/src/c/io.vcxproj.filters
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/javasci/Makefile.in
scilab/modules/javasci/src/c/javasci2_helper.c
scilab/modules/javasci/src/jni/call_scilab_wrap.c
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/libjvm.vcxproj
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/jvm/src/c/getJvmOptions.c
scilab/modules/jvm/src/c/loadLibrarypath.c
scilab/modules/linear_algebra/Makefile.am
scilab/modules/linear_algebra/Makefile.in
scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj
scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj.filters
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/sci_gateway/c/sci_getlanguage.c
scilab/modules/localization/sci_gateway/c/sci_setdefaultlanguage.c
scilab/modules/localization/sci_gateway/c/sci_setlanguage.c
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/localization/src/c/LanguagePreferences_Windows.c
scilab/modules/localization/src/localization.vcxproj
scilab/modules/localization/src/localization.vcxproj.filters
scilab/modules/m2sci/Makefile.in
scilab/modules/maple2scilab/Makefile.in
scilab/modules/matio/Makefile.in
scilab/modules/matio/matio.vcxproj
scilab/modules/matio/sci_gateway/c/sci_matfile_listvar.c
scilab/modules/matio/sci_gateway/c/sci_matfile_open.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c
scilab/modules/matio/sci_gateway/c/sci_matfile_varwrite.c
scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj
scilab/modules/mexlib/Makefile.am
scilab/modules/mexlib/Makefile.in
scilab/modules/mexlib/src/cpp/sci_gateway.cpp
scilab/modules/mexlib/src/libmat/libmat.vcxproj
scilab/modules/mexlib/src/libmex/libmex.vcxproj
scilab/modules/mexlib/src/libmx/libmx.vcxproj
scilab/modules/modules_manager/Makefile.in
scilab/modules/operations/Makefile.in
scilab/modules/operations/operations.vcxproj
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/src/c/optimization.vcxproj
scilab/modules/optimization/src/c/optimization.vcxproj.filters
scilab/modules/output_stream/Makefile.am
scilab/modules/output_stream/Makefile.in
scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj
scilab/modules/output_stream/src/c/do_xxprintf.c
scilab/modules/output_stream/src/c/errorTable.c
scilab/modules/output_stream/src/c/error_internal.c
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/output_stream/src/c/set_xxprintf.c
scilab/modules/output_stream/src/fortran/output_stream_f.vfproj
scilab/modules/overloading/Makefile.in
scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in
scilab/modules/parallel/sci_gateway/cpp/sci_parallel_run.cpp
scilab/modules/parallel/src/c/parallel.vcxproj
scilab/modules/parameters/Makefile.am
scilab/modules/parameters/Makefile.in
scilab/modules/parameters/parameters.vcxproj
scilab/modules/parse/Makefile.in
scilab/modules/parse/parse.vcxproj
scilab/modules/polynomials/Makefile.am
scilab/modules/polynomials/Makefile.in
scilab/modules/polynomials/src/c/polynomials.vcxproj
scilab/modules/polynomials/src/c/polynomials.vcxproj.filters
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/randlib/src/c/randlib.vcxproj.filters
scilab/modules/randlib/src/norandlib/norandlib.vcxproj
scilab/modules/renderer/Makefile.am
scilab/modules/renderer/Makefile.in
scilab/modules/renderer/renderer.vcxproj
scilab/modules/renderer/renderer.vcxproj.filters
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/macros/buildmacros.sce
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/src/c/noscicos/noscicos.vcxproj
scilab/modules/scicos/src/c/scicos.c
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcxproj
scilab/modules/scicos_blocks/Makefile.am
scilab/modules/scicos_blocks/Makefile.in
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj.filters
scilab/modules/scicos_blocks/src/cpp/affich2.cpp
scilab/modules/scinotes/Makefile.am
scilab/modules/scinotes/Makefile.in
scilab/modules/scinotes/sci_gateway/cpp/sci_closeSciNotesFromScilab.cpp
scilab/modules/scinotes/sci_gateway/cpp/sci_scinotes.cpp
scilab/modules/scinotes/src/c/scinotes.vcxproj
scilab/modules/scinotes/src/c/scinotes.vcxproj.filters
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj
scilab/modules/signal_processing/src/c/signal_processing.vcxproj.filters
scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
scilab/modules/simulated_annealing/Makefile.in
scilab/modules/sound/Makefile.am
scilab/modules/sound/Makefile.in
scilab/modules/sound/sci_gateway/c/sci_PlaySound.c
scilab/modules/sound/sci_gateway/c/sci_beep.c
scilab/modules/sound/sound.vcxproj
scilab/modules/sound/src/nosound/nosound.vcxproj
scilab/modules/sparse/Makefile.am
scilab/modules/sparse/Makefile.in
scilab/modules/sparse/src/c/sparse.vcxproj
scilab/modules/sparse/src/c/sparse.vcxproj.filters
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/sci_gateway/c/sci_besseli.c
scilab/modules/special_functions/sci_gateway/c/sci_besselj.c
scilab/modules/special_functions/sci_gateway/c/sci_besselk.c
scilab/modules/special_functions/sci_gateway/c/sci_bessely.c
scilab/modules/special_functions/src/c/special_functions.vcxproj
scilab/modules/special_functions/src/c/special_functions.vcxproj.filters
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/spreadsheet/src/c/ripole/pldstr.c
scilab/modules/spreadsheet/src/c/xls.c
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcxproj
scilab/modules/statistics/Makefile.am
scilab/modules/statistics/Makefile.in
scilab/modules/statistics/macros/variancef.sci
scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj
scilab/modules/statistics/src/c/statistics.vcxproj.filters
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_isalphanum.c
scilab/modules/string/sci_gateway/c/sci_isascii.c
scilab/modules/string/sci_gateway/c/sci_isdigit.c
scilab/modules/string/sci_gateway/c/sci_strsplit.c
scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj
scilab/modules/symbol/Makefile.in
scilab/modules/symbol/symbol.vcxproj
scilab/modules/symbolic/Makefile.am
scilab/modules/symbolic/Makefile.in
scilab/modules/symbolic/src/c/symbolic.vcxproj
scilab/modules/symbolic/src/c/symbolic.vcxproj.filters
scilab/modules/system_env/Makefile.in
scilab/modules/system_env/system_env.vcxproj
scilab/modules/tclsci/Makefile.am
scilab/modules/tclsci/Makefile.in
scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalStr.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVar.c
scilab/modules/tclsci/sci_gateway/c/sci_TCL_GetVersion.c
scilab/modules/texmacs/Makefile.in
scilab/modules/threads/Makefile.in
scilab/modules/threads/threads.vcxproj
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/c/sci_calendar.c
scilab/modules/time/sci_gateway/c/sci_realtime.c
scilab/modules/time/sci_gateway/c/sci_timer.c
scilab/modules/time/sci_gateway/c/sci_xpause.c
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/sci_gateway/cpp/types_gw/types_gw.vcxproj
scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java
scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerTypeEnum.java
scilab/modules/types/types.vcxproj
scilab/modules/ui_data/Makefile.am
scilab/modules/ui_data/Makefile.in
scilab/modules/ui_data/src/c/ui_data.vcxproj
scilab/modules/ui_data/src/c/ui_data.vcxproj.filters
scilab/modules/ui_data/src/noui_data/noui_data.vcxproj
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
scilab/modules/umfpack/src/c/taucs_scilab.c
scilab/modules/windows_tools/Makefile.am
scilab/modules/windows_tools/Makefile.in
scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c
scilab/modules/windows_tools/sci_gateway/c/sci_consolebox.c
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/windows_tools/sci_gateway/c/sci_mcisendstring.c
scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c
scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj
scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj.filters
scilab/modules/windows_tools/src/c/registry.c
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/nowindows_tools/nowindows_tools.vcxproj
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/cpp/sci_closeXcosFromScilab.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_warnBlockByUID.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosConfigureXmlFile.cpp
scilab/modules/xcos/sci_gateway/cpp/sci_xcosDiagramToHDF5.cpp
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/src/c/xcos.vcxproj
scilab/modules/xcos/src/c/xcos.vcxproj.filters
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/includes/gw_xml.h
scilab/modules/xml/includes/xml_mlist.h
scilab/modules/xml/sci_gateway/c/gw_xml.c
scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp
scilab/modules/xml/sci_gateway/cpp/sci_insertion.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_e.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_length.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLAttr_size.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLList_e.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLList_length.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_XMLList_size.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_c_i_XMLAttr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_foo_i_XMLList.cpp
scilab/modules/xml/sci_gateway/cpp/sci_percent_s_i_XMLList.cpp
scilab/modules/xml/sci_gateway/cpp/sci_print.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlAddNs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlClose.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlDocument.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlDump.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlElement.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetNsByHref.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetNsByPrefix.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlGetOpenStreams.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlNs.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlRead.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlReadStr.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidate.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlValidationFile.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlWrite.cpp
scilab/modules/xml/sci_gateway/cpp/sci_xmlXPath.cpp
scilab/modules/xml/src/c/XMLMlistsManagement.c
scilab/modules/xml/src/cpp/XMLList_insertion.hpp
scilab/modules/xml/src/cpp/XMLObject.cpp
scilab/modules/xml/src/cpp/XMLObject.hxx
scilab/modules/xml/src/cpp/XMLRhsValue.hxx
scilab/modules/xml/src/cpp/extraction.hpp
scilab/modules/xml/src/cpp/insertion.hpp
scilab/modules/xml/xml.vcxproj
scilab/tools/Dumpexts/Dumpexts.vcxproj
scilab/tools/SetupAtlas/SetupAtlas.vcxproj
scilab/tools/innosetup/components.iss
scilab/tools/innosetup/files.iss

@@@ -172,3 -165,5 +167,5 @@@ modules/types/src/jni/sci_types_wrap.
  
  # clang / scan-build generated temporary files
  modules/*/*.plist
 -modules/pvm/
++modules/pvm/
@@@ -42,15 -42,11 +42,16 @@@ scilab_bin_CFLAGS          = -I$(top_srcdir)/m
  
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
  # (causing issues on some platform)
 -COMMON_LIBS = $(top_builddir)/modules/core/libscicore.la \
 -$(top_builddir)/modules/completion/libscicompletion.la \
 -$(top_builddir)/modules/localization/libscilocalization.la \
 -$(top_builddir)/modules/io/libsciio.la \
 -$(LTLIBINTL)
 +COMMON_LIBS = \
 +    $(top_builddir)/modules/threads/libscithreads.la \
 +    $(top_builddir)/modules/core/libscicore.la \
 +    $(top_builddir)/modules/completion/libscicompletion.la \
 +    $(top_builddir)/modules/localization/libscilocalization.la \
 +    $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
 +    $(top_builddir)/modules/io/libsciio.la \
 +    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
++    $(top_builddir)/modules/types/libscitypes.la \
 +    $(LTLIBINTL)
  
  SCILAB_LIB=$(top_builddir)/modules/libscilab.la
  SCILAB_CLI_LIB=$(top_builddir)/modules/libscilab-cli.la
@@@ -372,10 -345,10 +373,10 @@@ localization-status
                        echo "        Creating $$PATHTO"; \
                        mkdir -p $$PATHTO; \
                fi; \
-               echo "Building $$LOCALE"; \
+               echo "Building status for $$LOCALE"; \
                echo "SCI=$(top_srcdir) php tools/localization/revcheck.php $$LOCALE > $$PATHTO/index.html"; \
                SCI=$(top_srcdir) php tools/localization/revcheck.php $$LOCALE > $$PATHTO/index.html; \
--      done; 
++      done;
  
  endif
  
@@@ -196,42 -195,27 +196,43 @@@ call_scilab_readwritestring_LINK = $(LI
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(call_scilab_readwritestring_CFLAGS) $(CFLAGS) \
        $(call_scilab_readwritestring_LDFLAGS) $(LDFLAGS) -o $@
 -am_scilab_bin_OBJECTS = scilab_bin-mainscic.$(OBJEXT)
 +am__scilab_bin_SOURCES_DIST =  \
 +      $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
 +      $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +@IS_MACOSX_TRUE@am__objects_1 = scilab_bin-initMacOSXEnv.$(OBJEXT)
 +am_scilab_bin_OBJECTS = scilab_bin-scilab.$(OBJEXT) \
 +      scilab_bin-tasks.$(OBJEXT) $(am__objects_1)
  scilab_bin_OBJECTS = $(am_scilab_bin_OBJECTS)
  am__DEPENDENCIES_1 =
 -am__DEPENDENCIES_2 = $(top_builddir)/modules/core/libscicore.la \
 +am__DEPENDENCIES_2 = $(top_builddir)/modules/threads/libscithreads.la \
 +      $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/completion/libscicompletion.la \
        $(top_builddir)/modules/localization/libscilocalization.la \
 -      $(top_builddir)/modules/io/libsciio.la $(am__DEPENDENCIES_1)
 +      $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
 +      $(top_builddir)/modules/io/libsciio.la \
 +      $(top_builddir)/modules/output_stream/libscioutput_stream.la \
++      $(top_builddir)/modules/types/libscitypes.la \
 +      $(am__DEPENDENCIES_1)
  scilab_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_LIB)
 -scilab_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_bin_CFLAGS) \
 -      $(CFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 -am_scilab_cli_bin_OBJECTS = scilab_cli_bin-mainscic.$(OBJEXT)
 +scilab_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(scilab_bin_LDFLAGS) $(LDFLAGS) -o $@
 +am_scilab_cli_bin_OBJECTS = scilab_cli_bin-scilab.$(OBJEXT) \
 +      scilab_cli_bin-tasks.$(OBJEXT)
  scilab_cli_bin_OBJECTS = $(am_scilab_cli_bin_OBJECTS)
  scilab_cli_bin_DEPENDENCIES = $(am__DEPENDENCIES_2) $(SCILAB_CLI_LIB)
 -scilab_cli_bin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 -      $(LIBTOOLFLAGS) --mode=link $(CCLD) $(scilab_cli_bin_CFLAGS) \
 -      $(CFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
 +scilab_cli_bin_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 +      $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +      $(CXXFLAGS) $(scilab_cli_bin_LDFLAGS) $(LDFLAGS) -o $@
  am__scilab_static_bin_SOURCES_DIST =  \
 -      $(top_srcdir)/modules/console/src/c/others/mainscic.c
 -am__objects_1 = scilab_static_bin-mainscic.$(OBJEXT)
 -@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_1)
 +      $(top_srcdir)/modules/core/src/cpp/scilab.cpp \
 +      $(top_srcdir)/modules/core/src/cpp/tasks.cpp \
 +      $(top_srcdir)/modules/core/src/c/initMacOSXEnv.c
 +@IS_MACOSX_TRUE@am__objects_2 =  \
 +@IS_MACOSX_TRUE@      scilab_static_bin-initMacOSXEnv.$(OBJEXT)
 +am__objects_3 = scilab.$(OBJEXT) tasks.$(OBJEXT) $(am__objects_2)
 +@ENABLE_STATIC_TRUE@am_scilab_static_bin_OBJECTS = $(am__objects_3)
  scilab_static_bin_OBJECTS = $(am_scilab_static_bin_OBJECTS)
  @ENABLE_STATIC_TRUE@scilab_static_bin_DEPENDENCIES =  \
  @ENABLE_STATIC_TRUE@  $(top_builddir)/modules/libscilab.la
@@@ -629,15 -594,11 +625,16 @@@ scilab_bin_CFLAGS = -I$(top_srcdir)/mod
  
  # Localization dep already exists because of the `exportLocaleToSystem' symbol
  # (causing issues on some platform)
 -COMMON_LIBS = $(top_builddir)/modules/core/libscicore.la \
 -$(top_builddir)/modules/completion/libscicompletion.la \
 -$(top_builddir)/modules/localization/libscilocalization.la \
 -$(top_builddir)/modules/io/libsciio.la \
 -$(LTLIBINTL)
 +COMMON_LIBS = \
 +    $(top_builddir)/modules/threads/libscithreads.la \
 +    $(top_builddir)/modules/core/libscicore.la \
 +    $(top_builddir)/modules/completion/libscicompletion.la \
 +    $(top_builddir)/modules/localization/libscilocalization.la \
 +    $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
 +    $(top_builddir)/modules/io/libsciio.la \
 +    $(top_builddir)/modules/output_stream/libscioutput_stream.la \
++    $(top_builddir)/modules/types/libscitypes.la \
 +    $(LTLIBINTL)
  
  SCILAB_LIB = $(top_builddir)/modules/libscilab.la
  SCILAB_CLI_LIB = $(top_builddir)/modules/libscilab-cli.la
@@@ -2030,10 -1873,10 +2026,10 @@@ check-java
  @GENERATE_LOCALIZATION_FILES_TRUE@                    echo "        Creating $$PATHTO"; \
  @GENERATE_LOCALIZATION_FILES_TRUE@                    mkdir -p $$PATHTO; \
  @GENERATE_LOCALIZATION_FILES_TRUE@            fi; \
- @GENERATE_LOCALIZATION_FILES_TRUE@            echo "Building $$LOCALE"; \
+ @GENERATE_LOCALIZATION_FILES_TRUE@            echo "Building status for $$LOCALE"; \
  @GENERATE_LOCALIZATION_FILES_TRUE@            echo "SCI=$(top_srcdir) php tools/localization/revcheck.php $$LOCALE > $$PATHTO/index.html"; \
  @GENERATE_LOCALIZATION_FILES_TRUE@            SCI=$(top_srcdir) php tools/localization/revcheck.php $$LOCALE > $$PATHTO/index.html; \
--@GENERATE_LOCALIZATION_FILES_TRUE@    done; 
++@GENERATE_LOCALIZATION_FILES_TRUE@    done;
  
  @GENERATE_LOCALIZATION_FILES_TRUE@install-data-local:
  @GENERATE_LOCALIZATION_FILES_TRUE@    @$(mkinstalldirs) $(DESTDIR)$(localedir); \
@@@ -101,12 -104,11 +101,7 @@@ Project("{6989167D-11E4-40FE-8C1A-2192A
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvm", "modules\pvm\pvm.vcxproj", "{63352867-3983-48E3-94FE-DD8F0D6E921F}"
-       ProjectSection(ProjectDependencies) = postProject
-               {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
-       EndProjectSection
- EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "randlib", "modules\randlib\src\c\randlib.vcxproj", "{34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}"
 -      ProjectSection(ProjectDependencies) = postProject
 -              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 -              {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
 -      EndProjectSection
  EndProject
  Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "randlib_f", "modules\randlib\src\fortran\randlib_f.vfproj", "{BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}"
        ProjectSection(ProjectDependencies) = postProject
@@@ -355,8 -388,14 +356,11 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamiclibrary", "libs\dynamiclibrary\dynamiclibrary.vcxproj", "{77154919-8A20-4F35-B7C7-6B3B957BDCA1}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localization-Ant", "modules\localization\src\java\localization-JAVA.vcxproj", "{FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+       EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographics", "modules\graphics\src\nographics\nographics.vcxproj", "{0AC1142C-0EFF-4406-9E5D-6111A7A8F614}"
 -      ProjectSection(ProjectDependencies) = postProject
 -              {64BC155E-292F-484F-9404-76EE6AE67A43} = {64BC155E-292F-484F-9404-76EE6AE67A43}
 -      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer-Ant", "modules\renderer\src\java\renderer-JAVA.vcxproj", "{4235A847-ED0E-43A3-B62B-E59CB857EDE9}"
  EndProject
@@@ -483,99 -536,47 +504,105 @@@ EndProjec
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_scilab\api_scilab.vcxproj", "{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcxproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcxproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+       EndProjectSection
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "operations", "modules\operations\operations.vcxproj", "{1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +              {3735EFF9-925B-45B1-82CF-762658E69E70} = {3735EFF9-925B-45B1-82CF-762658E69E70}
 +      EndProjectSection
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes-Ant", "modules\scinotes\src\java\scinotes-JAVA.vcxproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
+       ProjectSection(ProjectDependencies) = postProject
+               {63965A84-E354-4CBC-BFAC-FDFC8224573F} = {63965A84-E354-4CBC-BFAC-FDFC8224573F}
+               {251D7C8F-9B69-4CE9-959E-57F343DDC883} = {251D7C8F-9B69-4CE9-959E-57F343DDC883}
+               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
+               {E9783492-017E-4811-9CC7-6B71856F847C} = {E9783492-017E-4811-9CC7-6B71856F847C}
+               {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D} = {B5E4D0C2-8C6A-4437-81BF-DBFA95900C9D}
+       EndProjectSection
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcxproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func", "modules\elementary_functions\src\cpp\elem_func\elem_func.vcxproj", "{E1284D3E-4B3F-446B-B541-F661A8A166A7}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D} = {DBC45B0D-6E0A-4107-B284-5A3B0C5BB50D}
 +      EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcxproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elem_func_gw", "modules\elementary_functions\sci_gateway\cpp\elem_func_gw\elem_func_gw.vcxproj", "{9881F0CE-A1AC-4744-B709-7C1453A77B95}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcxproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_manager", "modules\functions_manager\functions_manager.vcxproj", "{8EAC9381-C059-43EA-B5D7-FD5D6997B0BD}"
        ProjectSection(ProjectDependencies) = postProject
 -              {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
 -              {B2911268-79E2-4FE5-AD59-2C3CB7CB794E} = {B2911268-79E2-4FE5-AD59-2C3CB7CB794E}
 -              {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
 -              {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC} = {F01C26E3-E409-4E74-BA84-C7C4A71A7FDC}
 +              {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA} = {9594AC02-20EE-4FBF-95B4-BFA5865ED7CA}
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parse", "modules\parse\parse.vcxproj", "{74D43792-DBFC-47F0-ADBC-4D7A20CDADA2}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "symbol", "modules\symbol\symbol.vcxproj", "{2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types", "modules\types\types.vcxproj", "{64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_env", "modules\system_env\system_env.vcxproj", "{7CA60AEF-9AFA-4D06-AF28-613C0AA27640}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_yasp", "modules\core\core_yasp.vcxproj", "{14373D41-991A-412E-8EA7-A832D98047B8}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boolean_gw", "modules\boolean\src\cpp\boolean_gw.vcxproj", "{09E6CF32-EF2F-4C63-A2B8-B04964768BD6}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_gw", "modules\core\src\cpp\core_gw.vcxproj", "{3E933EB6-D427-4828-9B30-B6B9987491F6}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io_gw", "modules\io\src\cpp\io_gw.vcxproj", "{719EC179-3AD3-4C6B-BBD8-B44C96B1A204}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
        EndProjectSection
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\xcos.vcxproj", "{494FA8C9-6C85-4175-BE4C-9A113C7A3278}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcxproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
-       ProjectSection(ProjectDependencies) = postProject
-               {405E6B33-DBA9-4850-A19F-19298DA5A64D} = {405E6B33-DBA9-4850-A19F-19298DA5A64D}
-       EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types_gw", "modules\types\sci_gateway\cpp\types_gw\types_gw.vcxproj", "{C2E5F4F6-5EE7-4B36-BFAC-4AC36BB41420}"
-       ProjectSection(ProjectDependencies) = postProject
-               {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
-       EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_gw", "modules\functions\sci_gateway\cpp\functions_gw.vcxproj", "{67FF36D3-EC5A-4F0D-BF3B-A84A66D77294}"
-       ProjectSection(ProjectDependencies) = postProject
-               {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
-       EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream_gw", "modules\output_stream\sci_gateway\cpp\output_stream_gw\output_stream_gw.vcxproj", "{C000FDF7-4D32-4630-9595-560D9CC66D11}"
-       ProjectSection(ProjectDependencies) = postProject
-               {9252A034-7F22-4CB1-A634-4577DA69F2D0} = {9252A034-7F22-4CB1-A634-4577DA69F2D0}
-               {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
-       EndProjectSection
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modelicat", "modules\scicos\src\translator\translator.vcxproj", "{9E0DE362-60A0-4584-9FF1-BB537DA94F40}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2modelica", "modules\scicos\src\xml2modelica\xml2modelica.vcxproj", "{7CF15086-6DED-4F83-9C40-C4951FD373B3}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph-Ant", "modules\graph\src\java\graph-JAVA.vcxproj", "{968FD6C1-5845-4B22-B61E-F6DE987D47AD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43} = {FBA3BC3F-8A2C-4D47-A50D-EB808BE42F43}
+               {9188FA91-E039-485D-AF1D-781CEA92F541} = {9188FA91-E039-485D-AF1D-781CEA92F541}
+       EndProjectSection
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer_gw", "modules\integer\src\cpp\integer_gw.vcxproj", "{215274D7-05EC-4D1E-B7BB-B2C957DA960B}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {1F4A0344-99ED-461B-BD53-1593788FB34D} = {1F4A0344-99ED-461B-BD53-1593788FB34D}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "matio_gw", "modules\matio\sci_gateway\cpp\matio_gw.vcxproj", "{764FAC09-369D-4C11-A0FF-CE097D9A4FAF}"
 +EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-Ant", "modules\types\src\java\types-JAVA.vcxproj", "{ABCB724E-8534-4420-AC12-7C33A606ABA3}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+       EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rename-vc-files", "Visual-Studio-settings\rename-vc-files\rename-vc-files.vcxproj", "{DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}"
  EndProject
@@@ -601,17 -594,18 +628,18 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser-Ant", "modules\history_browser\src\java\history_browser-JAVA.vcxproj", "{95C21D50-FFD1-4FCE-A545-49FA1F825B28}"
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "history_browser", "modules\history_browser\src\c\history_browser.vcxproj", "{AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data", "modules\ui_data\src\c\ui_data.vcxproj", "{142D643B-A9EC-49DB-9D48-A925A20F63B1}"
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nolibjvm", "modules\jvm\src\nojvm\nojvm.vcxproj", "{889AD61B-12E9-4F85-8525-B83C16C88C3F}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_data-Ant", "modules\ui_data\src\java\ui_data-JAVA.vcxproj", "{405E6B33-DBA9-4850-A19F-19298DA5A64D}"
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nogui", "modules\gui\src\nogui\nogui.vcxproj", "{58A50B97-FA8D-4700-9E4A-C4993638EB7A}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes", "modules\scinotes\src\c\scinotes.vcxproj", "{BAE68B54-2C1A-44D0-A0E9-05156A784E79}"
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scinotes-Ant", "modules\scinotes\src\java\scinotes-JAVA.vcxproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
- EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nohistory_browser", "modules\history_browser\src\nohistory_browser\nohistory_browser.vcxproj", "{6EA99B1F-99B4-4528-8195-7508EF70CFED}"
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallel", "modules\parallel\src\c\parallel.vcxproj", "{56A2E2F3-26CF-45D5-BE7A-534C39CD7003}"
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commons-Ant", "modules\commons\src\java\commons-JAVA.vcxproj", "{9188FA91-E039-485D-AF1D-781CEA92F541}"
+       ProjectSection(ProjectDependencies) = postProject
+               {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4} = {DD8A0506-8D31-4CF8-856A-C10ECE9C13A4}
+       EndProjectSection
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream-Ant", "modules\output_stream\src\java\output_stream-JAVA.vcxproj", "{F3943691-FF61-48B4-9CA4-10E9D1F600A6}"
  EndProject
@@@ -647,17 -629,10 +675,21 @@@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noui_data", "modules\ui_data\src\noui_data\noui_data.vcxproj", "{337A52F8-310E-49E3-A2BA-F19CA32EB617}"
  EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "console_gw", "modules\console\sci_gateway\cpp\console_gw.vcxproj", "{273B1F5C-C137-46D1-B516-FFE5764FABE5}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "signal_processing_gw", "modules\signal_processing\sci_gateway\cpp\signal_processing_gw.vcxproj", "{A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}"
 +      ProjectSection(ProjectDependencies) = postProject
 +              {959384FC-016C-4B01-B848-1B18D26B6CC4} = {959384FC-016C-4B01-B848-1B18D26B6CC4}
 +      EndProjectSection
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linear_algebra_gw", "modules\linear_algebra\sci_gateway\cpp\linear_algebra_gw.vcxproj", "{EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}"
 +EndProject
 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "statistics_gw", "modules\statistics\sci_gateway\cpp\statistics_gw.vcxproj", "{EAE1009F-B967-43C4-9408-97A37EFA8678}"
 +EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "types-JAVA-tests", "modules\types\tests\java\types-JAVA-tests.vcxproj", "{3F4504A3-1116-40BD-9612-F5E83D09CC99}"
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "modules\xml\xml.vcxproj", "{EF5402DA-29FD-4F1B-B98B-D284D4E27C15}"
+ EndProject
  Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|Win32.Build.0 = Release|Win32
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.ActiveCfg = Release|x64
                {337A52F8-310E-49E3-A2BA-F19CA32EB617}.Release|x64.Build.0 = Release|x64
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|Win32.Build.0 = Debug|Win32
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|x64.ActiveCfg = Debug|x64
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Debug|x64.Build.0 = Debug|x64
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|Win32.ActiveCfg = Release|Win32
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|Win32.Build.0 = Release|Win32
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|x64.ActiveCfg = Release|x64
 +              {273B1F5C-C137-46D1-B516-FFE5764FABE5}.Release|x64.Build.0 = Release|x64
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|Win32.Build.0 = Debug|Win32
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|x64.ActiveCfg = Debug|x64
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Debug|x64.Build.0 = Debug|x64
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|Win32.ActiveCfg = Release|Win32
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|Win32.Build.0 = Release|Win32
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|x64.ActiveCfg = Release|x64
 +              {A968A82E-B2DC-4ED2-BD9B-12C1E97ABBB4}.Release|x64.Build.0 = Release|x64
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|Win32.Build.0 = Debug|Win32
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|x64.ActiveCfg = Debug|x64
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Debug|x64.Build.0 = Debug|x64
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|Win32.ActiveCfg = Release|Win32
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|Win32.Build.0 = Release|Win32
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|x64.ActiveCfg = Release|x64
 +              {EE43BE6D-817D-4B09-AC40-7E6AC5BDB80D}.Release|x64.Build.0 = Release|x64
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|Win32.ActiveCfg = Debug|Win32
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|Win32.Build.0 = Debug|Win32
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|x64.ActiveCfg = Debug|x64
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Debug|x64.Build.0 = Debug|x64
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|Win32.ActiveCfg = Release|Win32
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|Win32.Build.0 = Release|Win32
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|x64.ActiveCfg = Release|x64
 +              {EAE1009F-B967-43C4-9408-97A37EFA8678}.Release|x64.Build.0 = Release|x64
+               {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Debug|Win32.ActiveCfg = Debug|Win32
+               {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Debug|x64.ActiveCfg = Debug|x64
+               {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|Win32.ActiveCfg = Release|Win32
+               {3F4504A3-1116-40BD-9612-F5E83D09CC99}.Release|x64.ActiveCfg = Release|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.ActiveCfg = Debug|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|Win32.Build.0 = Debug|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.ActiveCfg = Debug|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Debug|x64.Build.0 = Debug|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.ActiveCfg = Release|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|Win32.Build.0 = Release|Win32
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.ActiveCfg = Release|x64
+               {EF5402DA-29FD-4F1B-B98B-D284D4E27C15}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
Simple merge
@@@ -10594,7 -10293,7 +10587,7 @@@ $as_echo "$ac_java_classpath" >&6; 
  $as_echo_n "checking to see if the java compiler works... " >&6; }
  
      cat << \EOF > conftest.java
- // #line 10597 "configure"
 -// #line 10296 "configure"
++// #line 10590 "configure"
  
  
  public class conftest {
@@@ -10660,7 -10359,7 +10653,7 @@@ $as_echo_n "checking type of jvm... " >
      if test "x$ac_java_jvm_name" = "x" ; then
  
      cat << \EOF > conftest.java
- // #line 10663 "configure"
 -// #line 10362 "configure"
++// #line 10656 "configure"
  import gnu.java.io.EncodingManager;
  
  public class conftest {
@@@ -10722,9 -10421,8 +10715,8 @@@ $as_echo_n "checking java API version..
  
      # The class java.nio.charset.Charset is new to 1.4
  
      cat << \EOF > conftest.java
- // #line 10727 "configure"
 -// #line 10425 "configure"
++// #line 10719 "configure"
  import java.nio.charset.Charset;
  
  public class conftest {
  
      # The class java.lang.StringBuilder is new to 1.5
  
      cat << \EOF > conftest.java
- // #line 10772 "configure"
 -// #line 10469 "configure"
++// #line 10763 "configure"
  import java.lang.StringBuilder;
  
  public class conftest {
  
      # The class java.util.ArrayDeque is new to 1.6
  
      cat << \EOF > conftest.java
- // #line 10817 "configure"
 -// #line 10513 "configure"
++// #line 10807 "configure"
  import java.util.ArrayDeque;
  
  public class conftest {
              fi
  
  
+     # The class java.nio.file.Path is new to 1.7
+     cat << \EOF > conftest.java
 -// #line 10557 "configure"
++// #line 10851 "configure"
+ import java.nio.file.Path;
+ public class conftest {
+     public static void main(String[] argv) {
+     }
+ }
+ EOF
+     CLASSPATH=$ac_java_classpath
+     export CLASSPATH
+     cmd="$JAVAC ${JAVAC_FLAGS} conftest.java"
+     if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5) ; then
+        if test ""no"" = "no"; then
+            echo "yes" >&5
+               ac_java_jvm_version=1.7
+        else
+               cmd="$JAVA conftest"
+               if (echo $cmd >&5 ; eval $cmd >conftest.java.output 2>&5); then
+                echo "yes" >&5
+                   ac_java_jvm_version=1.7
+             else
+                 echo "configure: failed program was:" >&5
+                 cat conftest.java >&5
+                 if test -s conftest.java.output; then
+                    STDOUT=`cat conftest.java.output`
+                 fi
+                 echo "configure: CLASSPATH was $CLASSPATH" >&5
+                             fi
+         fi
+         if test -f conftest.java.output; then
+            rm conftest.java.output
+         fi
+     else
+         echo "configure: failed program was:" >&5
+         cat conftest.java >&5
+         echo "configure: CLASSPATH was $CLASSPATH" >&5
+             fi
      if test "x$ac_java_jvm_version" = "x" ; then
          as_fn_error $? "Could not detect Java version, 1.4 or newer is required" "$LINENO" 5
      fi
@@@ -12176,7 -11923,7 +12217,7 @@@ $as_echo_n "checking jgraphx... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12179 "configure"
 -// #line 11926 "configure"
++// #line 12220 "configure"
  import com.mxgraph.model.mxCell;
  
  public class conftest {
@@@ -12270,7 -12017,7 +12311,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12273 "configure"
 -// #line 12020 "configure"
++// #line 12314 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12324 "configure"
 -// #line 12071 "configure"
++// #line 12365 "configure"
  import com.mxgraph.view.mxGraph;
  
  public class conftest {
@@@ -12398,7 -12145,7 +12439,7 @@@ $as_echo_n "checking jhdf5... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12401 "configure"
 -// #line 12148 "configure"
++// #line 12442 "configure"
  import ncsa.hdf.hdf5lib.HDF5Constants;
  
  public class conftest {
@@@ -12551,7 -12298,7 +12592,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12554 "configure"
 -// #line 12301 "configure"
++// #line 12595 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12609 "configure"
 -// #line 12356 "configure"
++// #line 12650 "configure"
  import ncsa.hdf.hdf5lib.H5;
  
  public class conftest {
@@@ -12690,7 -12437,7 +12731,7 @@@ $as_echo_n "checking flexdock... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12693 "configure"
 -// #line 12440 "configure"
++// #line 12734 "configure"
  import org.flexdock.docking.DockingManager;
  
  public class conftest {
@@@ -12784,7 -12531,7 +12825,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 12787 "configure"
 -// #line 12534 "configure"
++// #line 12828 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 12838 "configure"
 -// #line 12585 "configure"
++// #line 12879 "configure"
  import org.flexdock.util.Utilities;
  
  public class conftest {
@@@ -12908,7 -12655,7 +12949,7 @@@ $as_echo_n "checking looks... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 12911 "configure"
 -// #line 12658 "configure"
++// #line 12952 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13015,7 -12762,7 +13056,7 @@@ $as_echo_n "checking jgoodies-looks... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13018 "configure"
 -// #line 12765 "configure"
++// #line 13059 "configure"
  import com.jgoodies.looks.common.MenuItemRenderer;
  
  public class conftest {
@@@ -13123,7 -12870,7 +13164,7 @@@ $as_echo_n "checking skinlf... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13126 "configure"
 -// #line 12873 "configure"
++// #line 13167 "configure"
  import com.l2fprod.util.AccessUtils;
  
  public class conftest {
@@@ -13230,7 -12977,7 +13271,7 @@@ $as_echo_n "checking jogl... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13233 "configure"
 -// #line 12980 "configure"
++// #line 13274 "configure"
  import javax.media.opengl.glu.GLUnurbs;
  
  public class conftest {
@@@ -13444,7 -13191,7 +13485,7 @@@ $as_echo_n "checking gluegen-rt... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13447 "configure"
 -// #line 13194 "configure"
++// #line 13488 "configure"
  import com.sun.gluegen.runtime.CPU;
  
  public class conftest {
@@@ -13607,7 -13354,7 +13648,7 @@@ $as_echo_n "checking jhall... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13610 "configure"
 -// #line 13357 "configure"
++// #line 13651 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13714,7 -13461,7 +13755,7 @@@ $as_echo_n "checking javahelp2... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13717 "configure"
 -// #line 13464 "configure"
++// #line 13758 "configure"
  import javax.help.JHelp;
  
  public class conftest {
@@@ -13822,7 -13569,7 +13863,7 @@@ $as_echo_n "checking jrosetta-API... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13825 "configure"
 -// #line 13572 "configure"
++// #line 13866 "configure"
  import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
  
  public class conftest {
@@@ -13929,7 -13676,7 +13970,7 @@@ $as_echo_n "checking jrosetta-engine..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 13932 "configure"
 -// #line 13679 "configure"
++// #line 13973 "configure"
  import com.artenum.rosetta.core.action.AbstractConsoleAction;
  
  public class conftest {
@@@ -14038,7 -13785,7 +14079,7 @@@ $as_echo_n "checking jeuclid-core... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14041 "configure"
 -// #line 13788 "configure"
++// #line 14082 "configure"
  import net.sourceforge.jeuclid.LayoutContext;
  
  public class conftest {
@@@ -14147,7 -13894,7 +14188,7 @@@ $as_echo_n "checking fop... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14150 "configure"
 -// #line 13897 "configure"
++// #line 14191 "configure"
  import org.apache.fop.pdf.PDFInfo;
  
  public class conftest {
@@@ -14254,7 -14001,7 +14295,7 @@@ $as_echo_n "checking batik-all... " >&6
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14257 "configure"
 -// #line 14004 "configure"
++// #line 14298 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14361,7 -14108,7 +14402,7 @@@ $as_echo_n "checking batik... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14364 "configure"
 -// #line 14111 "configure"
++// #line 14405 "configure"
  import org.apache.batik.parser.Parser;
  
  public class conftest {
@@@ -14455,7 -14202,7 +14496,7 @@@ $as_echo_n "checking minimal version (1
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 14458 "configure"
 -// #line 14205 "configure"
++// #line 14499 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 14509 "configure"
 -// #line 14256 "configure"
++// #line 14550 "configure"
  import org.apache.batik.Version;
  
  public class conftest {
@@@ -14579,7 -14326,7 +14620,7 @@@ $as_echo_n "checking commons-io... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14582 "configure"
 -// #line 14329 "configure"
++// #line 14623 "configure"
  import org.apache.commons.io.output.CountingOutputStream;
  
  public class conftest {
@@@ -14686,7 -14433,7 +14727,7 @@@ $as_echo_n "checking xmlgraphics-common
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14689 "configure"
 -// #line 14436 "configure"
++// #line 14730 "configure"
  import org.apache.xmlgraphics.util.Service;
  
  public class conftest {
@@@ -14793,7 -14540,7 +14834,7 @@@ $as_echo_n "checking avalon-framework..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14796 "configure"
 -// #line 14543 "configure"
++// #line 14837 "configure"
  import org.apache.avalon.framework.configuration.ConfigurationException;
  
  public class conftest {
@@@ -14900,7 -14647,7 +14941,7 @@@ $as_echo_n "checking xml-apis-ext... " 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 14903 "configure"
 -// #line 14650 "configure"
++// #line 14944 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15007,7 -14754,7 +15048,7 @@@ $as_echo_n "checking xml-commons-apis-e
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15010 "configure"
 -// #line 14757 "configure"
++// #line 15051 "configure"
  import org.w3c.dom.svg.SVGDocument;
  
  public class conftest {
@@@ -15118,7 -14865,7 +15159,7 @@@ $as_echo_n "checking commons-logging..
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15121 "configure"
 -// #line 14868 "configure"
++// #line 15162 "configure"
  import org.apache.commons.logging.LogFactory;
  
  public class conftest {
@@@ -15225,7 -14972,7 +15266,7 @@@ $as_echo_n "checking jlatexmath... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15228 "configure"
 -// #line 14975 "configure"
++// #line 15269 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15319,7 -15066,7 +15360,7 @@@ $as_echo_n "checking minimal version (0
     if test "x" == "x"; then
  
      cat << \EOF > conftest.java
- // #line 15322 "configure"
 -// #line 15069 "configure"
++// #line 15363 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
     else
  
      cat << \EOF > conftest.java
- // #line 15373 "configure"
 -// #line 15120 "configure"
++// #line 15414 "configure"
  import org.scilab.forge.jlatexmath.TeXFormula;
  
  public class conftest {
@@@ -15449,7 -15196,7 +15490,7 @@@ $as_echo_n "checking checkstyle... " >&
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15452 "configure"
 -// #line 15199 "configure"
++// #line 15493 "configure"
  import com.puppycrawl.tools.checkstyle.CheckStyleTask;
  
  public class conftest {
@@@ -15556,7 -15303,7 +15597,7 @@@ $as_echo_n "checking commons-beanutils.
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15559 "configure"
 -// #line 15306 "configure"
++// #line 15600 "configure"
  import org.apache.commons.beanutils.Converter;
  
  public class conftest {
@@@ -15663,7 -15410,7 +15704,7 @@@ $as_echo_n "checking antlr... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15666 "configure"
 -// #line 15413 "configure"
++// #line 15707 "configure"
  import antlr.TokenStreamException;
  
  public class conftest {
@@@ -15770,7 -15517,7 +15811,7 @@@ $as_echo_n "checking testng... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15773 "configure"
 -// #line 15520 "configure"
++// #line 15814 "configure"
  import org.testng.TestNG;
  
  public class conftest {
@@@ -15877,7 -15624,7 +15918,7 @@@ $as_echo_n "checking qdox... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15880 "configure"
 -// #line 15627 "configure"
++// #line 15921 "configure"
  import com.thoughtworks.qdox.tools.QDoxTester;
  
  public class conftest {
@@@ -15984,7 -15731,7 +16025,7 @@@ $as_echo_n "checking bsh... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 15987 "configure"
 -// #line 15734 "configure"
++// #line 16028 "configure"
  import bsh.Console;
  
  public class conftest {
@@@ -16091,7 -15838,7 +16132,7 @@@ $as_echo_n "checking junit... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 16094 "configure"
 -// #line 15841 "configure"
++// #line 16135 "configure"
  import junit.framework.Assert;
  
  public class conftest {
@@@ -24130,7 -23372,7 +23666,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 24133 "configure"
 -#line 23375 "configure"
++#line 23669 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@@ -24440,7 -23682,7 +23976,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 24443 "configure"
 -#line 23685 "configure"
++#line 23979 "configure"
  #include "confdefs.h"
  
  #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@@ -25021,7 -24263,7 +24557,7 @@@ $as_echo_n "checking saxon... " >&6; 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25024 "configure"
 -// #line 24266 "configure"
++// #line 24560 "configure"
  import com.icl.saxon.Loader;
  
  public class conftest {
@@@ -25128,7 -24370,7 +24664,7 @@@ $as_echo_n "checking jlatexmath-fop... 
            export ac_java_classpath="$jar_resolved:$ac_java_classpath"
  
      cat << \EOF > conftest.java
- // #line 25131 "configure"
 -// #line 24373 "configure"
++// #line 24667 "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 31438 "configure"
 -#line 30680 "configure"
++#line 30974 "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 31544 "configure"
 -#line 30786 "configure"
++#line 31080 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
@@@ -37673,7 -37176,7 +37475,7 @@@ if test "$enable_stop_on_warning" = yes
     CXXFLAGS="$CXXFLAGS -Werror=implicit-function-declaration -O0"
  fi
  
- ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/threads/Makefile modules/ast/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/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/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/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
 -ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/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/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
++ac_config_files="$ac_config_files libs/MALLOC/Makefile libs/dynamiclibrary/Makefile libs/doublylinkedlist/Makefile libs/hashtable/Makefile libs/libst/Makefile contrib/Makefile modules/threads/Makefile modules/ast/Makefile modules/parse/Makefile modules/symbol/Makefile modules/functions_manager/Makefile modules/system_env/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/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/xml/Makefile modules/Makefile libs/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h"
  
  
  # Detection of the module for the future version of Scilab 6
      "libs/hashtable/Makefile") CONFIG_FILES="$CONFIG_FILES libs/hashtable/Makefile" ;;
      "libs/libst/Makefile") CONFIG_FILES="$CONFIG_FILES libs/libst/Makefile" ;;
      "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;;
 +    "modules/threads/Makefile") CONFIG_FILES="$CONFIG_FILES modules/threads/Makefile" ;;
 +    "modules/ast/Makefile") CONFIG_FILES="$CONFIG_FILES modules/ast/Makefile" ;;
 +    "modules/parse/Makefile") CONFIG_FILES="$CONFIG_FILES modules/parse/Makefile" ;;
 +    "modules/symbol/Makefile") CONFIG_FILES="$CONFIG_FILES modules/symbol/Makefile" ;;
 +    "modules/functions_manager/Makefile") CONFIG_FILES="$CONFIG_FILES modules/functions_manager/Makefile" ;;
 +    "modules/system_env/Makefile") CONFIG_FILES="$CONFIG_FILES modules/system_env/Makefile" ;;
      "modules/helptools/Makefile") CONFIG_FILES="$CONFIG_FILES modules/helptools/Makefile" ;;
-     "modules/helptools/macros/xmlfiletohtml.sci") CONFIG_FILES="$CONFIG_FILES modules/helptools/macros/xmlfiletohtml.sci" ;;
      "modules/data_structures/Makefile") CONFIG_FILES="$CONFIG_FILES modules/data_structures/Makefile" ;;
      "modules/differential_equations/Makefile") CONFIG_FILES="$CONFIG_FILES modules/differential_equations/Makefile" ;;
      "modules/optimization/Makefile") CONFIG_FILES="$CONFIG_FILES modules/optimization/Makefile" ;;
@@@ -1766,14 -1719,7 +1755,13 @@@ libs/doublylinkedlist/Makefil
  libs/hashtable/Makefile
  libs/libst/Makefile
  contrib/Makefile
 +modules/threads/Makefile
 +modules/ast/Makefile
 +modules/parse/Makefile
 +modules/symbol/Makefile
 +modules/functions_manager/Makefile
 +modules/system_env/Makefile
  modules/helptools/Makefile
- modules/helptools/macros/xmlfiletohtml.sci
  modules/data_structures/Makefile
  modules/differential_equations/Makefile
  modules/optimization/Makefile
Simple merge
  
  mode(-1);  // silent execution mode
  
- %pvm = with_module("pvm");
 -// clean database when restarted ======================================
 -predef("clear"); //unprotect all variables
 -clear  // erase all variables
 -clearglobal();
 -
 -// Set stack size   ===================================================
 -function setStackSize()
 -  defaultstacksize = 5000000;
 -  old = stacksize()
 -  params = sciargs();
 -  nparam = find(params == "-mem");
 -  if (nparam) then
 -    ierr = execstr("newstacksize=" + params(nparam + 1), "errcatch");
 -    if (ierr == 0) then
 -      if old(1) <> newstacksize then
 -        stacksize(newstacksize);
 -      end
 -    else
 -      if old(1) <> defaultstacksize then
 -        stacksize(defaultstacksize);
 -      end
 -    end
 -  else
 -    if old(1) <> defaultstacksize then
 -      stacksize(defaultstacksize);
 -    end
 -  end
 -endfunction
 -setStackSize();
 -clear setStackSize;
 -
 -// Special variables definition =======================================
 -ieee(2);
 -%inf = 1/0;
 -ieee(0);
 -%nan = %inf-%inf;
 -// boolean variables
 -%T = %t;
 -%F = %f;
  %tk = (with_module("tclsci") & getscilabmode() <> "NWNI");
  
  // Default Obsolete Warning policy  ===================================
@@@ -93,9 -87,6 +87,7 @@@
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
@@@ -93,9 -87,6 +87,7 @@@
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
        <ModuleDefinitionFile>..\LibScilab.def</ModuleDefinitionFile>
        <ProgramDatabaseFile>$(Configuration)/LibScilab.pdb</ProgramDatabaseFile>
        <SubSystem>Windows</SubSystem>
-       <RandomizedBaseAddress>
-       </RandomizedBaseAddress>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
        <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>
        <ImportLibrary>../../bin/LibScilab.lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>EXPORT_MALLOC_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>true</GenerateDebugInformation>
@@@ -98,9 -90,6 +90,7 @@@
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
        <Optimization>Disabled</Optimization>
        <AdditionalIncludeDirectories>includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>EXPORT_MALLOC_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>false</GenerateDebugInformation>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>false</GenerateDebugInformation>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
Simple merge
Simple merge
@@@ -104,9 -98,6 +98,7 @@@ cd .. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@@ -142,9 -128,6 +129,7 @@@ cd .. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@@ -181,9 -158,6 +160,7 @@@ cd .. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@@ -222,9 -191,6 +195,7 @@@ cd .. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;../../modules/core/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>true</GenerateDebugInformation>
@@@ -98,9 -90,6 +90,7 @@@
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;../../modules/core/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
-       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-       <Optimization>MaxSpeed</Optimization>
        <WholeProgramOptimization>false</WholeProgramOptimization>
 -      <AdditionalIncludeDirectories>includes;../../modules/core/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>false</GenerateDebugInformation>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX86</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
        <WholeProgramOptimization>false</WholeProgramOptimization>
 -      <AdditionalIncludeDirectories>includes;../../modules/core/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;../../modules/core/includes;../../modules/localization/includes;../../libs/MALLOC/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>EXPORT_DYNAMICLIBRARY_DLL;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
-       <PrecompiledHeader>
-       </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
      </ClCompile>
      <PreLinkEvent>
-       <Command>
-       </Command>
 -      </PreLinkEvent>
 +    </PreLinkEvent>
      <Link>
        <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
        <GenerateDebugInformation>false</GenerateDebugInformation>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
Simple merge
@@@ -111,11 -101,8 +101,9 @@@ cd.. &gt;nu
        <IgnoreSpecificDefaultLibraries>libmmdd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
        <ModuleDefinitionFile>..\..\bin\hashtable.def</ModuleDefinitionFile>
        <GenerateDebugInformation>true</GenerateDebugInformation>
-       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@@ -161,9 -139,6 +140,7 @@@ cd.. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@@ -210,9 -175,6 +177,7 @@@ cd.. &gt;nu
        <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@@ -265,6 -215,6 +218,7 @@@ cd.. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
Simple merge
@@@ -109,14 -98,10 +98,11 @@@ cd.. &gt;nu
      </PreLinkEvent>
      <Link>
        <OutputFile>..\..\bin\libst.dll</OutputFile>
-       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
        <ModuleDefinitionFile>..\..\bin\libst.def</ModuleDefinitionFile>
        <GenerateDebugInformation>true</GenerateDebugInformation>
-       <RandomizedBaseAddress>false</RandomizedBaseAddress>
-       <DataExecutionPrevention>
-       </DataExecutionPrevention>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@@ -163,9 -137,6 +138,7 @@@ cd.. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@@ -212,9 -172,6 +174,7 @@@ cd.. &gt;nu
        <SupportUnloadOfDelayLoadedDLL>true</SupportUnloadOfDelayLoadedDLL>
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@@ -267,6 -211,6 +214,7 @@@ cd.. &gt;nu
        <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary>
        <TargetMachine>MachineX64</TargetMachine>
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
++      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      </Link>
    </ItemDefinitionGroup>
    <ItemGroup>
@@@ -198,33 -188,21 +198,37 @@@ ENGINE_LIBS =   $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 -      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/fftw/libscifftw.la \
 +      $(top_builddir)/modules/threads/libscithreads.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
-       $(top_builddir)/modules/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/parallel/libsciparallel.la \
-       $(top_builddir)/modules/pvm/libscipvm.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
 -      $(top_builddir)/modules/xml/libscixml.la \
 -        $(top_builddir)/modules/statistics/libscistatistics.la \
 -        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 -      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 +      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
-       $(top_builddir)/modules/matio/libscimatio.la
++      $(top_builddir)/modules/matio/libscimatio.la \
++      $(top_builddir)/modules/operations/libscioperations.la \
++      $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
++      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
++      $(top_builddir)/modules/statistics/libscistatistics.la \
++      $(top_builddir)/modules/xml/libscixml.la
++
 +# Temporary workaround to make the linker happy. signal_processing and
 +# scimatio should moved to ENGINE_LIBS_DYNAMIC_LOAD
 +
  # These libraries are loaded dynamically from Scilab.
  ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/optimization/libscioptimization.la \
 -      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
        $(top_builddir)/modules/interpolation/libsciinterpolation.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/symbolic/libscisymbolic.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/statistics/libscistatistics.la \
        $(top_builddir)/modules/randlib/libscirandlib.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
        $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
@@@ -138,21 -156,20 +139,21 @@@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARG
        distdir
  ETAGS = etags
  CTAGS = ctags
 -DIST_SUBDIRS = output_stream arnoldi elementary_functions string \
 -      api_scilab dynamic_link fileio history_manager spreadsheet \
 -      tclsci localization commons jvm action_binding renderer \
 -      completion console graphic_export gui graphics optimization \
 -      symbolic randlib statistics special_functions interpolation \
 +DIST_SUBDIRS = threads operations output_stream arnoldi \
 +      elementary_functions matio functions_manager string api_scilab \
 +      dynamic_link fileio history_manager spreadsheet tclsci \
 +      localization commons jvm action_binding renderer completion \
 +      console graphic_export gui graphics optimization symbolic \
 +      randlib statistics special_functions interpolation \
        linear_algebra integer data_structures mexlib \
-       differential_equations cacsd polynomials boolean double pvm io \
+       differential_equations cacsd polynomials boolean double io \
        intersci signal_processing core 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 xml scicos_blocks \
 -      scicos . javasci
 +      parameters atoms types hdf5 graph xcos system_env ast symbol \
 +      parse scinotes parallel modules_manager ui_data \
-       history_browser scicos_blocks scicos . javasci
++      history_browser xml scicos_blocks scicos . javasci
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  am__relativize = \
    dir0=`pwd`; \
@@@ -464,10 -455,10 +460,10 @@@ SUBDIRS = threads operations output_str
        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 xml $(am__append_1) scicos . \
 -      $(am__append_2)
 +      genetic_algorithms simulated_annealing parameters atoms types \
 +      hdf5 graph xcos system_env ast symbol parse scinotes parallel \
-       modules_manager ui_data history_browser $(am__append_1) scicos \
-       . $(am__append_2)
++      modules_manager ui_data history_browser xml $(am__append_1) \
++      scicos . $(am__append_2)
  
  #### Basic files ####
  libscilab_la_rootdir = $(mydatadir)
@@@ -540,34 -528,22 +536,37 @@@ ENGINE_LIBS = $(top_builddir)/modules/f
        $(top_builddir)/modules/history_manager/libscihistory_manager.la \
        $(top_builddir)/modules/output_stream/libscioutput_stream.la \
        $(top_builddir)/modules/string/libscistring.la \
 -      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/fftw/libscifftw.la \
 +      $(top_builddir)/modules/threads/libscithreads.la \
        $(top_builddir)/modules/hdf5/libscihdf5.la \
 +      $(top_builddir)/modules/ast/libsciast.la \
 +      $(top_builddir)/modules/symbol/libscisymbol.la \
 +      $(top_builddir)/modules/parse/libsciparse.la \
-       $(top_builddir)/modules/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/parallel/libsciparallel.la \
-       $(top_builddir)/modules/pvm/libscipvm.la \
        $(top_builddir)/modules/fftw/libscifftw.la \
 -      $(top_builddir)/modules/xml/libscixml.la \
 -        $(top_builddir)/modules/statistics/libscistatistics.la \
 -        $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
 -      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la
 +      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
-       $(top_builddir)/modules/matio/libscimatio.la
++      $(top_builddir)/modules/matio/libscimatio.la \
++      $(top_builddir)/modules/operations/libscioperations.la \
++      $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
++      $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la \
++      $(top_builddir)/modules/statistics/libscistatistics.la \
++      $(top_builddir)/modules/xml/libscixml.la
++
  
 +# Temporary workaround to make the linker happy. signal_processing and
 +# scimatio should moved to ENGINE_LIBS_DYNAMIC_LOAD
  
  # These libraries are loaded dynamically from Scilab.
  ENGINE_LIBS_DYNAMIC_LOAD = \
        $(top_builddir)/modules/optimization/libscioptimization.la \
 -      $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
        $(top_builddir)/modules/interpolation/libsciinterpolation.la \
 +      $(top_builddir)/modules/functions/libscifunctions.la \
 +      $(top_builddir)/modules/hdf5/libscihdf5.la \
        $(top_builddir)/modules/symbolic/libscisymbolic.la \
        $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
-       $(top_builddir)/modules/statistics/libscistatistics.la \
        $(top_builddir)/modules/randlib/libscirandlib.la \
        $(top_builddir)/modules/xcos/libscixcos.la \
        $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
@@@ -13,34 -13,21 +13,32 @@@ if GU
  USEANT=1
  
  # List of the c files
 -ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
 +ACTION_BINDING_C_SOURCES = \
 +    src/c/InterpreterManagement.c
  
  # List of the c++ file
 -ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
 -src/jni/Signal.hxx
 +ACTION_BINDING_CPP_SOURCES = \
 +    src/jni/Signal.cpp \
 +    src/jni/Signal.hxx \
-     src/jni/GiwsException.cpp \
 +    src/cpp/action_binding_GiwsExports.cpp
  
  # List of the gateway c files
 -CONSOLE_C_JNI_SOURCES = src/jni/InterpreterManagement_wrap.c
 +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
 +GATEWAY_CPP_SOURCES = \
 +    sci_gateway/cpp/action_binding_gw.cpp \
 +    sci_gateway/cpp/sci_notify.cpp
  
  #### SWIG Declaration ####
 -SWIG_WRAPPERS = src/jni/InterpreterManagement.i
 +SWIG_WRAPPERS = \
 +    src/jni/InterpreterManagement.i
 +
 +else
 +# List of the cpp files
 +ACTION_BINDING_CPP_SOURCES = \
 +    src/noaction_binding/noaction_binding.cpp
 +
  endif
  
  if SWIG
@@@ -53,45 -40,30 +51,46 @@@ if GIW
  BUILT_SOURCES=giws
  endif
  
 -libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.c
 -libsciaction_binding_disable_la_CFLAGS =      -I$(srcdir)/includes/ \
 -                                                                                      -I$(top_srcdir)/modules/output_stream/includes
 +libsciaction_binding_disable_la_SOURCES = \
 +    src/noaction_binding/noaction_binding.cpp
 +
 +libsciaction_binding_disable_la_CPPFLAGS = \
 +    -I$(srcdir)/includes/ \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/ast/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +    -I$(top_srcdir)/modules/system_env/includes \
 +    -I$(top_srcdir)/modules/types/includes
  
  # Includes need for the compilation
 -libsciaction_binding_la_CFLAGS=       $(JAVA_JNI_INCLUDE) \
 --I$(srcdir)/includes/ \
 --I$(srcdir)/src/c/ \
 --I$(srcdir)/src/jni/ \
 --I$(top_srcdir)/libs/MALLOC/includes/ \
 --I$(top_srcdir)/modules/jvm/includes/ \
 --I$(top_srcdir)/modules/api_scilab/includes \
 --I$(top_srcdir)/modules/output_stream/includes
 +libsciaction_binding_la_CFLAGS= \
 +    $(JAVA_JNI_INCLUDE) \
 +    -I$(srcdir)/includes/ \
 +    -I$(srcdir)/src/c/ \
 +    -I$(srcdir)/src/jni/ \
 +    -I$(top_srcdir)/libs/MALLOC/includes/ \
 +    -I$(top_srcdir)/modules/jvm/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/types/includes \
 +    -I$(top_srcdir)/modules/jvm/includes/
  
  # Includes need for the compilation
 -libsciaction_binding_la_CPPFLAGS=     $(JAVA_JNI_INCLUDE) \
 --I$(srcdir)/includes/ \
 --I$(srcdir)/src/c/ \
 --I$(srcdir)/src/jni/ \
 --I$(top_srcdir)/libs/MALLOC/includes/ \
 --I$(top_srcdir)/modules/jvm/includes/ \
 --I$(top_srcdir)/modules/api_scilab/includes \
 --I$(top_srcdir)/modules/commons/src/jni/ \
 --I$(top_srcdir)/modules/output_stream/includes
 +libsciaction_binding_la_CPPFLAGS= \
 +    $(JAVA_JNI_INCLUDE) \
 +    -I$(srcdir)/includes/ \
 +    -I$(srcdir)/src/c/ \
 +    -I$(srcdir)/src/jni/ \
 +    -I$(top_srcdir)/libs/MALLOC/includes/ \
 +    -I$(top_srcdir)/modules/jvm/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +    -I$(top_srcdir)/modules/functions_manager/includes \
 +    -I$(top_srcdir)/modules/ast/includes \
 +    -I$(top_srcdir)/modules/system_env/includes \
-     -I$(top_srcdir)/modules/types/includes
++    -I$(top_srcdir)/modules/types/includes \
++      -I$(top_srcdir)/modules/commons/src/jni/
  
  # Name of the future library (.la will be replace by .so, .a, etc regarding
  # the system)
@@@ -116,17 -117,10 +117,15 @@@ am__installdirs = "$(DESTDIR)$(pkglibdi
  LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
  libsciaction_binding_algo_la_LIBADD =
  am__libsciaction_binding_algo_la_SOURCES_DIST =  \
 -      src/c/InterpreterManagement.c src/jni/Signal.cpp \
 -      src/jni/Signal.hxx src/jni/InterpreterManagement_wrap.c
 +      src/c/InterpreterManagement.c \
 +      src/noaction_binding/noaction_binding.cpp src/jni/Signal.cpp \
-       src/jni/Signal.hxx src/jni/GiwsException.cpp \
-       src/cpp/action_binding_GiwsExports.cpp \
++      src/jni/Signal.hxx src/cpp/action_binding_GiwsExports.cpp \
 +      src/jni/InterpreterManagement_wrap.c
  @GUI_TRUE@am__objects_1 = libsciaction_binding_algo_la-InterpreterManagement.lo
 -@GUI_TRUE@am__objects_2 = libsciaction_binding_algo_la-Signal.lo
 +@GUI_FALSE@am__objects_2 =  \
 +@GUI_FALSE@   libsciaction_binding_algo_la-noaction_binding.lo
 +@GUI_TRUE@am__objects_2 = libsciaction_binding_algo_la-Signal.lo \
- @GUI_TRUE@    libsciaction_binding_algo_la-GiwsException.lo \
 +@GUI_TRUE@    libsciaction_binding_algo_la-action_binding_GiwsExports.lo
  @GUI_TRUE@am__objects_3 = libsciaction_binding_algo_la-InterpreterManagement_wrap.lo
  am_libsciaction_binding_algo_la_OBJECTS = $(am__objects_1) \
        $(am__objects_2) $(am__objects_3)
@@@ -138,16 -132,18 +137,14 @@@ am_libsciaction_binding_disable_la_OBJE
        libsciaction_binding_disable_la-noaction_binding.lo
  libsciaction_binding_disable_la_OBJECTS =  \
        $(am_libsciaction_binding_disable_la_OBJECTS)
- libsciaction_binding_la_DEPENDENCIES = libsciaction_binding-algo.la \
-       $(top_builddir)/libs/MALLOC/libscimalloc.la \
-       $(top_builddir)/modules/output_stream/libscioutput_stream.la
 -libsciaction_binding_disable_la_LINK = $(LIBTOOL) --tag=CC \
 -      $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 -      $(libsciaction_binding_disable_la_CFLAGS) $(CFLAGS) \
 -      $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ libsciaction_binding_la_DEPENDENCIES = libsciaction_binding-algo.la
  am__libsciaction_binding_la_SOURCES_DIST =  \
 -      sci_gateway/c/gw_action_binding.c \
 +      sci_gateway/cpp/action_binding_gw.cpp \
        sci_gateway/cpp/sci_notify.cpp
  @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_4) $(am__objects_5)
 +@GUI_TRUE@    libsciaction_binding_la-action_binding_gw.lo \
 +@GUI_TRUE@    libsciaction_binding_la-sci_notify.lo
 +am_libsciaction_binding_la_OBJECTS = $(am__objects_4)
  libsciaction_binding_la_OBJECTS =  \
        $(am_libsciaction_binding_la_OBJECTS)
  libsciaction_binding_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@@ -451,21 -436,11 +443,20 @@@ yacc_present = @yacc_present
  @GUI_TRUE@USEANT = 1
  
  # List of the c files
 -@GUI_TRUE@ACTION_BINDING_C_SOURCES = src/c/InterpreterManagement.c
 +@GUI_TRUE@ACTION_BINDING_C_SOURCES = \
 +@GUI_TRUE@    src/c/InterpreterManagement.c
 +
 +
 +# List of the cpp files
 +@GUI_FALSE@ACTION_BINDING_CPP_SOURCES = \
 +@GUI_FALSE@    src/noaction_binding/noaction_binding.cpp
 +
  
  # List of the c++ file
 -@GUI_TRUE@ACTION_BINDING_CPP_SOURCES = src/jni/Signal.cpp \
 -@GUI_TRUE@src/jni/Signal.hxx
 +@GUI_TRUE@ACTION_BINDING_CPP_SOURCES = \
 +@GUI_TRUE@    src/jni/Signal.cpp \
 +@GUI_TRUE@    src/jni/Signal.hxx \
- @GUI_TRUE@    src/jni/GiwsException.cpp \
 +@GUI_TRUE@    src/cpp/action_binding_GiwsExports.cpp
  
  
  # List of the gateway c files
@@@ -511,20 -470,15 +502,21 @@@ libsciaction_binding_la_CFLAGS = 
  
  
  # Includes need for the compilation
 -libsciaction_binding_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
 --I$(srcdir)/includes/ \
 --I$(srcdir)/src/c/ \
 --I$(srcdir)/src/jni/ \
 --I$(top_srcdir)/libs/MALLOC/includes/ \
 --I$(top_srcdir)/modules/jvm/includes/ \
 --I$(top_srcdir)/modules/api_scilab/includes \
 --I$(top_srcdir)/modules/commons/src/jni/ \
 --I$(top_srcdir)/modules/output_stream/includes
 +libsciaction_binding_la_CPPFLAGS = \
 +    $(JAVA_JNI_INCLUDE) \
 +    -I$(srcdir)/includes/ \
 +    -I$(srcdir)/src/c/ \
 +    -I$(srcdir)/src/jni/ \
 +    -I$(top_srcdir)/libs/MALLOC/includes/ \
 +    -I$(top_srcdir)/modules/jvm/includes/ \
 +    -I$(top_srcdir)/modules/api_scilab/includes \
 +    -I$(top_srcdir)/modules/output_stream/includes \
 +    -I$(top_srcdir)/modules/symbol/includes \
 +    -I$(top_srcdir)/modules/functions_manager/includes \
 +    -I$(top_srcdir)/modules/ast/includes \
 +    -I$(top_srcdir)/modules/system_env/includes \
-     -I$(top_srcdir)/modules/types/includes
++    -I$(top_srcdir)/modules/types/includes \
++      -I$(top_srcdir)/modules/commons/src/jni/
  
  
  # Name of the future library (.la will be replace by .so, .a, etc regarding
@@@ -540,14 -494,9 +532,9 @@@ libsciaction_binding_algo_la_CFLAGS = $
  libsciaction_binding_algo_la_CPPFLAGS = $(libsciaction_binding_la_CPPFLAGS)
  
  # For the code check (splint)
 -CHECK_SRC = $(ACTION_BINDING_C_SOURCES) $(GATEWAY_C_SOURCES)
 +CHECK_SRC = $(ACTION_BINDING_CPP_SOURCES)
  INCLUDE_FLAGS = $(libsciaction_binding_la_CFLAGS)
- libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la         $(top_builddir)/libs/MALLOC/libscimalloc.la \
-                                                                       $(top_builddir)/modules/output_stream/libscioutput_stream.la
- # Cyclic dependancy
- #                                                                     $(top_builddir)/modules/jvm/libscijvm.la
+ libsciaction_binding_la_LIBADD = libsciaction_binding-algo.la
  
  #### Name of the module and the path ######
  modulename = action_binding
@@@ -794,34 -747,6 +780,27 @@@ libsciaction_binding_algo_la-Signal.lo
  @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) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_algo_la-Signal.lo `test -f 'src/jni/Signal.cpp' || echo '$(srcdir)/'`src/jni/Signal.cpp
  
- libsciaction_binding_algo_la-GiwsException.lo: src/jni/GiwsException.cpp
- @am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_algo_la-GiwsException.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-GiwsException.Tpo -c -o libsciaction_binding_algo_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
- @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-GiwsException.Tpo $(DEPDIR)/libsciaction_binding_algo_la-GiwsException.Plo
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/jni/GiwsException.cpp' object='libsciaction_binding_algo_la-GiwsException.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) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_algo_la-GiwsException.lo `test -f 'src/jni/GiwsException.cpp' || echo '$(srcdir)/'`src/jni/GiwsException.cpp
 +libsciaction_binding_algo_la-action_binding_GiwsExports.lo: src/cpp/action_binding_GiwsExports.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_algo_la-action_binding_GiwsExports.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Tpo -c -o libsciaction_binding_algo_la-action_binding_GiwsExports.lo `test -f 'src/cpp/action_binding_GiwsExports.cpp' || echo '$(srcdir)/'`src/cpp/action_binding_GiwsExports.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Tpo $(DEPDIR)/libsciaction_binding_algo_la-action_binding_GiwsExports.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/cpp/action_binding_GiwsExports.cpp' object='libsciaction_binding_algo_la-action_binding_GiwsExports.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) $(libsciaction_binding_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_algo_la-action_binding_GiwsExports.lo `test -f 'src/cpp/action_binding_GiwsExports.cpp' || echo '$(srcdir)/'`src/cpp/action_binding_GiwsExports.cpp
 +
 +libsciaction_binding_disable_la-noaction_binding.lo: src/noaction_binding/noaction_binding.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -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.cpp' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Tpo $(DEPDIR)/libsciaction_binding_disable_la-noaction_binding.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='src/noaction_binding/noaction_binding.cpp' object='libsciaction_binding_disable_la-noaction_binding.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) $(libsciaction_binding_disable_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_disable_la-noaction_binding.lo `test -f 'src/noaction_binding/noaction_binding.cpp' || echo '$(srcdir)/'`src/noaction_binding/noaction_binding.cpp
 +
 +libsciaction_binding_la-action_binding_gw.lo: sci_gateway/cpp/action_binding_gw.cpp
 +@am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-action_binding_gw.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-action_binding_gw.Tpo -c -o libsciaction_binding_la-action_binding_gw.lo `test -f 'sci_gateway/cpp/action_binding_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/action_binding_gw.cpp
 +@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-action_binding_gw.Tpo $(DEPDIR)/libsciaction_binding_la-action_binding_gw.Plo
 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@    source='sci_gateway/cpp/action_binding_gw.cpp' object='libsciaction_binding_la-action_binding_gw.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) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libsciaction_binding_la-action_binding_gw.lo `test -f 'sci_gateway/cpp/action_binding_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/action_binding_gw.cpp
 +
  libsciaction_binding_la-sci_notify.lo: sci_gateway/cpp/sci_notify.cpp
  @am__fastdepCXX_TRUE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciaction_binding_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libsciaction_binding_la-sci_notify.lo -MD -MP -MF $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo -c -o libsciaction_binding_la-sci_notify.lo `test -f 'sci_gateway/cpp/sci_notify.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_notify.cpp
  @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libsciaction_binding_la-sci_notify.Tpo $(DEPDIR)/libsciaction_binding_la-sci_notify.Plo
index 97a67ee,0000000..b789ab1
mode 100644,000000..100644
--- /dev/null
@@@ -1,290 -1,0 +1,293 @@@
 +<?xml version="1.0" encoding="utf-8"?>
 +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 +  <ItemGroup Label="ProjectConfigurations">
 +    <ProjectConfiguration Include="Debug|Win32">
 +      <Configuration>Debug</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Debug|x64">
 +      <Configuration>Debug</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|Win32">
 +      <Configuration>Release</Configuration>
 +      <Platform>Win32</Platform>
 +    </ProjectConfiguration>
 +    <ProjectConfiguration Include="Release|x64">
 +      <Configuration>Release</Configuration>
 +      <Platform>x64</Platform>
 +    </ProjectConfiguration>
 +  </ItemGroup>
 +  <PropertyGroup Label="Globals">
 +    <ProjectGuid>{3419B733-85A2-4F66-BC04-A5A8DC8FA057}</ProjectGuid>
 +    <RootNamespace>action_binding_gw</RootNamespace>
 +    <Keyword>Win32Proj</Keyword>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +    <WholeProgramOptimization>false</WholeProgramOptimization>
 +  </PropertyGroup>
 +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
 +    <ConfigurationType>DynamicLibrary</ConfigurationType>
 +    <CharacterSet>MultiByte</CharacterSet>
 +  </PropertyGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 +  <ImportGroup Label="ExtensionSettings">
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
 +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
 +  </ImportGroup>
 +  <PropertyGroup Label="UserMacros" />
 +  <PropertyGroup>
 +    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
 +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
 +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
 +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">sci$(ProjectName)</TargetName>
 +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">sci$(ProjectName)</TargetName>
 +  </PropertyGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 +    <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX86</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 +    <Midl>
 +      <TargetEnvironment>X64</TargetEnvironment>
 +    </Midl>
 +    <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 +      <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../symbol/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <StringPooling>true</StringPooling>
 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
 +      <WarningLevel>Level3</WarningLevel>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 +      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 +    </ClCompile>
 +    <PreLinkEvent>
 +      <Message>Make dependencies</Message>
 +      <Command>
 +      </Command>
 +    </PreLinkEvent>
 +    <Link>
 +      <AdditionalDependencies>
 +      </AdditionalDependencies>
 +      <OutputFile>$(SolutionDir)bin\sci$(ProjectName).dll</OutputFile>
 +      <ModuleDefinitionFile>
 +      </ModuleDefinitionFile>
 +      <GenerateDebugInformation>false</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
 +      <LinkTimeCodeGeneration>
 +      </LinkTimeCodeGeneration>
 +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
 +      <DataExecutionPrevention>
 +      </DataExecutionPrevention>
 +      <ImportLibrary>$(SolutionDir)bin\sci$(ProjectName).lib</ImportLibrary>
 +      <TargetMachine>MachineX64</TargetMachine>
 +      <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
 +    </Link>
 +    <PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
 +  </ItemDefinitionGroup>
 +  <ItemGroup>
 +    <ClCompile Include="action_binding_gw.cpp" />
 +    <ClCompile Include="sci_notify.cpp" />
 +  </ItemGroup>
 +  <ItemGroup>
 +    <ClInclude Include="..\..\includes\action_binding_gw.hxx" />
 +    <ClInclude Include="..\..\includes\dynlib_action_binding_gw.h" />
 +  </ItemGroup>
 +  <ItemGroup>
++    <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
++      <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
++    </ProjectReference>
 +    <ProjectReference Include="..\..\..\jvm\libjvm.vcxproj">
 +      <Project>{8ba2dda8-bd04-4d4d-8ee6-6caa955f7470}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
 +      <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj">
 +      <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\symbol\symbol.vcxproj">
 +      <Project>{2c60033b-0dbd-4ca4-80d3-176c9be9ce2f}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\..\types\types.vcxproj">
 +      <Project>{64e090da-dcb5-4f4d-93d7-e88ddec9c2ef}</Project>
 +    </ProjectReference>
 +    <ProjectReference Include="..\..\src\c\action_binding.vcxproj">
 +      <Project>{8a654cc5-22c1-4972-a8cf-1b89f78b5383}</Project>
 +    </ProjectReference>
 +  </ItemGroup>
 +  <ItemGroup>
 +    <Library Include="..\..\..\..\bin\libintl.lib" />
 +  </ItemGroup>
 +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 +  <ImportGroup Label="ExtensionTargets">
 +  </ImportGroup>
 +</Project>
  *
  */
  /*--------------------------------------------------------------------------*/
 +#include "function.hxx"
 +#include "action_binding_GiwsExports.hxx"
 +#include "action_binding_gw.hxx"
 +#include "string.hxx"
+ #include "Signal.hxx"
+ #include "GiwsException.hxx"
  
  extern "C"
  {
  #include "localization.h"
  #include "Scierror.h"
  #include "MALLOC.h"
 -#include "freeArrayOfString.h"
  #include "getScilabJavaVM.h"
  }
 -/*--------------------------------------------------------------------------*/
 -using namespace org_scilab_modules_action_binding_utils;
  
  /*--------------------------------------------------------------------------*/
 -int sci_notify(char *fname, unsigned long fname_len)
 +types::Function::ReturnValue sci_notify(types::typed_list &in, int _iRetCount, types::typed_list &out)
  {
 -    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);
 -    if (sciErr.iErr)
 -    {
 -        printError(&sciErr, 0);
 -        return 0;
 -    }
 -
 -    sciErr = getVarType(pvApiCtx, 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;
 -    }
 +    types::String* pString  = NULL;
 +    wchar_t* wcsInput       = NULL;
  
 -    /* get dimensions */
 -    sciErr = getMatrixOfString(pvApiCtx, piAddressVarOne, &m1, &n1, lenStVarOne, pStVarOne);
 -    if (sciErr.iErr)
 +    if(in.size() != 1)
      {
 -        printError(&sciErr, 0);
 -        return 0;
 +        ScierrorW(999, _W("%ls: Wrong number of input arguments: %d expected.\n"), L"notify" , 1);
 +        return types::Function::Error;
      }
 -
 -    if (m1 * n1 != 1)
 +    if(in[0]->isString() == false)
      {
 -        Scierror(999, _("%s: Wrong type for input argument #%d: A string expected.\n"), fname, 1);
 -        return 0;
 +        ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A string expected.\n"), L"notify", 1);
 +        return types::Function::Error;
      }
 +    pString = in[0]->getAs<types::String>();
  
 -    lenStVarOne = (int *)MALLOC(sizeof(int));
 -    if (lenStVarOne == NULL)
 +    if(pString->isScalar() == FALSE)
      {
 -        Scierror(999, _("%s: No more memory.\n"), fname);
 -        return 0;
 -    }
 -
 -    /* get lengths */
 -    sciErr = getMatrixOfString(pvApiCtx, 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);
 -    if (sciErr.iErr)
 -    {
 -        printError(&sciErr, 0);
 -        return 0;
 +        ScierrorW(999, _W("%ls: Wrong size for input argument #%d: A string expected.\n"), L"notify" , 1);
 +        return types::Function::Error;
      }
 +    wcsInput = pString->get(0);
  
 +    char* strInput = wide_string_to_UTF8(wcsInput);
-     Signal_notify(getScilabJavaVM(), strInput);
+     try
+     {
 -        Signal::notify(getScilabJavaVM(), pStVarOne[0]);
++        org_scilab_modules_action_binding_utils::Signal::notify(getScilabJavaVM(), strInput);
+     }
+     catch(const GiwsException::JniException & e)
+     {
 -        Scierror(999, _("%s: A Java exception arisen:\n%s"), fname, e.whatStr().c_str());
 -        return 0;
++        ScierrorW(999, _W("%ls: A Java exception arisen:\n%s"), L"notify", e.whatStr().c_str());
++        FREE(strInput);
++        return types::Function::Error;
+     }
 +    FREE(strInput);
  
 -    freeArrayOfString(pStVarOne, 1);
 -
 -    LhsVar(1) = 0;
 -    PutLhsVar();
 -    return 0;
 +    return types::Function::OK;
  }
  /*--------------------------------------------------------------------------*/
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 -      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -124,15 -112,11 +124,15 @@@ lib /DEF:"$(ProjectDir)localization_Imp
      </Midl>
      <ClCompile>
        <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 +      <MinimalRebuild>true</MinimalRebuild>
 +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
        <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 +      <PrecompiledHeader>
 +      </PrecompiledHeader>
        <WarningLevel>Level3</WarningLevel>
 -      <DisableSpecificWarnings>4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      </ClCompile>
      <PreLinkEvent>
        <Message>Make dependencies</Message>
@@@ -163,12 -140,9 +163,12 @@@ lib /DEF:"$(ProjectDir)localization_Imp
    </ItemDefinitionGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
 +      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -215,11 -177,9 +215,11 @@@ lib /DEF:"$(ProjectDir)localization_Imp
        <TargetEnvironment>X64</TargetEnvironment>
      </Midl>
      <ClCompile>
 +      <Optimization>MaxSpeed</Optimization>
 +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
        <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 -      <AdditionalIncludeDirectories>.;../../../commons/src/jni/;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../api_scilab/includes;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../types/includes;../../../commons/src/jni;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@@ -257,22 -207,18 +257,20 @@@ lib /DEF:"$(ProjectDir)localization_Imp
        <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck>
      </Link>
      <PostBuildEvent>
 -      </PostBuildEvent>
 +      <Command>
 +      </Command>
 +    </PostBuildEvent>
    </ItemDefinitionGroup>
    <ItemGroup>
 +    <ClCompile Include="..\cpp\action_binding_GiwsExports.cpp" />
      <ClCompile Include="DllmainAction_Binding.c" />
-     <ClCompile Include="..\jni\GiwsException.cpp" />
 -    <ClCompile Include="..\..\sci_gateway\c\gw_action_binding.c" />
      <ClCompile Include="InterpreterManagement.c" />
      <ClCompile Include="..\jni\InterpreterManagement_wrap.c" />
 -    <ClCompile Include="..\..\sci_gateway\cpp\sci_notify.cpp" />
      <ClCompile Include="..\jni\Signal.cpp" />
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="..\..\includes\dynlib_action_binding.h" />
 +    <ClInclude Include="..\..\includes\action_binding_GiwsExports.hxx" />
-     <ClInclude Include="..\jni\GiwsException.hxx" />
      <ClInclude Include="InterpreterManagement.h" />
      <ClInclude Include="..\jni\Signal.hxx" />
    </ItemGroup>
@@@ -29,9 -29,9 +29,6 @@@
      <ClCompile Include="DllmainAction_Binding.c">
        <Filter>Source Files</Filter>
      </ClCompile>
-     <ClCompile Include="..\jni\GiwsException.cpp">
-       <Filter>Source Files</Filter>
-     </ClCompile>
 -    <ClCompile Include="..\..\sci_gateway\c\gw_action_binding.c">
 -      <Filter>Source Files</Filter>
 -    </ClCompile>
      <ClCompile Include="InterpreterManagement.c">
        <Filter>Source Files</Filter>
      </ClCompile>
Simple merge
Simple merge
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
      <ClCompile>
-       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>includes;src;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;../../libs/MALLOC/includes;../operations/includes;../api_scilab/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <MinimalRebuild>true</MinimalRebuild>