summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2009-09-22 12:02:58 +0200
commitf23b2110d698093a959634e19007c8d84d531c5e (patch)
tree9d2f52524635264289e90dcfaa4fa0c44eb147d2 /scilab/modules
parent6e0ed76a324ba57a846cf16750c297414d32428d (diff)
parent11ad7608e335c7505a00ee05fd2a3d67a5e6842e (diff)
downloadscilab-f23b2110d698093a959634e19007c8d84d531c5e.zip
scilab-f23b2110d698093a959634e19007c8d84d531c5e.tar.gz
Merge commit 'origin/master' into Xcos
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/action_binding/Makefile.am2
-rw-r--r--scilab/modules/action_binding/Makefile.in16
-rw-r--r--scilab/modules/api_scilab/Makefile.am2
-rw-r--r--scilab/modules/api_scilab/Makefile.in16
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml2
-rw-r--r--scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml2
-rw-r--r--scilab/modules/api_scilab/includes/api_list.h50
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_boolean.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_common.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_double.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_int.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_list.cpp70
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_pointer.cpp4
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_poly.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_sparse.cpp2
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_string.cpp2
-rw-r--r--scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c2
-rw-r--r--scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c2
-rw-r--r--scilab/modules/arnoldi/Makefile.am2
-rw-r--r--scilab/modules/arnoldi/Makefile.in16
-rw-r--r--scilab/modules/arnoldi/src/arnoldi.rc8
-rw-r--r--scilab/modules/atoms/Makefile.in14
-rw-r--r--scilab/modules/boolean/Makefile.am2
-rw-r--r--scilab/modules/boolean/Makefile.in16
-rw-r--r--scilab/modules/cacsd/Makefile.am2
-rw-r--r--scilab/modules/cacsd/Makefile.in16
-rw-r--r--scilab/modules/call_scilab/Makefile.am5
-rw-r--r--scilab/modules/call_scilab/Makefile.in33
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcproj2
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/.gitignore5
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln26
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/Properties/AssemblyInfo.cs (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/Properties/AssemblyInfo.cs)0
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.cs (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.cs)97
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.csproj (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.csproj)42
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/DotNetScilab.csproj (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/DotNetScilab.csproj)43
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Properties/AssemblyInfo.cs (renamed from scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Properties/AssemblyInfo.cs)6
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab.cs489
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab_cs_wrapper.cs216
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/.gitignore6
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.Designer.vb13
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.myapp10
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/AssemblyInfo.vb35
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.Designer.vb62
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.resx117
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Settings.Designer.vb73
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Settings.settings7
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.sln20
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/VB.NET.vbproj169
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/vb_example.vb71
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci.sln36
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Scilab.cs677
-rw-r--r--scilab/modules/call_scilab/examples/readme.txt13
-rw-r--r--scilab/modules/call_scilab/includes/CallScilab.h336
-rw-r--r--scilab/modules/call_scilab/includes/call_scilab.h354
-rw-r--r--scilab/modules/call_scilab/src/c/SendScilabJobs.c4
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.c (renamed from scilab/modules/call_scilab/src/c/CallScilab.c)2
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in14
-rw-r--r--scilab/modules/completion/Makefile.am2
-rw-r--r--scilab/modules/completion/Makefile.in16
-rw-r--r--scilab/modules/completion/src/c/getfilesdictionary.c33
-rw-r--r--scilab/modules/console/Makefile.am2
-rw-r--r--scilab/modules/console/Makefile.in16
-rw-r--r--scilab/modules/core/Makefile.am2
-rw-r--r--scilab/modules/core/Makefile.in16
-rw-r--r--scilab/modules/core/help/en_US/capi/sci_types.xml5
-rw-r--r--scilab/modules/core/includes/setgetSCIpath.h17
-rw-r--r--scilab/modules/core/includes/tmpdir.h13
-rw-r--r--scilab/modules/core/macros/toolboxes.sci123
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_getmd5.c12
-rw-r--r--scilab/modules/core/src/c/core.vcproj8
-rw-r--r--scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c65
-rw-r--r--scilab/modules/core/src/c/setgetSCIpath.c6
-rw-r--r--scilab/modules/core/src/c/stack1.c4
-rw-r--r--scilab/modules/core/src/c/stack2.c4
-rw-r--r--scilab/modules/core/src/c/stack3.c2
-rw-r--r--scilab/modules/core/src/c/tmpdir.c5
-rw-r--r--scilab/modules/core/src/fortran/promptecho.f35
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_4753.tst26
-rw-r--r--scilab/modules/data_structures/Makefile.am2
-rw-r--r--scilab/modules/data_structures/Makefile.in16
-rw-r--r--scilab/modules/demo_tools/Makefile.in14
-rw-r--r--scilab/modules/development_tools/Makefile.in14
-rw-r--r--scilab/modules/differential_equations/Makefile.am2
-rw-r--r--scilab/modules/differential_equations/Makefile.in16
-rw-r--r--scilab/modules/double/Makefile.in14
-rw-r--r--scilab/modules/dynamic_link/Makefile.am2
-rw-r--r--scilab/modules/dynamic_link/Makefile.in16
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_gen_gateway.xml59
-rw-r--r--scilab/modules/dynamic_link/macros/G_make.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci8
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_build.sci10
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_compile.sci14
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_for_link.sci4
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci28
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_gateway.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_mex_build.sci6
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4789.dia.ref30
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_4789.tst41
-rw-r--r--scilab/modules/elementary_functions/Makefile.am2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in16
-rw-r--r--scilab/modules/fftw/Makefile.am2
-rw-r--r--scilab/modules/fftw/Makefile.in16
-rw-r--r--scilab/modules/fileio/LibScilab_Import.def2
-rw-r--r--scilab/modules/fileio/Makefile.am4
-rw-r--r--scilab/modules/fileio/Makefile.in27
-rw-r--r--scilab/modules/fileio/fileio.vcproj8
-rw-r--r--scilab/modules/fileio/help/en_US/isdir.xml2
-rw-r--r--scilab/modules/fileio/includes/cluni0.h5
-rw-r--r--scilab/modules/fileio/includes/expandPathVariable.h42
-rw-r--r--scilab/modules/fileio/io_Import.def1
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_chdir.c20
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_createdir.c13
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_findfiles.c7
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c15
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isdir.c135
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isfile.c12
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mopen.c19
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_newest.c15
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_removedir.c18
-rw-r--r--scilab/modules/fileio/src/c/cluni0.c111
-rw-r--r--scilab/modules/fileio/src/c/copyfile_others.c16
-rw-r--r--scilab/modules/fileio/src/c/expandPathVariable.c177
-rw-r--r--scilab/modules/fileio/src/c/fileinfo.c18
-rw-r--r--scilab/modules/fileio/src/c/splitpath.c2
-rw-r--r--scilab/modules/functions/Makefile.am2
-rw-r--r--scilab/modules/functions/Makefile.in16
-rw-r--r--scilab/modules/functions/src/c/librarieslist.c2
-rw-r--r--scilab/modules/functions/src/c/libraryinfo.c54
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in14
-rw-r--r--scilab/modules/graphic_export/Makefile.am2
-rw-r--r--scilab/modules/graphic_export/Makefile.in16
-rw-r--r--scilab/modules/graphic_export/src/c/xs2file.c6
-rw-r--r--scilab/modules/graphics/LibScilab_Import.def3
-rw-r--r--scilab/modules/graphics/Makefile.am2
-rw-r--r--scilab/modules/graphics/Makefile.in16
-rw-r--r--scilab/modules/graphics/help/en_US/axes_properties.xml15
-rw-r--r--scilab/modules/graphics/help/en_US/plot2d.xml4
-rw-r--r--scilab/modules/graphics/help/en_US/xsegs.xml51
-rw-r--r--scilab/modules/graphics/includes/BuildObjects.h6
-rw-r--r--scilab/modules/graphics/includes/ObjectStructure.h3
-rw-r--r--scilab/modules/graphics/includes/sciCall.h1
-rw-r--r--scilab/modules/graphics/macros/ResetFigureDDM.sci25
-rw-r--r--scilab/modules/graphics/macros/TitleLabel.sci15
-rw-r--r--scilab/modules/graphics/macros/contourf.sci79
-rw-r--r--scilab/modules/graphics/macros/plot.sci16
-rw-r--r--scilab/modules/graphics/macros/surf.sci10
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_xarrows.c2
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_xsegs.c80
-rw-r--r--scilab/modules/graphics/src/c/BuildObjects.c59
-rw-r--r--scilab/modules/graphics/src/c/Champ.c4
-rw-r--r--scilab/modules/graphics/src/c/GetCommandArg.c7
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_box_property.c5
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_x_location_property.c4
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_y_location_property.c4
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_box_property.c10
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_x_location_property.c10
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_y_location_property.c10
-rw-r--r--scilab/modules/graphics/src/c/get_ticks_utils.c77
-rw-r--r--scilab/modules/graphics/src/c/sciCall.c19
-rw-r--r--scilab/modules/graphics/tcl/ged/Axes.tcl7
-rw-r--r--scilab/modules/gui/Makefile.am2
-rw-r--r--scilab/modules/gui/Makefile.in16
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_uigetdir.cpp20
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_uigetfile.cpp8
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_uiputfile.cpp8
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java2
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/SciFileFilter.java10
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_4607.dia.ref22
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_4607.tst24
-rw-r--r--scilab/modules/hdf5/Makefile.am2
-rw-r--r--scilab/modules/hdf5/Makefile.in16
-rw-r--r--scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp2
-rw-r--r--scilab/modules/helptools/Makefile.am2
-rw-r--r--scilab/modules/helptools/Makefile.in16
-rw-r--r--scilab/modules/history_manager/Makefile.am2
-rw-r--r--scilab/modules/history_manager/Makefile.in16
-rw-r--r--scilab/modules/history_manager/sci_gateway/c/sci_loadhistory.c20
-rw-r--r--scilab/modules/history_manager/sci_gateway/c/sci_savehistory.c23
-rw-r--r--scilab/modules/history_manager/src/c/fileio_Import.def2
-rw-r--r--scilab/modules/history_manager/src/cpp/HistoryFile.cpp1
-rw-r--r--scilab/modules/history_manager/src/cpp/HistoryManager.cpp1
-rw-r--r--scilab/modules/integer/Makefile.am2
-rw-r--r--scilab/modules/integer/Makefile.in16
-rw-r--r--scilab/modules/interpolation/Makefile.am2
-rw-r--r--scilab/modules/interpolation/Makefile.in16
-rw-r--r--scilab/modules/intersci/Makefile.am2
-rw-r--r--scilab/modules/intersci/Makefile.in16
-rw-r--r--scilab/modules/io/Makefile.am2
-rw-r--r--scilab/modules/io/Makefile.in16
-rw-r--r--scilab/modules/io/includes/setenvc.h12
-rw-r--r--scilab/modules/io/src/c/GetenvB.c29
-rw-r--r--scilab/modules/io/src/c/setenvc.c17
-rw-r--r--scilab/modules/javasci/Makefile.am2
-rw-r--r--scilab/modules/javasci/Makefile.in16
-rw-r--r--scilab/modules/javasci/includes/javasci_globals.h2
-rw-r--r--scilab/modules/javasci/src/c/javasci_SciAbstractArray.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab.c2
-rw-r--r--scilab/modules/javasci/src/c/javasci_Scilab2.c2
-rw-r--r--scilab/modules/jvm/Makefile.am2
-rw-r--r--scilab/modules/jvm/Makefile.in16
-rw-r--r--scilab/modules/linear_algebra/Makefile.am2
-rw-r--r--scilab/modules/linear_algebra/Makefile.in16
-rw-r--r--scilab/modules/localization/Makefile.am2
-rw-r--r--scilab/modules/localization/Makefile.in16
-rw-r--r--scilab/modules/m2sci/Makefile.in14
-rw-r--r--scilab/modules/maple2scilab/Makefile.in14
-rw-r--r--scilab/modules/matio/Makefile.am2
-rw-r--r--scilab/modules/matio/Makefile.in16
-rw-r--r--scilab/modules/metanet/Makefile.am2
-rw-r--r--scilab/modules/metanet/Makefile.in16
-rw-r--r--scilab/modules/mexlib/Makefile.am2
-rw-r--r--scilab/modules/mexlib/Makefile.in16
-rw-r--r--scilab/modules/mexlib/src/c/mexlib.c2
-rw-r--r--scilab/modules/optimization/Makefile.am2
-rw-r--r--scilab/modules/optimization/Makefile.in16
-rw-r--r--scilab/modules/optimization/help/en_US/optim.xml163
-rw-r--r--scilab/modules/optimization/macros/optimsimplex/optimsimplex_gradientfv.sci8
-rw-r--r--scilab/modules/output_stream/Makefile.am2
-rw-r--r--scilab/modules/output_stream/Makefile.in16
-rw-r--r--scilab/modules/overloading/Makefile.in14
-rw-r--r--scilab/modules/parameters/Makefile.in14
-rw-r--r--scilab/modules/polynomials/Makefile.am2
-rw-r--r--scilab/modules/polynomials/Makefile.in16
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_415.dia.ref208
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_415.tst155
-rw-r--r--scilab/modules/pvm/Makefile.am2
-rw-r--r--scilab/modules/pvm/Makefile.in30
-rw-r--r--scilab/modules/randlib/Makefile.am2
-rw-r--r--scilab/modules/randlib/Makefile.in16
-rw-r--r--scilab/modules/renderer/Makefile.am4
-rw-r--r--scilab/modules/renderer/Makefile.in36
-rw-r--r--scilab/modules/renderer/renderer.vcproj8
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/DrawableSubwinFactory.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleXAxisPositioner.cpp25
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleXAxisPositioner.hxx10
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleYAxisPositioner.cpp25
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/MiddleYAxisPositioner.hxx10
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginXAxisPositioner.cpp65
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginXAxisPositioner.hxx52
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginYAxisPositioner.cpp64
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/OriginYAxisPositioner.hxx51
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawerFactory.cpp9
-rw-r--r--scilab/modules/scicos/Makefile.am4
-rw-r--r--scilab/modules/scicos/Makefile.in18
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in16
-rw-r--r--scilab/modules/scicos_blocks/src/c/scoWindowScope.c4
-rw-r--r--scilab/modules/scipad/Makefile.in28
-rw-r--r--scilab/modules/shell/Makefile.am2
-rw-r--r--scilab/modules/shell/Makefile.in16
-rw-r--r--scilab/modules/shell/src/c/prompt.c16
-rw-r--r--scilab/modules/signal_processing/Makefile.am2
-rw-r--r--scilab/modules/signal_processing/Makefile.in16
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in14
-rw-r--r--scilab/modules/sound/Makefile.am2
-rw-r--r--scilab/modules/sound/Makefile.in16
-rw-r--r--scilab/modules/sound/sci_gateway/c/sci_PlaySound.c22
-rw-r--r--scilab/modules/sparse/Makefile.am2
-rw-r--r--scilab/modules/sparse/Makefile.in16
-rw-r--r--scilab/modules/special_functions/Makefile.am2
-rw-r--r--scilab/modules/special_functions/Makefile.in16
-rw-r--r--scilab/modules/spreadsheet/Makefile.am2
-rw-r--r--scilab/modules/spreadsheet/Makefile.in16
-rw-r--r--scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c29
-rw-r--r--scilab/modules/statistics/Makefile.am2
-rw-r--r--scilab/modules/statistics/Makefile.in16
-rw-r--r--scilab/modules/string/Makefile.am2
-rw-r--r--scilab/modules/string/Makefile.in16
-rw-r--r--scilab/modules/string/includes/strsubst.h5
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_strsubst.c318
-rw-r--r--scilab/modules/string/src/c/strsubst.c11
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_4807.dia.ref20
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_4807.tst21
-rw-r--r--scilab/modules/symbolic/Makefile.am2
-rw-r--r--scilab/modules/symbolic/Makefile.in16
-rw-r--r--scilab/modules/tclsci/Makefile.am2
-rw-r--r--scilab/modules/tclsci/Makefile.in16
-rw-r--r--scilab/modules/texmacs/Makefile.in14
-rw-r--r--scilab/modules/time/Makefile.am2
-rw-r--r--scilab/modules/time/Makefile.in16
-rw-r--r--scilab/modules/umfpack/Makefile.am2
-rw-r--r--scilab/modules/umfpack/Makefile.in16
-rw-r--r--scilab/modules/windows_tools/Makefile.am2
-rw-r--r--scilab/modules/windows_tools/Makefile.in16
-rw-r--r--scilab/modules/windows_tools/sci_gateway/c/sci_dos.c266
-rw-r--r--scilab/modules/windows_tools/src/c/spawncommand.c135
-rw-r--r--scilab/modules/windows_tools/src/c/spawncommand.h2
-rw-r--r--scilab/modules/windows_tools/src/c/winopen.c25
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_4030.tst19
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_4702.dia.ref16
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_4702.tst20
-rw-r--r--scilab/modules/xpad/Makefile.am4
-rw-r--r--scilab/modules/xpad/Makefile.in18
-rw-r--r--scilab/modules/xpad/sci_gateway/cpp/sci_xpad.cpp17
-rw-r--r--scilab/modules/xpad/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/xpad/src/c/xpad.vcproj8
-rw-r--r--scilab/modules/xpad/src/cpp/callxpad.cpp16
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/Xpad.java343
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadLineNumberPanel.java29
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/AutoIndentAction.java5
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ColorizeAction.java10
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ExitAction.java25
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/FindAction.java42
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/GotoLineAction.java206
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/IndentAction.java23
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LineNumbersAction.java4
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java15
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/OpenAction.java26
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/RecentFileAction.java1
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/ResetFontAction.java34
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAction.java68
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SaveAsAction.java22
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SetColorsAction.java82
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/SetFontAction.java37
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/style/ScilabStyleDocument.java619
-rw-r--r--scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java10
327 files changed, 6556 insertions, 3252 deletions
diff --git a/scilab/modules/action_binding/Makefile.am b/scilab/modules/action_binding/Makefile.am
index dcc5c1a..04a0ebf 100644
--- a/scilab/modules/action_binding/Makefile.am
+++ b/scilab/modules/action_binding/Makefile.am
@@ -73,7 +73,7 @@ libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
73libsciaction_binding_la_sci_gateway_DATA = 73libsciaction_binding_la_sci_gateway_DATA =
74 74
75####�action_binding : include files #### 75####�action_binding : include files ####
76libsciaction_binding_la_includedir=$(pkgincludedir)/action_binding 76libsciaction_binding_la_includedir=$(pkgincludedir)
77libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \ 77libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \
78includes/dynlib_action_binding.h 78includes/dynlib_action_binding.h
79 79
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index d052d37..edea450 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -445,7 +445,7 @@ libsciaction_binding_la_sci_gatewaydir = $(mydatadir)/sci_gateway
445libsciaction_binding_la_sci_gateway_DATA = 445libsciaction_binding_la_sci_gateway_DATA =
446 446
447####�action_binding : include files #### 447####�action_binding : include files ####
448libsciaction_binding_la_includedir = $(pkgincludedir)/action_binding 448libsciaction_binding_la_includedir = $(pkgincludedir)
449libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \ 449libsciaction_binding_la_include_HEADERS = includes/dynamic_menus.h \
450includes/dynlib_action_binding.h 450includes/dynlib_action_binding.h
451 451
@@ -984,7 +984,7 @@ check-code:
984@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 984@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
985@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 985@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
986@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 986@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
987@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 987@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
988@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 988@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
989@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 989@SWIG_TRUE@ echo "Swig process of $$file ..."; \
990@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 990@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -996,7 +996,7 @@ check-code:
996 996
997@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 997@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
998@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 998@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
999@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 999@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1000@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1000@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1001@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1001@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1002@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1002@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1102,10 +1102,12 @@ install-data-local:
1102 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1102 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1103 if test -d $(srcdir)/$$dir/; then \ 1103 if test -d $(srcdir)/$$dir/; then \
1104 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1104 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1105 for specialExt in $(MACROSSPECIALEXT); do \ 1105 if test -n "$(MACROSSPECIALEXT)"; then \
1106 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1106 for specialExt in $(MACROSSPECIALEXT); do \
1107 done; \ 1107 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1108 FILELIST="$$FILELIST $$specialExtDir"; \ 1108 done; \
1109 FILELIST="$$FILELIST $$specialExtDir"; \
1110 fi; \
1109 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1111 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1110 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1112 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1111 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1113 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/api_scilab/Makefile.am b/scilab/modules/api_scilab/Makefile.am
index a242d0f..fd10822 100644
--- a/scilab/modules/api_scilab/Makefile.am
+++ b/scilab/modules/api_scilab/Makefile.am
@@ -65,7 +65,7 @@ libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start
65 65
66 66
67#### api_scilab : include files #### 67#### api_scilab : include files ####
68libsciapi_scilab_la_includedir=$(pkgincludedir)/api_scilab 68libsciapi_scilab_la_includedir=$(pkgincludedir)
69libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \ 69libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \
70includes/api_boolean_sparse.h \ 70includes/api_boolean_sparse.h \
71includes/api_common.h \ 71includes/api_common.h \
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index c7e401d..ac81c88 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -428,7 +428,7 @@ libsciapi_scilab_la_etcdir = $(mydatadir)/etc
428libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start 428libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start
429 429
430#### api_scilab : include files #### 430#### api_scilab : include files ####
431libsciapi_scilab_la_includedir = $(pkgincludedir)/api_scilab 431libsciapi_scilab_la_includedir = $(pkgincludedir)
432libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \ 432libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \
433includes/api_boolean_sparse.h \ 433includes/api_boolean_sparse.h \
434includes/api_common.h \ 434includes/api_common.h \
@@ -996,7 +996,7 @@ check-code:
996@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 996@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
997@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 997@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
998@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 998@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
999@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 999@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1000@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1000@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1001@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1001@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1002@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1002@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1008,7 +1008,7 @@ check-code:
1008 1008
1009@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1009@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1010@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1010@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1011@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1011@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1012@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1012@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1013@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1013@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1014@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1014@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1114,10 +1114,12 @@ install-data-local:
1114 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1114 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1115 if test -d $(srcdir)/$$dir/; then \ 1115 if test -d $(srcdir)/$$dir/; then \
1116 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1116 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1117 for specialExt in $(MACROSSPECIALEXT); do \ 1117 if test -n "$(MACROSSPECIALEXT)"; then \
1118 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1118 for specialExt in $(MACROSSPECIALEXT); do \
1119 done; \ 1119 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1120 FILELIST="$$FILELIST $$specialExtDir"; \ 1120 done; \
1121 FILELIST="$$FILELIST $$specialExtDir"; \
1122 fi; \
1121 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1123 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1122 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1124 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1123 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1125 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml
index 9340533..62adc12 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_boolean_reading_api.xml
@@ -190,7 +190,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
190 sciprint("MList "); 190 sciprint("MList ");
191 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 191 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
192 break; 192 break;
193 case sci_lufact_pointer : 193 case sci_pointer :
194 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 194 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
195 break; 195 break;
196 default : 196 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml
index ed270be..a19c9f8 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_bsparse_reading_api.xml
@@ -206,7 +206,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
206 sciprint("MList "); 206 sciprint("MList ");
207 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 207 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
208 break; 208 break;
209 case sci_lufact_pointer : 209 case sci_pointer :
210 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 210 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
211 break; 211 break;
212 default : 212 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml
index 97f77a7..17e0856 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_double_reading_api.xml
@@ -201,7 +201,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
201 sciprint("MList "); 201 sciprint("MList ");
202 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 202 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
203 break; 203 break;
204 case sci_lufact_pointer : 204 case sci_pointer :
205 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 205 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
206 break; 206 break;
207 default : 207 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml
index 1c03385..01c6275 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_integer_reading_api.xml
@@ -197,7 +197,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
197 sciprint("MList "); 197 sciprint("MList ");
198 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 198 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
199 break; 199 break;
200 case sci_lufact_pointer : 200 case sci_pointer :
201 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 201 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
202 break; 202 break;
203 default : 203 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml
index 6951459..c755a9c 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_pointer_reading_api.xml
@@ -174,7 +174,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
174 sciprint("MList "); 174 sciprint("MList ");
175 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 175 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
176 break; 176 break;
177 case sci_lufact_pointer : 177 case sci_pointer :
178 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 178 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
179 break; 179 break;
180 default : 180 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml
index bd47d0f..d843ac7 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_poly_reading_api.xml
@@ -209,7 +209,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
209 sciprint("MList "); 209 sciprint("MList ");
210 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 210 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
211 break; 211 break;
212 case sci_lufact_pointer : 212 case sci_pointer :
213 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 213 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
214 break; 214 break;
215 default : 215 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml
index 847d811..dde2ac8 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_sparse_reading_api.xml
@@ -225,7 +225,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
225 sciprint("MList "); 225 sciprint("MList ");
226 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 226 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
227 break; 227 break;
228 case sci_lufact_pointer : 228 case sci_pointer :
229 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 229 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
230 break; 230 break;
231 default : 231 default :
diff --git a/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml b/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml
index 06e7bcb..2e39bee2 100644
--- a/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/list_management/list_string_reading_api.xml
@@ -198,7 +198,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
198 sciprint("MList "); 198 sciprint("MList ");
199 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 199 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
200 break; 200 break;
201 case sci_lufact_pointer : 201 case sci_pointer :
202 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 202 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
203 break; 203 break;
204 default : 204 default :
diff --git a/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml b/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml
index 5595418..c329be9 100644
--- a/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/pointer_reading_api.xml
@@ -89,7 +89,7 @@ int read_pointer(char *fname,unsigned long fname_len)
89 return 1; 89 return 1;
90 } 90 }
91 91
92 if(getVarType(piAddr) != sci_lufact_pointer) 92 if(getVarType(piAddr) != sci_pointer)
93 { 93 {
94 return 1; 94 return 1;
95 } 95 }
diff --git a/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml b/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml
index 77c89fb..0ed34cf 100644
--- a/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml
+++ b/scilab/modules/api_scilab/help/en_US/pointer_writing_api.xml
@@ -119,7 +119,7 @@ int read_pointer(char *fname,unsigned long fname_len)
119 return 1; 119 return 1;
120 } 120 }
121 121
122 if(getVarType(piAddr) != sci_lufact_pointer) 122 if(getVarType(piAddr) != sci_pointer)
123 { 123 {
124 return 1; 124 return 1;
125 } 125 }
diff --git a/scilab/modules/api_scilab/includes/api_list.h b/scilab/modules/api_scilab/includes/api_list.h
index f769adb..68cdc1c 100644
--- a/scilab/modules/api_scilab/includes/api_list.h
+++ b/scilab/modules/api_scilab/includes/api_list.h
@@ -250,27 +250,25 @@ API_SCILAB_IMPEXP int createMListInNamedList(char* _pstName, int* _piParent, int
250 250
251/** 251/**
252 * Get double variable data 252 * Get double variable data
253 * @param[in] _iVar variable number
254 * @param[in] _piParent pointer on the parent 253 * @param[in] _piParent pointer on the parent
255 * @param[in] _iItemPos position of the new list in the parent 254 * @param[in] _iItemPos itme position in the list
256 * @param[out] _piRows return number of row 255 * @param[out] _piRows return number of row
257 * @param[out] _piCols return number of column 256 * @param[out] _piCols return number of column
258 * @param[out] _pdblReal return pointer on real data 257 * @param[out] _pdblReal return pointer on real data
259 * @return if the operation successed (0) or not ( !0 ) 258 * @return if the operation successed (0) or not ( !0 )
260 */ 259 */
261API_SCILAB_IMPEXP int getMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal); 260API_SCILAB_IMPEXP int getMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal);
262 261
263/** 262/**
264 * Get double variable data 263 * Get double variable data
265 * @param[in] _iVar variable number
266 * @param[in] _piParent pointer on the parent 264 * @param[in] _piParent pointer on the parent
267 * @param[in] _iItemPos position of the new list in the parent 265 * @param[in] _iItemPos itme position in the list
268 * @param[out] _piRows return number of row 266 * @param[out] _piRows return number of row
269 * @param[out] _piCols return number of column 267 * @param[out] _piCols return number of column
270 * @param[out] _pdblReal return pointer on real data 268 * @param[out] _pdblReal return pointer on real data
271 * @return if the operation successed (0) or not ( !0 ) 269 * @return if the operation successed (0) or not ( !0 )
272 */ 270 */
273API_SCILAB_IMPEXP int getComplexMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg); 271API_SCILAB_IMPEXP int getComplexMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg);
274 272
275/** 273/**
276 * Alloc double variable in a list 274 * Alloc double variable in a list
@@ -402,7 +400,6 @@ API_SCILAB_IMPEXP int readComplexMatrixOfDoubleInNamedList(char* _pstName, int*
402 400
403/** 401/**
404 * Get string variable in a list 402 * Get string variable in a list
405 * @param[in] _iVar variable number
406 * @param[in] _piParent address of parent node 403 * @param[in] _piParent address of parent node
407 * @param[in] _iItemPos item postion in the list 404 * @param[in] _iItemPos item postion in the list
408 * @param[out] _piRows return number of row 405 * @param[out] _piRows return number of row
@@ -411,7 +408,7 @@ API_SCILAB_IMPEXP int readComplexMatrixOfDoubleInNamedList(char* _pstName, int*
411 * @param[out] _pstStrings return array of char 408 * @param[out] _pstStrings return array of char
412 * @return if the operation successed (0) or not ( !0 ) 409 * @return if the operation successed (0) or not ( !0 )
413 */ 410 */
414API_SCILAB_IMPEXP int getMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings); 411API_SCILAB_IMPEXP int getMatrixOfStringInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings);
415 412
416/** 413/**
417 * Create string variable in a list 414 * Create string variable in a list
@@ -456,7 +453,6 @@ API_SCILAB_IMPEXP int readMatrixOfStringInNamedList(char* _pstName, int* _piPare
456 453
457/** 454/**
458 * Get boolean variable data from a list 455 * Get boolean variable data from a list
459 * @param[in] _iVar variable number
460 * @param[in] _piParent pointer on the parent 456 * @param[in] _piParent pointer on the parent
461 * @param[in] _iItemPos position of the new list in the parent 457 * @param[in] _iItemPos position of the new list in the parent
462 * @param[out] _piRows return number of row 458 * @param[out] _piRows return number of row
@@ -464,7 +460,7 @@ API_SCILAB_IMPEXP int readMatrixOfStringInNamedList(char* _pstName, int* _piPare
464 * @param[out] _piBool return pointer on data 460 * @param[out] _piBool return pointer on data
465 * @return if the operation successed (0) or not ( !0 ) 461 * @return if the operation successed (0) or not ( !0 )
466 */ 462 */
467API_SCILAB_IMPEXP int getMatrixOfBooleanInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool); 463API_SCILAB_IMPEXP int getMatrixOfBooleanInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool);
468 464
469/** 465/**
470 * Alloc boolean variable in a list 466 * Alloc boolean variable in a list
@@ -520,7 +516,6 @@ API_SCILAB_IMPEXP int readMatrixOfBooleanInNamedList(char* _pstName, int* _piPar
520 516
521/** 517/**
522 * Get polynomial variable in list 518 * Get polynomial variable in list
523 * @param[in] _iVar variable number
524 * @param[in] _piParent address of parent node 519 * @param[in] _piParent address of parent node
525 * @param[in] _iItemPos item postion in the list 520 * @param[in] _iItemPos item postion in the list
526 * @param[out] _piRows return number of row 521 * @param[out] _piRows return number of row
@@ -529,11 +524,10 @@ API_SCILAB_IMPEXP int readMatrixOfBooleanInNamedList(char* _pstName, int* _piPar
529 * @param[out] _pdblReal return polynomials coefficients 524 * @param[out] _pdblReal return polynomials coefficients
530 * @return if the operation successed (0) or not ( !0 ) 525 * @return if the operation successed (0) or not ( !0 )
531 */ 526 */
532API_SCILAB_IMPEXP int getMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal); 527API_SCILAB_IMPEXP int getMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal);
533 528
534/** 529/**
535 * Get complex polynomial variable in list 530 * Get complex polynomial variable in list
536 * @param[in] _iVar variable number
537 * @param[in] _piParent address of parent node 531 * @param[in] _piParent address of parent node
538 * @param[in] _iItemPos item postion in the list 532 * @param[in] _iItemPos item postion in the list
539 * @param[out] _piRows return number of row 533 * @param[out] _piRows return number of row
@@ -543,7 +537,7 @@ API_SCILAB_IMPEXP int getMatrixOfPolyInList(int _iVar, int* _piParent, int _iIte
543 * @param[out] _pdblImg return polynomials coefficients 537 * @param[out] _pdblImg return polynomials coefficients
544 * @return if the operation successed (0) or not ( !0 ) 538 * @return if the operation successed (0) or not ( !0 )
545 */ 539 */
546API_SCILAB_IMPEXP int getComplexMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg); 540API_SCILAB_IMPEXP int getComplexMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
547 541
548/** 542/**
549 * Create polynomial variable in list 543 * Create polynomial variable in list
@@ -739,7 +733,6 @@ API_SCILAB_IMPEXP int allocMatrixOfUnsignedInteger64InList(int _iVar, int* _piPa
739#endif 733#endif
740/** 734/**
741 * read integer 8 variable in a list 735 * read integer 8 variable in a list
742 * @param[in] _iVar variable number
743 * @param[in] _piParent address of parent node 736 * @param[in] _piParent address of parent node
744 * @param[in] _iItemPos item postion in the list 737 * @param[in] _iItemPos item postion in the list
745 * @param[out] _iRows Number of row 738 * @param[out] _iRows Number of row
@@ -747,12 +740,11 @@ API_SCILAB_IMPEXP int allocMatrixOfUnsignedInteger64InList(int _iVar, int* _piPa
747 * @param[out] _pcData return pointer on data 740 * @param[out] _pcData return pointer on data
748 * @return if the operation successed (0) or not ( !0 ) 741 * @return if the operation successed (0) or not ( !0 )
749 */ 742 */
750API_SCILAB_IMPEXP int getMatrixOfInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData); 743API_SCILAB_IMPEXP int getMatrixOfInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData);
751API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData); 744API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData);
752 745
753/** 746/**
754 * read integer 16 variable in a list 747 * read integer 16 variable in a list
755 * @param[in] _iVar variable number
756 * @param[in] _piParent address of parent node 748 * @param[in] _piParent address of parent node
757 * @param[in] _iItemPos item postion in the list 749 * @param[in] _iItemPos item postion in the list
758 * @param[out] _iRows Number of row 750 * @param[out] _iRows Number of row
@@ -760,12 +752,11 @@ API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParen
760 * @param[out] _psData return pointer on data 752 * @param[out] _psData return pointer on data
761 * @return if the operation successed (0) or not ( !0 ) 753 * @return if the operation successed (0) or not ( !0 )
762 */ 754 */
763API_SCILAB_IMPEXP int getMatrixOfInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData); 755API_SCILAB_IMPEXP int getMatrixOfInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData);
764API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData); 756API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData);
765 757
766/** 758/**
767 * read integer 32 variable in a list 759 * read integer 32 variable in a list
768 * @param[in] _iVar variable number
769 * @param[in] _piParent address of parent node 760 * @param[in] _piParent address of parent node
770 * @param[in] _iItemPos item postion in the list 761 * @param[in] _iItemPos item postion in the list
771 * @param[out] _iRows Number of row 762 * @param[out] _iRows Number of row
@@ -773,12 +764,11 @@ API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piPare
773 * @param[out] _piData return pointer on data 764 * @param[out] _piData return pointer on data
774 * @return if the operation successed (0) or not ( !0 ) 765 * @return if the operation successed (0) or not ( !0 )
775 */ 766 */
776API_SCILAB_IMPEXP int getMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData); 767API_SCILAB_IMPEXP int getMatrixOfInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData);
777API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData); 768API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData);
778 769
779/** 770/**
780 * read integer 64 variable in a list 771 * read integer 64 variable in a list
781 * @param[in] _iVar variable number
782 * @param[in] _piParent address of parent node 772 * @param[in] _piParent address of parent node
783 * @param[in] _iItemPos item postion in the list 773 * @param[in] _iItemPos item postion in the list
784 * @param[out] _iRows Number of row 774 * @param[out] _iRows Number of row
@@ -787,8 +777,8 @@ API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piPare
787 * @return if the operation successed (0) or not ( !0 ) 777 * @return if the operation successed (0) or not ( !0 )
788 */ 778 */
789#ifdef __SCILAB_INT64__ 779#ifdef __SCILAB_INT64__
790API_SCILAB_IMPEXP int getMatrixOfInteger64InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long** _pllData); 780API_SCILAB_IMPEXP int getMatrixOfInteger64InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, long long** _pllData);
791API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger64InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned long long** _pullData); 781API_SCILAB_IMPEXP int getMatrixOfUnsignedInteger64InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned long long** _pullData);
792#endif 782#endif
793 783
794/** 784/**
@@ -978,7 +968,7 @@ API_SCILAB_IMPEXP int createComplexSparseMatrixInNamedList(char* _pstName, int*
978 * @param[out] _pdblReal pointer on data 968 * @param[out] _pdblReal pointer on data
979 * @return if the operation successed (0) or not ( !0 ) 969 * @return if the operation successed (0) or not ( !0 )
980 */ 970 */
981API_SCILAB_IMPEXP int getSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal); 971API_SCILAB_IMPEXP int getSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal);
982 972
983/** 973/**
984 * get complex sparse variable in a list 974 * get complex sparse variable in a list
@@ -994,7 +984,7 @@ API_SCILAB_IMPEXP int getSparseMatrixInList(int _iVar, int* _piParent, int _iIte
994 * @param[out] _pdblImg pointer on img data 984 * @param[out] _pdblImg pointer on img data
995 * @return if the operation successed (0) or not ( !0 ) 985 * @return if the operation successed (0) or not ( !0 )
996 */ 986 */
997API_SCILAB_IMPEXP int getComplexSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg); 987API_SCILAB_IMPEXP int getComplexSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg);
998 988
999/** 989/**
1000 * read sparse variable in a named list 990 * read sparse variable in a named list
@@ -1072,7 +1062,7 @@ API_SCILAB_IMPEXP int createBooleanSparseMatrixInNamedList(char* _pstName, int*
1072 * @param[out] _piColPos array of item column position ( 1 indexed ) 1062 * @param[out] _piColPos array of item column position ( 1 indexed )
1073 * @return if the operation successed (0) or not ( !0 ) 1063 * @return if the operation successed (0) or not ( !0 )
1074 */ 1064 */
1075API_SCILAB_IMPEXP int getBooleanSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos); 1065API_SCILAB_IMPEXP int getBooleanSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos);
1076 1066
1077/** 1067/**
1078 * read sparse variable in a named list 1068 * read sparse variable in a named list
@@ -1101,7 +1091,7 @@ API_SCILAB_IMPEXP int readBooleanSparseMatrixInNamedList(char* _pstName, int* _p
1101 * @param[out] _pvPtr return pointer value 1091 * @param[out] _pvPtr return pointer value
1102 * @return if the operation successed (0) or not ( !0 ) 1092 * @return if the operation successed (0) or not ( !0 )
1103 */ 1093 */
1104API_SCILAB_IMPEXP int getPointerInList(int _iVar, int* _piParent, int _iItemPos, void** _pvPtr); 1094API_SCILAB_IMPEXP int getPointerInList(int* _piParent, int _iItemPos, void** _pvPtr);
1105 1095
1106/** 1096/**
1107 * Create pointer in a list 1097 * Create pointer in a list
diff --git a/scilab/modules/api_scilab/src/cpp/api_boolean.cpp b/scilab/modules/api_scilab/src/cpp/api_boolean.cpp
index 25cc4fd..43463d2 100644
--- a/scilab/modules/api_scilab/src/cpp/api_boolean.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_boolean.cpp
@@ -19,7 +19,7 @@
19#include "api_internal_common.h" 19#include "api_internal_common.h"
20#include "api_internal_boolean.h" 20#include "api_internal_boolean.h"
21 21
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25 25
diff --git a/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp b/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
index 3972539..1c7fcc3 100644
--- a/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_boolean_sparse.cpp
@@ -19,7 +19,7 @@
19#include "api_internal_boolean_sparse.h" 19#include "api_internal_boolean_sparse.h"
20 20
21 21
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25 25
diff --git a/scilab/modules/api_scilab/src/cpp/api_common.cpp b/scilab/modules/api_scilab/src/cpp/api_common.cpp
index 3d23dda..cb4e5a4 100644
--- a/scilab/modules/api_scilab/src/cpp/api_common.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_common.cpp
@@ -16,7 +16,7 @@
16#include <string.h> 16#include <string.h>
17#include <stdlib.h> 17#include <stdlib.h>
18#include "machine.h" 18#include "machine.h"
19#include "CallScilab.h" 19#include "call_scilab.h"
20#include "api_common.h" 20#include "api_common.h"
21#include "api_internal_common.h" 21#include "api_internal_common.h"
22#include "api_double.h" 22#include "api_double.h"
diff --git a/scilab/modules/api_scilab/src/cpp/api_double.cpp b/scilab/modules/api_scilab/src/cpp/api_double.cpp
index 6278bf5..d249eb8 100644
--- a/scilab/modules/api_scilab/src/cpp/api_double.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_double.cpp
@@ -19,7 +19,7 @@
19#include "api_internal_double.h" 19#include "api_internal_double.h"
20 20
21 21
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25/*******************************/ 25/*******************************/
diff --git a/scilab/modules/api_scilab/src/cpp/api_int.cpp b/scilab/modules/api_scilab/src/cpp/api_int.cpp
index 52ab730..c1aa9dc 100644
--- a/scilab/modules/api_scilab/src/cpp/api_int.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_int.cpp
@@ -18,7 +18,7 @@
18#include "api_internal_int.h" 18#include "api_internal_int.h"
19#include "api_int.h" 19#include "api_int.h"
20 20
21#include "CallScilab.h" 21#include "call_scilab.h"
22#include "stack-c.h" 22#include "stack-c.h"
23 23
24int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision) 24int getMatrixOfIntegerPrecision(int* _piAddress, int* _piPrecision)
diff --git a/scilab/modules/api_scilab/src/cpp/api_list.cpp b/scilab/modules/api_scilab/src/cpp/api_list.cpp
index 81ae85d..afebbc3 100644
--- a/scilab/modules/api_scilab/src/cpp/api_list.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_list.cpp
@@ -15,7 +15,7 @@
15 15
16#include "MALLOC.h" 16#include "MALLOC.h"
17#include "stack-c.h" 17#include "stack-c.h"
18#include "CallScilab.h" 18#include "call_scilab.h"
19 19
20#include "api_common.h" 20#include "api_common.h"
21#include "api_internal_common.h" 21#include "api_internal_common.h"
@@ -51,14 +51,14 @@ static void updateNamedListOffset(int _iVar, int *_piCurrentNode, int _iItemPos,
51static void updateCommunListOffset(int _iVar, int *_piCurrentNode, int _iItemPos, int *_piEnd); 51static void updateCommunListOffset(int _iVar, int *_piCurrentNode, int _iItemPos, int *_piEnd);
52 52
53static int allocCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double **_pdblReal, double **_pdblImg); 53static int allocCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double **_pdblReal, double **_pdblImg);
54static int getCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg); 54static int getCommonMatrixOfDoubleInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg);
55static int createCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg); 55static int createCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg);
56static int fillCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg); 56static int fillCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg);
57static int createCommomMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg); 57static int createCommomMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg);
58static int readCommonMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg); 58static int readCommonMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg);
59static int allocCommonItemInList(int* _piParent, int _iItemPos, int** _piChildAddr); 59static int allocCommonItemInList(int* _piParent, int _iItemPos, int** _piChildAddr);
60static int fillMatrixOfBoolInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, int** _piBool); 60static int fillMatrixOfBoolInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, int** _piBool);
61static int getCommonxMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg); 61static int getCommonxMatrixOfPolyInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
62static int createCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg); 62static int createCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg);
63static int fillCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg, int* _piTotalLen); 63static int fillCommonMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, char* _pstVarName, int _iComplex, int _iRows, int _iCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg, int* _piTotalLen);
64static int fillCommonMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, char** _pstStrings, int* _piTotalLen); 64static int fillCommonMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int _iRows, int _iCols, char** _pstStrings, int* _piTotalLen);
@@ -319,17 +319,17 @@ int getCommomListInNamedList(char* _pstName, int* _piParent, int _iItemPos, int
319 * Double functions * 319 * Double functions *
320 *********************/ 320 *********************/
321 321
322int getMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal) 322int getMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal)
323{ 323{
324 return getCommonMatrixOfDoubleInList(_iVar, _piParent,_iItemPos, 0, _piRows, _piCols, _pdblReal, NULL); 324 return getCommonMatrixOfDoubleInList(_piParent,_iItemPos, 0, _piRows, _piCols, _pdblReal, NULL);
325} 325}
326 326
327int getComplexMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg) 327int getComplexMatrixOfDoubleInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
328{ 328{
329 return getCommonMatrixOfDoubleInList(_iVar, _piParent,_iItemPos, 1, _piRows, _piCols, _pdblReal, _pdblImg); 329 return getCommonMatrixOfDoubleInList(_piParent,_iItemPos, 1, _piRows, _piCols, _pdblReal, _pdblImg);
330} 330}
331 331
332static int getCommonMatrixOfDoubleInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg) 332static int getCommonMatrixOfDoubleInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
333{ 333{
334 int iRet = 0; 334 int iRet = 0;
335 int* piAddr = NULL; 335 int* piAddr = NULL;
@@ -767,7 +767,7 @@ static int readCommonMatrixOfDoubleInNamedList(char* _pstName, int* _piParent, i
767 * Strings functions * 767 * Strings functions *
768 *********************/ 768 *********************/
769 769
770int getMatrixOfStringInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings) 770int getMatrixOfStringInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piLength, char** _pstStrings)
771{ 771{
772 int iRet = 0; 772 int iRet = 0;
773 int* piAddr = NULL; 773 int* piAddr = NULL;
@@ -940,7 +940,7 @@ int readMatrixOfStringInNamedList(char* _pstName, int* _piParent, int _iItemPos,
940 * boolean functions * 940 * boolean functions *
941 *********************/ 941 *********************/
942 942
943int getMatrixOfBooleanInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool) 943int getMatrixOfBooleanInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piBool)
944{ 944{
945 int iRet = 0; 945 int iRet = 0;
946 int* piAddr = NULL; 946 int* piAddr = NULL;
@@ -1130,17 +1130,17 @@ int readMatrixOfBooleanInNamedList(char* _pstName, int* _piParent, int _iItemPos
1130 * polynomials functions * 1130 * polynomials functions *
1131 *************************/ 1131 *************************/
1132 1132
1133int getMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal) 1133int getMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal)
1134{ 1134{
1135 return getCommonxMatrixOfPolyInList(_iVar, _piParent, _iItemPos, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL); 1135 return getCommonxMatrixOfPolyInList(_piParent, _iItemPos, 0, _piRows, _piCols, _piNbCoef, _pdblReal, NULL);
1136} 1136}
1137 1137
1138int getComplexMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg) 1138int getComplexMatrixOfPolyInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
1139{ 1139{
1140 return getCommonxMatrixOfPolyInList(_iVar, _piParent, _iItemPos, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg); 1140 return getCommonxMatrixOfPolyInList(_piParent, _iItemPos, 1, _piRows, _piCols, _piNbCoef, _pdblReal, _pdblImg);
1141} 1141}
1142 1142
1143int getCommonxMatrixOfPolyInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg) 1143int getCommonxMatrixOfPolyInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbCoef, double** _pdblReal, double** _pdblImg)
1144{ 1144{
1145 int iRet = 0; 1145 int iRet = 0;
1146 int* piAddr = NULL; 1146 int* piAddr = NULL;
@@ -1491,7 +1491,7 @@ int createMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int
1491 return createCommomMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData); 1491 return createCommomMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _iRows, _iCols, _piData);
1492} 1492}
1493 1493
1494static int getCommonMatrixOfIntegerInList(int _iVar, int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void** _pvData) 1494static int getCommonMatrixOfIntegerInList(int* _piParent, int _iItemPos, int _iPrecision, int* _piRows, int* _piCols, void** _pvData)
1495{ 1495{
1496 int iRet = 0; 1496 int iRet = 0;
1497 int* piAddr = NULL; 1497 int* piAddr = NULL;
@@ -1511,34 +1511,34 @@ static int getCommonMatrixOfIntegerInList(int _iVar, int* _piParent, int _iItemP
1511 return 0; 1511 return 0;
1512} 1512}
1513 1513
1514int getMatrixOfUnsignedInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData) 1514int getMatrixOfUnsignedInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned char** _pucData)
1515{ 1515{
1516 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT8, _piRows, _piCols, (void**)_pucData); 1516 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_UINT8, _piRows, _piCols, (void**)_pucData);
1517} 1517}
1518 1518
1519int getMatrixOfUnsignedInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData) 1519int getMatrixOfUnsignedInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned short** _pusData)
1520{ 1520{
1521 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT16, _piRows, _piCols, (void**)_pusData); 1521 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_UINT16, _piRows, _piCols, (void**)_pusData);
1522} 1522}
1523 1523
1524int getMatrixOfUnsignedInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData) 1524int getMatrixOfUnsignedInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, unsigned int** _puiData)
1525{ 1525{
1526 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, (void**)_puiData); 1526 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_UINT32, _piRows, _piCols, (void**)_puiData);
1527} 1527}
1528 1528
1529int getMatrixOfInteger8InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData) 1529int getMatrixOfInteger8InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, char** _pcData)
1530{ 1530{
1531 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT8, _piRows, _piCols, (void**)_pcData); 1531 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_INT8, _piRows, _piCols, (void**)_pcData);
1532} 1532}
1533 1533
1534int getMatrixOfInteger16InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData) 1534int getMatrixOfInteger16InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, short** _psData)
1535{ 1535{
1536 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT16, _piRows, _piCols, (void**)_psData); 1536 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_INT16, _piRows, _piCols, (void**)_psData);
1537} 1537}
1538 1538
1539int getMatrixOfInteger32InList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData) 1539int getMatrixOfInteger32InList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int** _piData)
1540{ 1540{
1541 return getCommonMatrixOfIntegerInList(_iVar, _piParent, _iItemPos, SCI_INT32, _piRows, _piCols, (void**)_piData); 1541 return getCommonMatrixOfIntegerInList(_piParent, _iItemPos, SCI_INT32, _piRows, _piCols, (void**)_piData);
1542} 1542}
1543 1543
1544static int createCommonMatrixOfIntegerInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData) 1544static int createCommonMatrixOfIntegerInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iPrecision, int _iRows, int _iCols, void* _pvData)
@@ -1852,7 +1852,7 @@ int createComplexSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iI
1852 return createCommonSparseMatrixInNamedList(_pstName, _piParent, _iItemPos, 1, _iRows, _iCols, _iNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg); 1852 return createCommonSparseMatrixInNamedList(_pstName, _piParent, _iItemPos, 1, _iRows, _iCols, _iNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg);
1853} 1853}
1854 1854
1855static int getCommonSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg) 1855static int getCommonSparseMatrixInList(int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg)
1856{ 1856{
1857 int iRet = 0; 1857 int iRet = 0;
1858 int* piAddr = NULL; 1858 int* piAddr = NULL;
@@ -1872,14 +1872,14 @@ static int getCommonSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos,
1872 return 0; 1872 return 0;
1873} 1873}
1874 1874
1875int getSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal) 1875int getSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal)
1876{ 1876{
1877 return getCommonSparseMatrixInList(_iVar, _piParent, _iItemPos, 0, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, NULL); 1877 return getCommonSparseMatrixInList(_piParent, _iItemPos, 0, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, NULL);
1878} 1878}
1879 1879
1880int getComplexSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg) 1880int getComplexSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos, double** _pdblReal, double** _pdblImg)
1881{ 1881{
1882 return getCommonSparseMatrixInList(_iVar, _piParent, _iItemPos, 1, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg); 1882 return getCommonSparseMatrixInList(_piParent, _iItemPos, 1, _piRows, _piCols, _piNbItem, _piNbItemRow, _piColPos, _pdblReal, _pdblImg);
1883} 1883}
1884 1884
1885static int readCommonSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal, double* _pdblImg) 1885static int readCommonSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iItemPos, int _iComplex, int* _piRows, int* _piCols, int* _piNbItem, int* _piNbItemRow, int* _piColPos, double* _pdblReal, double* _pdblImg)
@@ -2078,7 +2078,7 @@ int createBooleanSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iI
2078 return 0; 2078 return 0;
2079} 2079}
2080 2080
2081int getBooleanSparseMatrixInList(int _iVar, int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos) 2081int getBooleanSparseMatrixInList(int* _piParent, int _iItemPos, int* _piRows, int* _piCols, int* _piNbItem, int** _piNbItemRow, int** _piColPos)
2082{ 2082{
2083 int iRet = 0; 2083 int iRet = 0;
2084 int* piAddr = NULL; 2084 int* piAddr = NULL;
@@ -2151,7 +2151,7 @@ int readBooleanSparseMatrixInNamedList(char* _pstName, int* _piParent, int _iIte
2151/********************* 2151/*********************
2152 * Pointer functions * 2152 * Pointer functions *
2153 *********************/ 2153 *********************/
2154int getPointerInList(int _iVar, int* _piParent, int _iItemPos, void** _pvPtr) 2154int getPointerInList(int* _piParent, int _iItemPos, void** _pvPtr)
2155{ 2155{
2156 int iRet = 0; 2156 int iRet = 0;
2157 int* piAddr = NULL; 2157 int* piAddr = NULL;
diff --git a/scilab/modules/api_scilab/src/cpp/api_pointer.cpp b/scilab/modules/api_scilab/src/cpp/api_pointer.cpp
index 40154e4..e6ad6c3 100644
--- a/scilab/modules/api_scilab/src/cpp/api_pointer.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_pointer.cpp
@@ -24,7 +24,7 @@ int getPointer(int* _piAddress, void** _pvPtr)
24{ 24{
25 int *piTmp = NULL; 25 int *piTmp = NULL;
26 26
27 if( _piAddress == NULL || getVarType(_piAddress) != sci_lufact_pointer) 27 if( _piAddress == NULL || getVarType(_piAddress) != sci_pointer)
28 { 28 {
29 return 1; 29 return 1;
30 } 30 }
@@ -42,7 +42,7 @@ int fillPointer(int *_piAddress, void** _pvPtr)
42 return 1; 42 return 1;
43 } 43 }
44 44
45 _piAddress[0] = sci_lufact_pointer; 45 _piAddress[0] = sci_pointer;
46 _piAddress[1] = 1; 46 _piAddress[1] = 1;
47 _piAddress[2] = 1; 47 _piAddress[2] = 1;
48 _piAddress[3] = 0; 48 _piAddress[3] = 0;
diff --git a/scilab/modules/api_scilab/src/cpp/api_poly.cpp b/scilab/modules/api_scilab/src/cpp/api_poly.cpp
index 0e388c9..f53a65a 100644
--- a/scilab/modules/api_scilab/src/cpp/api_poly.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_poly.cpp
@@ -19,7 +19,7 @@
19#include "api_poly.h" 19#include "api_poly.h"
20 20
21#include "MALLOC.h" 21#include "MALLOC.h"
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24extern "C" { 24extern "C" {
25#include "code2str.h" 25#include "code2str.h"
diff --git a/scilab/modules/api_scilab/src/cpp/api_sparse.cpp b/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
index bf81b28..96f6bdb 100644
--- a/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_sparse.cpp
@@ -19,7 +19,7 @@
19#include "api_sparse.h" 19#include "api_sparse.h"
20 20
21#include "MALLOC.h" 21#include "MALLOC.h"
22#include "CallScilab.h" 22#include "call_scilab.h"
23#include "stack-c.h" 23#include "stack-c.h"
24 24
25//internal sparse functions 25//internal sparse functions
diff --git a/scilab/modules/api_scilab/src/cpp/api_string.cpp b/scilab/modules/api_scilab/src/cpp/api_string.cpp
index 436f3ec..a80c829 100644
--- a/scilab/modules/api_scilab/src/cpp/api_string.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_string.cpp
@@ -23,7 +23,7 @@
23#include "api_internal_common.h" 23#include "api_internal_common.h"
24#include "api_string.h" 24#include "api_string.h"
25#include "api_internal_string.h" 25#include "api_internal_string.h"
26#include "CallScilab.h" 26#include "call_scilab.h"
27#include "stack-c.h" 27#include "stack-c.h"
28extern "C" 28extern "C"
29{ 29{
diff --git a/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c b/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c
index 2248fcd..40585f5 100644
--- a/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c
+++ b/scilab/modules/api_scilab/tests/unit_tests/commom_read_api.c
@@ -114,7 +114,7 @@ int get_info(int _iRhs, int* _piParent, int *_piAddr, int _iItemPos)
114 sciprint("MList "); 114 sciprint("MList ");
115 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos); 115 iRet = get_list_info(_iRhs, _piParent, _piAddr, _iItemPos);
116 break; 116 break;
117 case sci_lufact_pointer : 117 case sci_pointer :
118 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos); 118 iRet = get_pointer_info(_iRhs, _piParent, _piAddr, _iItemPos);
119 break; 119 break;
120 default : 120 default :
diff --git a/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c b/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c
index b8a9153..571bcca 100644
--- a/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c
+++ b/scilab/modules/api_scilab/tests/unit_tests/pointer_reading_api.c
@@ -46,7 +46,7 @@ int read_pointer(char *fname,unsigned long fname_len)
46 return 1; 46 return 1;
47 } 47 }
48 48
49 if(getVarType(piAddr) != sci_lufact_pointer) 49 if(getVarType(piAddr) != sci_pointer)
50 { 50 {
51 return 1; 51 return 1;
52 } 52 }
diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index 683cdce..18927cc 100644
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -101,7 +101,7 @@ libsciarnoldi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
101libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml 101libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
102 102
103#### arnoldi : include files #### 103#### arnoldi : include files ####
104libsciarnoldi_la_includedir=$(pkgincludedir)/arnoldi 104libsciarnoldi_la_includedir=$(pkgincludedir)
105libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \ 105libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \
106 includes/dynlib_arnoldi.h 106 includes/dynlib_arnoldi.h
107 107
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 273ea73..f4dba95 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -496,7 +496,7 @@ libsciarnoldi_la_sci_gatewaydir = $(mydatadir)/sci_gateway
496libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml 496libsciarnoldi_la_sci_gateway_DATA = sci_gateway/arnoldi_gateway.xml
497 497
498#### arnoldi : include files #### 498#### arnoldi : include files ####
499libsciarnoldi_la_includedir = $(pkgincludedir)/arnoldi 499libsciarnoldi_la_includedir = $(pkgincludedir)
500libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \ 500libsciarnoldi_la_include_HEADERS = includes/gw_arnoldi.h \
501 includes/dynlib_arnoldi.h 501 includes/dynlib_arnoldi.h
502 502
@@ -1212,7 +1212,7 @@ check-code:
1212@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1212@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1213@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1213@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1214@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1214@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1215@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1215@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1216@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1216@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1217@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1217@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1218@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1218@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1224,7 +1224,7 @@ check-code:
1224 1224
1225@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1225@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1226@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1226@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1227@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1227@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1228@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1228@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1229@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1229@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1230@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1230@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1330,10 +1330,12 @@ install-data-local:
1330 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1330 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1331 if test -d $(srcdir)/$$dir/; then \ 1331 if test -d $(srcdir)/$$dir/; then \
1332 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1332 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1333 for specialExt in $(MACROSSPECIALEXT); do \ 1333 if test -n "$(MACROSSPECIALEXT)"; then \
1334 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1334 for specialExt in $(MACROSSPECIALEXT); do \
1335 done; \ 1335 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1336 FILELIST="$$FILELIST $$specialExtDir"; \ 1336 done; \
1337 FILELIST="$$FILELIST $$specialExtDir"; \
1338 fi; \
1337 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1339 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1338 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1340 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1339 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1341 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/arnoldi/src/arnoldi.rc b/scilab/modules/arnoldi/src/arnoldi.rc
index 5c18885..717cb7f 100644
--- a/scilab/modules/arnoldi/src/arnoldi.rc
+++ b/scilab/modules/arnoldi/src/arnoldi.rc
@@ -7,7 +7,6 @@
7// 7//
8// Generated from the TEXTINCLUDE 2 resource. 8// Generated from the TEXTINCLUDE 2 resource.
9// 9//
10//#include "afxres.h"
11#define APSTUDIO_HIDDEN_SYMBOLS 10#define APSTUDIO_HIDDEN_SYMBOLS
12#include "windows.h" 11#include "windows.h"
13///////////////////////////////////////////////////////////////////////////// 12/////////////////////////////////////////////////////////////////////////////
@@ -33,6 +32,7 @@ BEGIN
33 "resource.h\0" 32 "resource.h\0"
34END 33END
35 34
35
363 TEXTINCLUDE 363 TEXTINCLUDE
37BEGIN 37BEGIN
38 "\r\n" 38 "\r\n"
@@ -57,7 +57,7 @@ VS_VERSION_INFO VERSIONINFO
57 FILEFLAGS 0x0L 57 FILEFLAGS 0x0L
58#endif 58#endif
59 FILEOS 0x4L 59 FILEOS 0x4L
60 FILETYPE 0x2L 60 FILETYPE 0x0L
61 FILESUBTYPE 0x0L 61 FILESUBTYPE 0x0L
62BEGIN 62BEGIN
63 BLOCK "StringFileInfo" 63 BLOCK "StringFileInfo"
@@ -66,10 +66,10 @@ BEGIN
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "arnoldi module" 67 VALUE "FileDescription", "arnoldi module"
68 VALUE "FileVersion", "5, 2, 0, 0" 68 VALUE "FileVersion", "5, 2, 0, 0"
69 VALUE "InternalName", "arnoldi" 69 VALUE "InternalName", "arnoldi module"
70 VALUE "LegalCopyright", "Copyright (C) 2009" 70 VALUE "LegalCopyright", "Copyright (C) 2009"
71 VALUE "OriginalFilename", "arnoldi.dll" 71 VALUE "OriginalFilename", "arnoldi.dll"
72 VALUE "ProductName", "arnoldi module" 72 VALUE "ProductName", " arnoldi"
73 VALUE "ProductVersion", "5, 2, 0, 0" 73 VALUE "ProductVersion", "5, 2, 0, 0"
74 END 74 END
75 END 75 END
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index c73cdbc..9ae235b 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -685,7 +685,7 @@ check-code:
685@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 685@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
686@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 686@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
687@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 687@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
688@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 688@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
689@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 689@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
690@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 690@SWIG_TRUE@ echo "Swig process of $$file ..."; \
691@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 691@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -697,7 +697,7 @@ check-code:
697 697
698@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 698@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
699@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 699@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
700@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 700@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
701@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 701@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
702@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 702@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
703@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 703@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -803,10 +803,12 @@ install-data-local:
803 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 803 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
804 if test -d $(srcdir)/$$dir/; then \ 804 if test -d $(srcdir)/$$dir/; then \
805 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 805 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
806 for specialExt in $(MACROSSPECIALEXT); do \ 806 if test -n "$(MACROSSPECIALEXT)"; then \
807 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 807 for specialExt in $(MACROSSPECIALEXT); do \
808 done; \ 808 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
809 FILELIST="$$FILELIST $$specialExtDir"; \ 809 done; \
810 FILELIST="$$FILELIST $$specialExtDir"; \
811 fi; \
810 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 812 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
811 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 813 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
812 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 814 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/boolean/Makefile.am b/scilab/modules/boolean/Makefile.am
index 1cc8e0c..d480357 100644
--- a/scilab/modules/boolean/Makefile.am
+++ b/scilab/modules/boolean/Makefile.am
@@ -54,7 +54,7 @@ libsciboolean_la_sci_gatewaydir = $(mydatadir)/sci_gateway
54libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml 54libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
55 55
56####�boolean : include files #### 56####�boolean : include files ####
57libsciboolean_la_includedir=$(pkgincludedir)/boolean 57libsciboolean_la_includedir=$(pkgincludedir)
58libsciboolean_la_include_HEADERS = includes/gw_boolean.h \ 58libsciboolean_la_include_HEADERS = includes/gw_boolean.h \
59includes/matboolean.h 59includes/matboolean.h
60 60
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 1feeb1b..1223c37 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -431,7 +431,7 @@ libsciboolean_la_sci_gatewaydir = $(mydatadir)/sci_gateway
431libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml 431libsciboolean_la_sci_gateway_DATA = sci_gateway/boolean_gateway.xml
432 432
433####�boolean : include files #### 433####�boolean : include files ####
434libsciboolean_la_includedir = $(pkgincludedir)/boolean 434libsciboolean_la_includedir = $(pkgincludedir)
435libsciboolean_la_include_HEADERS = includes/gw_boolean.h \ 435libsciboolean_la_include_HEADERS = includes/gw_boolean.h \
436includes/matboolean.h 436includes/matboolean.h
437 437
@@ -1017,7 +1017,7 @@ check-code:
1017@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1017@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1018@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1018@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1019@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1019@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1020@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1020@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1021@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1021@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1022@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1022@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1023@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1023@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1029,7 +1029,7 @@ check-code:
1029 1029
1030@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1030@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1031@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1031@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1032@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1032@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1033@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1033@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1034@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1034@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1035@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1035@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1135,10 +1135,12 @@ install-data-local:
1135 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1135 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1136 if test -d $(srcdir)/$$dir/; then \ 1136 if test -d $(srcdir)/$$dir/; then \
1137 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1137 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1138 for specialExt in $(MACROSSPECIALEXT); do \ 1138 if test -n "$(MACROSSPECIALEXT)"; then \
1139 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1139 for specialExt in $(MACROSSPECIALEXT); do \
1140 done; \ 1140 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1141 FILELIST="$$FILELIST $$specialExtDir"; \ 1141 done; \
1142 FILELIST="$$FILELIST $$specialExtDir"; \
1143 fi; \
1142 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1144 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1143 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1145 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1144 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1146 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index 4f4651c..e671cdf 100644
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -239,7 +239,7 @@ libscicacsd_la_sci_gatewaydir = $(mydatadir)/sci_gateway
239libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml 239libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml
240 240
241####�cacsd : include files #### 241####�cacsd : include files ####
242libscicacsd_la_includedir=$(pkgincludedir)/cacsd 242libscicacsd_la_includedir=$(pkgincludedir)
243libscicacsd_la_include_HEADERS = includes/gw_cacsd0.h \ 243libscicacsd_la_include_HEADERS = includes/gw_cacsd0.h \
244includes/gw_cacsd1.h \ 244includes/gw_cacsd1.h \
245includes/gw_cacsd2.h \ 245includes/gw_cacsd2.h \
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index e676bef..03efaa9 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -705,7 +705,7 @@ libscicacsd_la_sci_gatewaydir = $(mydatadir)/sci_gateway
705libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml 705libscicacsd_la_sci_gateway_DATA = sci_gateway/cacsd_gateway.xml
706 706
707####�cacsd : include files #### 707####�cacsd : include files ####
708libscicacsd_la_includedir = $(pkgincludedir)/cacsd 708libscicacsd_la_includedir = $(pkgincludedir)
709libscicacsd_la_include_HEADERS = includes/gw_cacsd0.h \ 709libscicacsd_la_include_HEADERS = includes/gw_cacsd0.h \
710includes/gw_cacsd1.h \ 710includes/gw_cacsd1.h \
711includes/gw_cacsd2.h \ 711includes/gw_cacsd2.h \
@@ -1883,7 +1883,7 @@ check-code:
1883@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 1883@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
1884@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 1884@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
1885@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 1885@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
1886@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 1886@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
1887@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 1887@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
1888@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 1888@SWIG_TRUE@ echo "Swig process of $$file ..."; \
1889@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 1889@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -1895,7 +1895,7 @@ check-code:
1895 1895
1896@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 1896@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
1897@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 1897@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
1898@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 1898@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
1899@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1899@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1900@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1900@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1901@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1901@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -2001,10 +2001,12 @@ install-data-local:
2001 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 2001 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
2002 if test -d $(srcdir)/$$dir/; then \ 2002 if test -d $(srcdir)/$$dir/; then \
2003 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 2003 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
2004 for specialExt in $(MACROSSPECIALEXT); do \ 2004 if test -n "$(MACROSSPECIALEXT)"; then \
2005 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 2005 for specialExt in $(MACROSSPECIALEXT); do \
2006 done; \ 2006 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
2007 FILELIST="$$FILELIST $$specialExtDir"; \ 2007 done; \
2008 FILELIST="$$FILELIST $$specialExtDir"; \
2009 fi; \
2008 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 2010 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
2009 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 2011 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
2010 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 2012 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/call_scilab/Makefile.am b/scilab/modules/call_scilab/Makefile.am
index 70fee59..afcc0eb 100644
--- a/scilab/modules/call_scilab/Makefile.am
+++ b/scilab/modules/call_scilab/Makefile.am
@@ -4,7 +4,7 @@
4########## 4##########
5 5
6### SOURCES ### 6### SOURCES ###
7CALLSCILAB_C_SOURCES = src/c/CallScilab.c \ 7CALLSCILAB_C_SOURCES = src/c/call_scilab.c \
8 src/c/fromc.c \ 8 src/c/fromc.c \
9 src/c/fromjava.c \ 9 src/c/fromjava.c \
10 src/c/SendScilabJobs.c 10 src/c/SendScilabJobs.c
@@ -57,8 +57,9 @@ libscicall_scilab_la_sci_gatewaydir = $(mydatadir)/sci_gateway
57libscicall_scilab_la_sci_gateway_DATA = sci_gateway/call_scilab_gateway.xml 57libscicall_scilab_la_sci_gateway_DATA = sci_gateway/call_scilab_gateway.xml
58 58
59#### call_scilab : include files #### 59#### call_scilab : include files ####
60libscicall_scilab_la_includedir=$(pkgincludedir)/call_scilab 60libscicall_scilab_la_includedir=$(pkgincludedir)
61libscicall_scilab_la_include_HEADERS = includes/CallScilab.h \ 61libscicall_scilab_la_include_HEADERS = includes/CallScilab.h \
62 includes/call_scilab.h \
62 includes/fromjava.h \ 63 includes/fromjava.h \
63 includes/dynlib_call_scilab.h 64 includes/dynlib_call_scilab.h
64 65
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index ad37e3c..0e19266 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -111,7 +111,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
111LTLIBRARIES = $(pkglib_LTLIBRARIES) 111LTLIBRARIES = $(pkglib_LTLIBRARIES)
112libscicall_scilab_la_DEPENDENCIES = \ 112libscicall_scilab_la_DEPENDENCIES = \
113 $(top_builddir)/modules/core/libscicore.la 113 $(top_builddir)/modules/core/libscicore.la
114am__objects_1 = libscicall_scilab_la-CallScilab.lo \ 114am__objects_1 = libscicall_scilab_la-call_scilab.lo \
115 libscicall_scilab_la-fromc.lo libscicall_scilab_la-fromjava.lo \ 115 libscicall_scilab_la-fromc.lo libscicall_scilab_la-fromjava.lo \
116 libscicall_scilab_la-SendScilabJobs.lo 116 libscicall_scilab_la-SendScilabJobs.lo
117am__objects_2 = libscicall_scilab_la-sci_fromjava.lo \ 117am__objects_2 = libscicall_scilab_la-sci_fromjava.lo \
@@ -378,7 +378,7 @@ top_builddir = @top_builddir@
378top_srcdir = @top_srcdir@ 378top_srcdir = @top_srcdir@
379 379
380### SOURCES ### 380### SOURCES ###
381CALLSCILAB_C_SOURCES = src/c/CallScilab.c \ 381CALLSCILAB_C_SOURCES = src/c/call_scilab.c \
382 src/c/fromc.c \ 382 src/c/fromc.c \
383 src/c/fromjava.c \ 383 src/c/fromjava.c \
384 src/c/SendScilabJobs.c 384 src/c/SendScilabJobs.c
@@ -423,8 +423,9 @@ libscicall_scilab_la_sci_gatewaydir = $(mydatadir)/sci_gateway
423libscicall_scilab_la_sci_gateway_DATA = sci_gateway/call_scilab_gateway.xml 423libscicall_scilab_la_sci_gateway_DATA = sci_gateway/call_scilab_gateway.xml
424 424
425#### call_scilab : include files #### 425#### call_scilab : include files ####
426libscicall_scilab_la_includedir = $(pkgincludedir)/call_scilab 426libscicall_scilab_la_includedir = $(pkgincludedir)
427libscicall_scilab_la_include_HEADERS = includes/CallScilab.h \ 427libscicall_scilab_la_include_HEADERS = includes/CallScilab.h \
428 includes/call_scilab.h \
428 includes/fromjava.h \ 429 includes/fromjava.h \
429 includes/dynlib_call_scilab.h 430 includes/dynlib_call_scilab.h
430 431
@@ -565,8 +566,8 @@ mostlyclean-compile:
565distclean-compile: 566distclean-compile:
566 -rm -f *.tab.c 567 -rm -f *.tab.c
567 568
568@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-CallScilab.Plo@am__quote@
569@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-SendScilabJobs.Plo@am__quote@ 569@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-SendScilabJobs.Plo@am__quote@
570@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-call_scilab.Plo@am__quote@
570@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-fromc.Plo@am__quote@ 571@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-fromc.Plo@am__quote@
571@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-fromjava.Plo@am__quote@ 572@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-fromjava.Plo@am__quote@
572@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-gw_call_scilab.Plo@am__quote@ 573@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicall_scilab_la-gw_call_scilab.Plo@am__quote@
@@ -594,12 +595,12 @@ distclean-compile:
594@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 595@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
595@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< 596@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
596 597
597libscicall_scilab_la-CallScilab.lo: src/c/CallScilab.c 598libscicall_scilab_la-call_scilab.lo: src/c/call_scilab.c
598@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscicall_scilab_la_CFLAGS) $(CFLAGS) -MT libscicall_scilab_la-CallScilab.lo -MD -MP -MF $(DEPDIR)/libscicall_scilab_la-CallScilab.Tpo -c -o libscicall_scilab_la-CallScilab.lo `test -f 'src/c/CallScilab.c' || echo '$(srcdir)/'`src/c/CallScilab.c 599@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscicall_scilab_la_CFLAGS) $(CFLAGS) -MT libscicall_scilab_la-call_scilab.lo -MD -MP -MF $(DEPDIR)/libscicall_scilab_la-call_scilab.Tpo -c -o libscicall_scilab_la-call_scilab.lo `test -f 'src/c/call_scilab.c' || echo '$(srcdir)/'`src/c/call_scilab.c
599@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscicall_scilab_la-CallScilab.Tpo $(DEPDIR)/libscicall_scilab_la-CallScilab.Plo 600@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libscicall_scilab_la-call_scilab.Tpo $(DEPDIR)/libscicall_scilab_la-call_scilab.Plo
600@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/CallScilab.c' object='libscicall_scilab_la-CallScilab.lo' libtool=yes @AMDEPBACKSLASH@ 601@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='src/c/call_scilab.c' object='libscicall_scilab_la-call_scilab.lo' libtool=yes @AMDEPBACKSLASH@
601@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 602@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
602@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscicall_scilab_la_CFLAGS) $(CFLAGS) -c -o libscicall_scilab_la-CallScilab.lo `test -f 'src/c/CallScilab.c' || echo '$(srcdir)/'`src/c/CallScilab.c 603@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscicall_scilab_la_CFLAGS) $(CFLAGS) -c -o libscicall_scilab_la-call_scilab.lo `test -f 'src/c/call_scilab.c' || echo '$(srcdir)/'`src/c/call_scilab.c
603 604
604libscicall_scilab_la-fromc.lo: src/c/fromc.c 605libscicall_scilab_la-fromc.lo: src/c/fromc.c
605@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscicall_scilab_la_CFLAGS) $(CFLAGS) -MT libscicall_scilab_la-fromc.lo -MD -MP -MF $(DEPDIR)/libscicall_scilab_la-fromc.Tpo -c -o libscicall_scilab_la-fromc.lo `test -f 'src/c/fromc.c' || echo '$(srcdir)/'`src/c/fromc.c 606@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libscicall_scilab_la_CFLAGS) $(CFLAGS) -MT libscicall_scilab_la-fromc.lo -MD -MP -MF $(DEPDIR)/libscicall_scilab_la-fromc.Tpo -c -o libscicall_scilab_la-fromc.lo `test -f 'src/c/fromc.c' || echo '$(srcdir)/'`src/c/fromc.c
@@ -983,7 +984,7 @@ check-code:
983@SWIG_TRUE@swig: $(SWIG_WRAPPERS) 984@SWIG_TRUE@swig: $(SWIG_WRAPPERS)
984@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \ 985@SWIG_TRUE@ @SWIG_PACKAGENAME=org.scilab.modules.$(modulename); \
985@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \ 986@SWIG_TRUE@ SWIG_OUTDIR=src/java/org/scilab/modules/$(modulename)/; \
986@SWIG_TRUE@ if test ! -z "$(SWIG_WRAPPERS)"; then \ 987@SWIG_TRUE@ if test -n "$(SWIG_WRAPPERS)"; then \
987@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \ 988@SWIG_TRUE@ for file in $(SWIG_WRAPPERS) ; do \
988@SWIG_TRUE@ echo "Swig process of $$file ..."; \ 989@SWIG_TRUE@ echo "Swig process of $$file ..."; \
989@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \ 990@SWIG_TRUE@ $(SWIG_BIN) $(SWIG_JAVA) -package $$SWIG_PACKAGENAME -outdir $$SWIG_OUTDIR $$file; \
@@ -995,7 +996,7 @@ check-code:
995 996
996@GIWS_TRUE@giws: $(GIWS_WRAPPERS) 997@GIWS_TRUE@giws: $(GIWS_WRAPPERS)
997@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\ 998@GIWS_TRUE@ @GIWS_OUTPUTDIR=src/jni/;\
998@GIWS_TRUE@ if test ! -z "$(GIWS_WRAPPERS)"; then \ 999@GIWS_TRUE@ if test -n "$(GIWS_WRAPPERS)"; then \
999@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \ 1000@GIWS_TRUE@ for file in $(GIWS_WRAPPERS) ; do \
1000@GIWS_TRUE@ echo "GIWS process of $$file ..."; \ 1001@GIWS_TRUE@ echo "GIWS process of $$file ..."; \
1001@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \ 1002@GIWS_TRUE@ $(GIWS_BIN) --output-dir $$GIWS_OUTPUTDIR --throws-exception-on-error --description-file $$file; \
@@ -1101,10 +1102,12 @@ install-data-local:
1101 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \ 1102 $(mkinstalldirs) $(DESTDIR)$(pkgmacrosdir)/$$dir && \
1102 if test -d $(srcdir)/$$dir/; then \ 1103 if test -d $(srcdir)/$$dir/; then \
1103 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\ 1104 FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
1104 for specialExt in $(MACROSSPECIALEXT); do \ 1105 if test -n "$(MACROSSPECIALEXT)"; then \
1105 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \ 1106 for specialExt in $(MACROSSPECIALEXT); do \
1106 done; \ 1107 specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
1107 FILELIST="$$FILELIST $$specialExtDir"; \ 1108 done; \
1109 FILELIST="$$FILELIST $$specialExtDir"; \
1110 fi; \
1108 for file in `ls -1 $$FILELIST 2>/dev/null`; do \ 1111 for file in `ls -1 $$FILELIST 2>/dev/null`; do \
1109 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \ 1112 echo "$(INSTALL_DATA) $$file $(DESTDIR)$(pkgmacrosdir)/$$dir" ; \
1110 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \ 1113 $(INSTALL_DATA) "$$file" $(DESTDIR)$(pkgmacrosdir)/$$dir ; \
diff --git a/scilab/modules/call_scilab/call_scilab.vcproj b/scilab/modules/call_scilab/call_scilab.vcproj
index 2722e09a..bea3ca5 100644
--- a/scilab/modules/call_scilab/call_scilab.vcproj
+++ b/scilab/modules/call_scilab/call_scilab.vcproj
@@ -373,7 +373,7 @@
373 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" 373 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
374 > 374 >
375 <File 375 <File
376 RelativePath=".\src\c\CallScilab.c" 376 RelativePath=".\src\c\call_scilab.c"
377 > 377 >
378 </File> 378 </File>
379 <File 379 <File
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/C#/.gitignore b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/.gitignore
new file mode 100644
index 0000000..744c9e2
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/.gitignore
@@ -0,0 +1,5 @@
1#
2#generated files (windows)
3#
4dotnetsci/obj/
5scilab/bin/DotNetScilab.tlb
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln
new file mode 100644
index 0000000..49959e3
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/DotNetScilab.sln
@@ -0,0 +1,26 @@
1
2Microsoft Visual Studio Solution File, Format Version 10.00
3# Visual Studio 2008
4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetScilab", "dotnetsci\DotNetScilab.csproj", "{C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}"
5EndProject
6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cs_example", "cs_example\cs_example.csproj", "{10B5A5BF-3204-4B47-91C0-7FA614EFA94A}"
7EndProject
8Global
9 GlobalSection(SolutionConfigurationPlatforms) = preSolution
10 Debug|Any CPU = Debug|Any CPU
11 Release|Any CPU = Release|Any CPU
12 EndGlobalSection
13 GlobalSection(ProjectConfigurationPlatforms) = postSolution
14 {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15 {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
16 {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
17 {C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}.Release|Any CPU.Build.0 = Release|Any CPU
18 {10B5A5BF-3204-4B47-91C0-7FA614EFA94A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19 {10B5A5BF-3204-4B47-91C0-7FA614EFA94A}.Debug|Any CPU.Build.0 = Debug|Any CPU
20 {10B5A5BF-3204-4B47-91C0-7FA614EFA94A}.Release|Any CPU.ActiveCfg = Release|Any CPU
21 {10B5A5BF-3204-4B47-91C0-7FA614EFA94A}.Release|Any CPU.Build.0 = Release|Any CPU
22 EndGlobalSection
23 GlobalSection(SolutionProperties) = preSolution
24 HideSolutionNode = FALSE
25 EndGlobalSection
26EndGlobal
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/Properties/AssemblyInfo.cs b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/Properties/AssemblyInfo.cs
index 61c6d33..61c6d33 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/Properties/AssemblyInfo.cs
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/Properties/AssemblyInfo.cs
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.cs b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.cs
index 6dbf109..858e6d3 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.cs
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.cs
@@ -12,13 +12,12 @@
12//============================================================================= 12//=============================================================================
13using System; 13using System;
14using System.Collections.Generic; 14using System.Collections.Generic;
15using System.Linq;
16using System.Text; 15using System.Text;
17using DotNetScilab; 16using DotNetScilab;
18//============================================================================= 17//=============================================================================
19namespace example 18namespace example
20{ 19{
21 class example 20 class cs_example
22 { 21 {
23 //============================================================================= 22 //=============================================================================
24 /* 23 /*
@@ -30,31 +29,31 @@ namespace example
30 //============================================================================= 29 //=============================================================================
31 // Send a command to scilab 30 // Send a command to scilab
32 // Here , we want to display SCI variable 31 // Here , we want to display SCI variable
33 _objScilab.sendScilabJob("disp(\'SCI = \');"); 32 _objScilab.SendScilabJob("disp(\'SCI = \');");
34 _objScilab.sendScilabJob("disp(SCI);"); 33 _objScilab.SendScilabJob("disp(SCI);");
35 //============================================================================= 34 //=============================================================================
36 double[] A = new double[] { 1, 2, 3, 4, 5, 6 }; 35 double[] A = new double[] { 1, 2, 3, 4, 5, 6 };
37 int mA = 2, nA = 3; 36 int mA = 2, nA = 3;
38 37
39 // Write a matrix of double named in scilab 38 // Write a matrix of double named in scilab
40 _objScilab.setNamedMatrixOfDouble("A", mA, nA, A); 39 _objScilab.createNamedMatrixOfDouble("A", mA, nA, A);
41 40
42 // display matrix of double by scilab 41 // display matrix of double by scilab
43 _objScilab.sendScilabJob("disp(\'A =\');"); 42 _objScilab.SendScilabJob("disp(\'A =\');");
44 _objScilab.sendScilabJob("disp(A);"); 43 _objScilab.SendScilabJob("disp(A);");
45 //============================================================================= 44 //=============================================================================
46 if (_objScilab.getNamedMatrixType("A") == (int)DotNetScilab.Scilab.ScilabType.sci_matrix) 45 if (_objScilab.getNamedVarType("A") == (int)DotNetScilab.ScilabType.sci_matrix)
47 { 46 {
48 Console.WriteLine("A is a matrix of double"); 47 Console.WriteLine("A is a matrix of double");
49 } 48 }
50 //============================================================================= 49 //=============================================================================
51 _objScilab.sendScilabJob("B = A + 1;"); 50 _objScilab.SendScilabJob("B = A + 1;");
52 51
53 // get dimensions of a named matrix of double 52 // get dimensions of a named matrix of double
54 int[] DimB = _objScilab.getNamedMatrixOfDoubleDimensions("B"); 53 int[] DimB = _objScilab.getNamedVarDimension("B");
55 54
56 // get named matrix of double 55 // get named matrix of double
57 double[] B = _objScilab.getNamedMatrixOfDouble("B"); 56 double[] B = _objScilab.readNamedMatrixOfDouble("B");
58 57
59 // display matrix of double from C# 58 // display matrix of double from C#
60 Console.WriteLine(""); 59 Console.WriteLine("");
@@ -70,8 +69,8 @@ namespace example
70 } 69 }
71 70
72 // display matrix of double by scilab 71 // display matrix of double by scilab
73 _objScilab.sendScilabJob("disp(\'B =\');"); 72 _objScilab.SendScilabJob("disp(\'B =\');");
74 _objScilab.sendScilabJob("disp(B);"); 73 _objScilab.SendScilabJob("disp(B);");
75 //============================================================================= 74 //=============================================================================
76 } 75 }
77 //============================================================================= 76 //=============================================================================
@@ -84,24 +83,24 @@ namespace example
84 int mstrA = 3, nstrA = 3; 83 int mstrA = 3, nstrA = 3;
85 84
86 // Write a matrix of string named in scilab 85 // Write a matrix of string named in scilab
87 _objScilab.setNamedMatrixOfString("string_A", mstrA, nstrA, strA); 86 _objScilab.createNamedMatrixOfString("string_A", mstrA, nstrA, strA);
88 87
89 // display matrix of string by scilab 88 // display matrix of string by scilab
90 _objScilab.sendScilabJob("disp(\'string_A =\');"); 89 _objScilab.SendScilabJob("disp(\'string_A =\');");
91 _objScilab.sendScilabJob("disp(string_A);"); 90 _objScilab.SendScilabJob("disp(string_A);");
92 //============================================================================= 91 //=============================================================================
93 if (_objScilab.getNamedMatrixType("string_A") == (int)DotNetScilab.Scilab.ScilabType.sci_strings) 92 if (_objScilab.getNamedVarType("string_A") == (int)DotNetScilab.ScilabType.sci_strings)
94 { 93 {
95 Console.WriteLine("string_A is a matrix of strings"); 94 Console.WriteLine("string_A is a matrix of strings");
96 } 95 }
97 //============================================================================= 96 //=============================================================================
98 _objScilab.sendScilabJob("string_B = convstr(string_A,\'u\');"); 97 _objScilab.SendScilabJob("string_B = convstr(string_A,\'u\');");
99 98
100 // get dimensions of a named matrix of string 99 // get dimensions of a named matrix of string
101 int[] DimstrB = _objScilab.getNamedMatrixOfStringDimensions("string_B"); 100 int[] DimstrB = _objScilab.getNamedVarDimension("string_B");
102 101
103 // get named matrix of string 102 // get named matrix of string
104 string[] strB = _objScilab.getNamedMatrixOfString("string_B"); 103 string[] strB = _objScilab.readNamedMatrixOfString("string_B");
105 104
106 Console.WriteLine(""); 105 Console.WriteLine("");
107 Console.WriteLine("(C#) strB ="); 106 Console.WriteLine("(C#) strB =");
@@ -116,8 +115,8 @@ namespace example
116 } 115 }
117 116
118 // display matrix of string by scilab 117 // display matrix of string by scilab
119 _objScilab.sendScilabJob("disp(\'string_B =\');"); 118 _objScilab.SendScilabJob("disp(\'string_B =\');");
120 _objScilab.sendScilabJob("disp(string_B);"); 119 _objScilab.SendScilabJob("disp(string_B);");
121 //============================================================================= 120 //=============================================================================
122 } 121 }
123 //============================================================================= 122 //=============================================================================
@@ -129,11 +128,11 @@ namespace example
129 int mbA = 2, nbA = 3; 128 int mbA = 2, nbA = 3;
130 129
131 // Write a matrix of string named in scilab 130 // Write a matrix of string named in scilab
132 _objScilab.setNamedMatrixOfBoolean("boolean_A", mbA, nbA, bA); 131 _objScilab.createNamedMatrixOfBoolean("boolean_A", mbA, nbA, bA);
133 132
134 // display matrix of string by scilab 133 // display matrix of string by scilab
135 _objScilab.sendScilabJob("disp(\'boolean_A =\');"); 134 _objScilab.SendScilabJob("disp(\'boolean_A =\');");
136 _objScilab.sendScilabJob("disp(boolean_A);"); 135 _objScilab.SendScilabJob("disp(boolean_A);");
137 //============================================================================= 136 //=============================================================================
138 // check if av 137 // check if av
139 if (_objScilab.existNamedVariable("boolean_A") == true) 138 if (_objScilab.existNamedVariable("boolean_A") == true)
@@ -146,14 +145,14 @@ namespace example
146 Console.WriteLine("boolean_B does not exist in scilab"); 145 Console.WriteLine("boolean_B does not exist in scilab");
147 } 146 }
148 //============================================================================= 147 //=============================================================================
149 if (_objScilab.getNamedMatrixType("boolean_A") == (int)DotNetScilab.Scilab.ScilabType.sci_boolean) 148 if (_objScilab.getNamedVarType("boolean_A") == (int)DotNetScilab.ScilabType.sci_boolean)
150 { 149 {
151 Console.WriteLine("boolean_A is a matrix of boolean"); 150 Console.WriteLine("boolean_A is a matrix of boolean");
152 } 151 }
153 //============================================================================= 152 //=============================================================================
154 _objScilab.sendScilabJob("boolean_B = ~boolean_A;"); 153 _objScilab.SendScilabJob("boolean_B = ~boolean_A;");
155 // get dimensions of a named matrix of boolean 154 // get dimensions of a named matrix of boolean
156 int[] DimbB = _objScilab.getNamedMatrixOfBooleanDimensions("boolean_B"); 155 int[] DimbB = _objScilab.getNamedVarDimension("boolean_B");
157 156
158 // get named matrix of boolean 157 // get named matrix of boolean
159 Boolean[] bB = _objScilab.getNamedMatrixOfBoolean("boolean_B"); 158 Boolean[] bB = _objScilab.getNamedMatrixOfBoolean("boolean_B");
@@ -171,14 +170,14 @@ namespace example
171 } 170 }
172 171
173 // display matrix of string by scilab 172 // display matrix of string by scilab
174 _objScilab.sendScilabJob("disp(\'boolean_B =\');"); 173 _objScilab.SendScilabJob("disp(\'boolean_B =\');");
175 _objScilab.sendScilabJob("disp(boolean_B);"); 174 _objScilab.SendScilabJob("disp(boolean_B);");
176 //============================================================================= 175 //=============================================================================
177 } 176 }
178 //============================================================================= 177 //=============================================================================
179 static void example_doplot3d(Scilab _objScilab) 178 static void example_doplot3d(Scilab _objScilab)
180 { 179 {
181 _objScilab.sendScilabJob("plot3d()"); 180 _objScilab.SendScilabJob("plot3d()");
182 while (_objScilab.HaveAGraph()) 181 while (_objScilab.HaveAGraph())
183 { 182 {
184 _objScilab.doEvent(); 183 _objScilab.doEvent();
@@ -192,24 +191,24 @@ namespace example
192 int mA = 2, nA = 3; 191 int mA = 2, nA = 3;
193 192
194 // Write a matrix of double named in scilab 193 // Write a matrix of double named in scilab
195 _objScilab.setNamedMatrixOfInt("int32_A", mA, nA, A); 194 _objScilab.createNamedMatrixOfInt32("int32_A", mA, nA, A);
196 195
197 // display matrix of double by scilab 196 // display matrix of double by scilab
198 _objScilab.sendScilabJob("disp(\'int32_A =\');"); 197 _objScilab.SendScilabJob("disp(\'int32_A =\');");
199 _objScilab.sendScilabJob("disp(int32_A);"); 198 _objScilab.SendScilabJob("disp(int32_A);");
200 //============================================================================= 199 //=============================================================================
201 if (_objScilab.getNamedMatrixType("int32_A") == (int)DotNetScilab.Scilab.ScilabType.sci_ints) 200 if (_objScilab.getNamedVarType("int32_A") == (int)DotNetScilab.ScilabType.sci_ints)
202 { 201 {
203 Console.WriteLine("int32_A is a matrix of int(32)"); 202 Console.WriteLine("int32_A is a matrix of int(32)");
204 } 203 }
205 //============================================================================= 204 //=============================================================================
206 _objScilab.sendScilabJob("int32_B = int32_A + 1;"); 205 _objScilab.SendScilabJob("int32_B = int32_A + 1;");
207 206
208 // get dimensions of a named matrix of double 207 // get dimensions of a named matrix of double
209 int[] DimB = _objScilab.getNamedMatrixOfDoubleDimensions("int32_B"); 208 int[] DimB = _objScilab.getNamedVarDimension("int32_B");
210 209
211 // get named matrix of double 210 // get named matrix of double
212 int[] B = _objScilab.getNamedMatrixOfInt("int32_B"); 211 int[] B = _objScilab.readNamedMatrixOfInt32("int32_B");
213 212
214 // display matrix of double from C# 213 // display matrix of double from C#
215 Console.WriteLine(""); 214 Console.WriteLine("");
@@ -225,8 +224,8 @@ namespace example
225 } 224 }
226 225
227 // display matrix of double by scilab 226 // display matrix of double by scilab
228 _objScilab.sendScilabJob("disp(\'int32_B =\');"); 227 _objScilab.SendScilabJob("disp(\'int32_B =\');");
229 _objScilab.sendScilabJob("disp(int32_B);"); 228 _objScilab.SendScilabJob("disp(int32_B);");
230 //============================================================================= 229 //=============================================================================
231 } 230 }
232 //============================================================================= 231 //=============================================================================
@@ -238,20 +237,20 @@ namespace example
238 int mA = 2, nA = 3; 237 int mA = 2, nA = 3;
239 238
240 // Write a matrix of double named in scilab 239 // Write a matrix of double named in scilab
241 _objScilab.setNamedMatrixOfComplexDouble("cplx_A", mA, nA, realPartA, imagPartA); 240 _objScilab.createNamedComplexMatrixOfDouble("cplx_A", mA, nA, realPartA, imagPartA);
242 241
243 // display matrix of double by scilab 242 // display matrix of double by scilab
244 _objScilab.sendScilabJob("disp(\'cplx_A =\');"); 243 _objScilab.SendScilabJob("disp(\'cplx_A =\');");
245 _objScilab.sendScilabJob("disp(cplx_A);"); 244 _objScilab.SendScilabJob("disp(cplx_A);");
246 //============================================================================= 245 //=============================================================================
247 _objScilab.sendScilabJob("cplx_B = cplx_A * 2;"); 246 _objScilab.SendScilabJob("cplx_B = cplx_A * 2;");
248 247
249 // get dimensions of a named matrix of double 248 // get dimensions of a named matrix of double
250 int[] DimB = _objScilab.getNamedMatrixOfComplexDoubleDimensions("cplx_B"); 249 int[] DimB = _objScilab.getNamedVarDimension("cplx_B");
251 250
252 // get named matrix of double 251 // get named matrix of double
253 double[] realPartB = _objScilab.getNamedMatrixOfComplexDoubleRealPart("cplx_B"); 252 double[] realPartB = _objScilab.readNamedComplexMatrixOfDoubleRealPart("cplx_B");
254 double[] imagPartB = _objScilab.getNamedMatrixOfComplexDoubleImagPart("cplx_B"); 253 double[] imagPartB = _objScilab.readNamedComplexMatrixOfDoubleImgPart("cplx_B");
255 254
256 // display matrix of double from C# 255 // display matrix of double from C#
257 Console.WriteLine(""); 256 Console.WriteLine("");
@@ -267,8 +266,8 @@ namespace example
267 } 266 }
268 267
269 // display matrix of double by scilab 268 // display matrix of double by scilab
270 _objScilab.sendScilabJob("disp(\'cplx_B =\');"); 269 _objScilab.SendScilabJob("disp(\'cplx_B =\');");
271 _objScilab.sendScilabJob("disp(cplx_B);"); 270 _objScilab.SendScilabJob("disp(cplx_B);");
272 //============================================================================= 271 //=============================================================================
273 } 272 }
274 //============================================================================= 273 //=============================================================================
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.csproj b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.csproj
index 01ef8b8..5268506 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/example/example.csproj
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/cs_example/cs_example.csproj
@@ -8,8 +8,8 @@
8 <ProjectGuid>{10B5A5BF-3204-4B47-91C0-7FA614EFA94A}</ProjectGuid> 8 <ProjectGuid>{10B5A5BF-3204-4B47-91C0-7FA614EFA94A}</ProjectGuid>
9 <OutputType>Exe</OutputType> 9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder> 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>example</RootNamespace> 11 <RootNamespace>cs_example</RootNamespace>
12 <AssemblyName>example</AssemblyName> 12 <AssemblyName>cs_example</AssemblyName>
13 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 13 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment> 14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup> 15 </PropertyGroup>
@@ -32,42 +32,6 @@
32 <WarningLevel>4</WarningLevel> 32 <WarningLevel>4</WarningLevel>
33 <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 33 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
34 </PropertyGroup> 34 </PropertyGroup>
35 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
36 <DebugSymbols>true</DebugSymbols>
37 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
38 <DefineConstants>DEBUG;TRACE</DefineConstants>
39 <DebugType>full</DebugType>
40 <PlatformTarget>x64</PlatformTarget>
41 <ErrorReport>prompt</ErrorReport>
42 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
43 </PropertyGroup>
44 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
45 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
46 <DefineConstants>TRACE</DefineConstants>
47 <Optimize>true</Optimize>
48 <DebugType>pdbonly</DebugType>
49 <PlatformTarget>x64</PlatformTarget>
50 <ErrorReport>prompt</ErrorReport>
51 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
52 </PropertyGroup>
53 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
54 <DebugSymbols>true</DebugSymbols>
55 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
56 <DefineConstants>DEBUG;TRACE</DefineConstants>
57 <DebugType>full</DebugType>
58 <PlatformTarget>x86</PlatformTarget>
59 <ErrorReport>prompt</ErrorReport>
60 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
61 </PropertyGroup>
62 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
63 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
64 <DefineConstants>TRACE</DefineConstants>
65 <Optimize>true</Optimize>
66 <DebugType>pdbonly</DebugType>
67 <PlatformTarget>x86</PlatformTarget>
68 <ErrorReport>prompt</ErrorReport>
69 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
70 </PropertyGroup>
71 <ItemGroup> 35 <ItemGroup>
72 <Reference Include="System" /> 36 <Reference Include="System" />
73 <Reference Include="System.Core"> 37 <Reference Include="System.Core">
@@ -83,7 +47,7 @@
83 <Reference Include="System.Xml" /> 47 <Reference Include="System.Xml" />
84 </ItemGroup> 48 </ItemGroup>
85 <ItemGroup> 49 <ItemGroup>
86 <Compile Include="example.cs" /> 50 <Compile Include="cs_example.cs" />
87 <Compile Include="Properties\AssemblyInfo.cs" /> 51 <Compile Include="Properties\AssemblyInfo.cs" />
88 </ItemGroup> 52 </ItemGroup>
89 <ItemGroup> 53 <ItemGroup>
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/DotNetScilab.csproj b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/DotNetScilab.csproj
index 640bb8e..ced06b0 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/DotNetScilab.csproj
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/DotNetScilab.csproj
@@ -3,13 +3,13 @@
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.21022</ProductVersion> 6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion> 7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}</ProjectGuid> 8 <ProjectGuid>{C3F0C7DC-82AD-405B-990A-BF2C5B7F46FF}</ProjectGuid>
9 <OutputType>Library</OutputType> 9 <OutputType>Library</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder> 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>DotNetScilab</RootNamespace> 11 <RootNamespace>DotNetScilab</RootNamespace>
12 <AssemblyName>DotNetScilab</AssemblyName> 12 <AssemblyName>Scilab-COM-server</AssemblyName>
13 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 13 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment> 14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup> 15 </PropertyGroup>
@@ -22,6 +22,7 @@
22 <ErrorReport>prompt</ErrorReport> 22 <ErrorReport>prompt</ErrorReport>
23 <WarningLevel>4</WarningLevel> 23 <WarningLevel>4</WarningLevel>
24 <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 24 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
25 <RegisterForComInterop>true</RegisterForComInterop>
25 </PropertyGroup> 26 </PropertyGroup>
26 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 <DebugType>pdbonly</DebugType> 28 <DebugType>pdbonly</DebugType>
@@ -31,42 +32,7 @@
31 <ErrorReport>prompt</ErrorReport> 32 <ErrorReport>prompt</ErrorReport>
32 <WarningLevel>4</WarningLevel> 33 <WarningLevel>4</WarningLevel>
33 <AllowUnsafeBlocks>true</AllowUnsafeBlocks> 34 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
34 </PropertyGroup> 35 <RegisterForComInterop>true</RegisterForComInterop>
35 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
36 <DebugSymbols>true</DebugSymbols>
37 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
38 <DefineConstants>DEBUG;TRACE</DefineConstants>
39 <DebugType>full</DebugType>
40 <PlatformTarget>x64</PlatformTarget>
41 <ErrorReport>prompt</ErrorReport>
42 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
43 </PropertyGroup>
44 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
45 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
46 <DefineConstants>TRACE</DefineConstants>
47 <Optimize>true</Optimize>
48 <DebugType>pdbonly</DebugType>
49 <PlatformTarget>x64</PlatformTarget>
50 <ErrorReport>prompt</ErrorReport>
51 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
52 </PropertyGroup>
53 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
54 <DebugSymbols>true</DebugSymbols>
55 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
56 <DefineConstants>DEBUG;TRACE</DefineConstants>
57 <DebugType>full</DebugType>
58 <PlatformTarget>x86</PlatformTarget>
59 <ErrorReport>prompt</ErrorReport>
60 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
61 </PropertyGroup>
62 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
63 <OutputPath>..\..\..\..\..\..\..\bin\</OutputPath>
64 <DefineConstants>TRACE</DefineConstants>
65 <Optimize>true</Optimize>
66 <DebugType>pdbonly</DebugType>
67 <PlatformTarget>x86</PlatformTarget>
68 <ErrorReport>prompt</ErrorReport>
69 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
70 </PropertyGroup> 36 </PropertyGroup>
71 <ItemGroup> 37 <ItemGroup>
72 <Reference Include="System" /> 38 <Reference Include="System" />
@@ -85,6 +51,7 @@
85 <ItemGroup> 51 <ItemGroup>
86 <Compile Include="Scilab.cs" /> 52 <Compile Include="Scilab.cs" />
87 <Compile Include="Properties\AssemblyInfo.cs" /> 53 <Compile Include="Properties\AssemblyInfo.cs" />
54 <Compile Include="Scilab_cs_wrapper.cs" />
88 </ItemGroup> 55 </ItemGroup>
89 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 56 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
90 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 57 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Properties/AssemblyInfo.cs b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Properties/AssemblyInfo.cs
index 313576a..a00de01 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Properties/AssemblyInfo.cs
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Properties/AssemblyInfo.cs
@@ -6,18 +6,18 @@ using System.Runtime.InteropServices;
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("dotnetsci")] 8[assembly: AssemblyTitle("dotnetsci")]
9[assembly: AssemblyDescription("")] 9[assembly: AssemblyDescription(".NET COM server for Scilab 5.x")]
10[assembly: AssemblyConfiguration("")] 10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("Scilab - DIGITEO")] 11[assembly: AssemblyCompany("Scilab - DIGITEO")]
12[assembly: AssemblyProduct("dotnetsci")] 12[assembly: AssemblyProduct("dotnetsci")]
13[assembly: AssemblyCopyright("Copyright © Scilab 2009")] 13[assembly: AssemblyCopyright("Copyright © Scilab 2009")]
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("Allan CORNET")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(true)]
21 21
22// The following GUID is for the ID of the typelib if this project is exposed to COM 22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("ef7effe8-4440-47b7-b579-433dc94cc859")] 23[assembly: Guid("ef7effe8-4440-47b7-b579-433dc94cc859")]
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab.cs b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab.cs
new file mode 100644
index 0000000..6414ffc
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab.cs
@@ -0,0 +1,489 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2009 - DIGITEO - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12//=============================================================================
13/* Please notice that it is only a example and not a full C# wrapper */
14//=============================================================================
15using System;
16using System.Collections.Generic;
17using System.Text;
18using System.Runtime.InteropServices;
19using System.Threading;
20//=============================================================================
21namespace DotNetScilab
22{
23 /* Scilab Types */
24 public enum ScilabType
25 {
26 sci_matrix = 1,
27 sci_poly = 2,
28 sci_boolean = 4,
29 sci_sparse = 5,
30 sci_boolean_sparse = 6,
31 sci_matlab_sparse = 7,
32 sci_ints = 8,
33 sci_handles = 9,
34 sci_strings = 10,
35 sci_u_function = 11,
36 sci_c_function = 13,
37 sci_lib = 14,
38 sci_list = 15,
39 sci_tlist = 16,
40 sci_mlist = 17,
41 sci_pointer = 128,
42 sci_implicit_poly = 129,
43 sci_intrinsic_function = 130
44 };
45
46 /* Enables COM interoperability */
47 [ClassInterface(ClassInterfaceType.AutoDual)]
48 // http://msdn.microsoft.com/en-us/library/system.runtime.interopservices.classinterfaceattribute(VS.80).aspx
49 // http://msdn.microsoft.com/en-us/library/system.runtime.interopservices.classinterfacetype(VS.80).aspx
50 public sealed class Scilab
51 {
52 //=============================================================================
53 static Scilab instance = null;
54 static readonly object padlock = new object();
55 private Boolean withGraphics = false;
56 //=============================================================================
57 /// <summary>
58 /// Constructor, initialize scilab engine.
59 /// </summary>
60 public Scilab()
61 {
62 // Disable TCL/TK and Java graphic interfaces
63 Scilab_cs_wrapper.DisableInteractiveMode();
64 withGraphics = false;
65
66 // start Scilab engine configurated without java
67 Scilab_cs_wrapper.StartScilab(null, null, null);
68 }
69 //=============================================================================
70 public Scilab(Boolean _bWithGraphics)
71 {
72 // Disable TCL/TK and Java graphic interfaces
73 if (_bWithGraphics == false)
74 {
75 Scilab_cs_wrapper.DisableInteractiveMode();
76 withGraphics = false;
77 }
78 else
79 {
80 withGraphics = true;
81 }
82
83 // start Scilab engine
84 Scilab_cs_wrapper.StartScilab(null, null, null);
85 }
86 //=============================================================================
87 /// <summary>
88 /// Singleton
89 /// Only one instance of Scilab can be launch
90 /// thread safe
91 /// </summary>
92 public static Scilab Instance
93 {
94 get
95 {
96 lock (padlock)
97 {
98 if (instance == null)
99 {
100 instance = new Scilab();
101 }
102 return instance;
103 }
104 }
105 }
106 //=============================================================================
107 /// <summary>
108 /// Destructor
109 /// </summary>
110 ~Scilab()
111 {
112 // freed by O.S
113 //Scilab_cs_wrapper.TerminateScilab(null);
114 }
115 //=============================================================================
116 /// <summary>
117 /// Send a job to scilab
118 /// </summary>
119 /// <param name="command">command to send to scilab</param>
120 /// <returns>error code operation, 0 : OK</returns>
121 public int SendScilabJob(string command)
122 {
123 return Scilab_cs_wrapper.SendScilabJob(command);
124 }
125 //=============================================================================
126 /// <summary>
127 /// get last error code
128 /// </summary>
129 /// <returns>last error code</returns>
130 public int GetLastErrorCode()
131 {
132 return Scilab_cs_wrapper.GetLastErrorCode();
133 }
134 //=============================================================================
135 /// <summary>
136 /// Write a named matrix of double in Scilab
137 /// </summary>
138 /// <param name="matrixName"> variable name</param>
139 /// <param name="iRows"> Number of row</param>
140 /// <param name="iCols"> Number of column</param>
141 /// <param name="matrixDouble"> pointer on data</param>
142 /// <returns> if the operation successes (0) or not ( !0 )</returns>
143 public int createNamedMatrixOfDouble(string matrixName, int iRows, int iCols, double[] matrixDouble)
144 {
145 return Scilab_cs_wrapper.createNamedMatrixOfDouble(matrixName, iRows, iCols, matrixDouble);
146 }
147 //=============================================================================
148 /// <summary>
149 /// Write a named matrix of string in scilab
150 /// </summary>
151 /// <param name="matrixName"> variable name</param>
152 /// <param name="iRows"> Number of row</param>
153 /// <param name="iCols"> Number of column</param>
154 /// <param name="matrixDouble"> pointer on data</param>
155 /// <returns> if the operation successes (0) or not ( !0 )</returns>
156 public int createNamedMatrixOfString(string matrixName, int iRows, int iCols, string[] matrixString)
157 {
158 return Scilab_cs_wrapper.createNamedMatrixOfString(matrixName, iRows, iCols, matrixString);
159 }
160 //=============================================================================
161 /// <summary>
162 /// Write a named matrix of boolean in Scilab
163 /// </summary>
164 /// <param name="matrixName"> variable name</param>
165 /// <param name="iRows"> Number of row</param>
166 /// <param name="iCols"> Number of column</param>
167 /// <param name="matrixBoolean"> pointer on data</param>
168 /// <returns> if the operation successes (0) or not ( !0 )</returns>
169 public int createNamedMatrixOfBoolean(string matrixName, int iRows, int iCols, Boolean[] matrixBoolean)
170 {
171 int[] matrixInt = new int[matrixBoolean.Length];
172 for (int i = 0; i < matrixBoolean.Length; i++)
173 {
174 if (matrixBoolean[i] == true)
175 {
176 matrixInt[i] = 1;
177 }
178 else
179 {
180 matrixInt[i] = 0;
181 }
182 }
183 return Scilab_cs_wrapper.createNamedMatrixOfBoolean(matrixName, iRows, iCols, matrixInt);
184 }
185 //=============================================================================
186 /// <summary>
187 /// Write a named matrix of int(32) in Scilab
188 /// </summary>
189 /// <param name="matrixName"> variable name</param>
190 /// <param name="iRows"> Number of row</param>
191 /// <param name="iCols"> Number of column</param>
192 /// <param name="matrixInt"> pointer on data</param>
193 public int createNamedMatrixOfInt32(string matrixName, int iRows, int iCols, int[] matrixInt)
194 {
195 return Scilab_cs_wrapper.createNamedMatrixOfInteger32(matrixName, iRows, iCols, matrixInt);
196 }
197 //=============================================================================
198 /// <summary>
199 /// Write a named matrix of complex double in Scilab
200 /// </summary>
201 /// <param name="matrixName"> variable name</param>
202 /// <param name="iRows">Number of row</param>
203 /// <param name="iCols">Number of column</param>
204 /// <param name="matrixRealPart">real part</param>
205 /// <param name="matrixImagPart">imag part</param>
206 /// <returns></returns>
207 public int createNamedComplexMatrixOfDouble(string matrixName,
208 int iRows, int iCols,
209 double[] matrixRealPart,
210 double[] matrixImagPart)
211 {
212 return Scilab_cs_wrapper.createNamedComplexMatrixOfDouble(matrixName,
213 iRows, iCols,
214 matrixRealPart,
215 matrixImagPart);
216 }
217 //=============================================================================
218 /// <summary>
219 /// Read a named matrix of double from Scilab
220 /// </summary>
221 /// <param name="matrixName"> variable name</param>
222 /// <returns>a matrix of double from scilab. If Variable name does not exist returns null</returns>
223 public unsafe double[] readNamedMatrixOfDouble(string matrixName)
224 {
225 int iRows = 0;
226 int iCols = 0;
227
228 Scilab_cs_wrapper.readNamedMatrixOfDouble(matrixName, &iRows, &iCols, null);
229
230 if (iRows * iCols > 0)
231 {
232 double[] matrixDouble = new double[iRows * iCols];
233
234 // get values in matrixDouble
235 Scilab_cs_wrapper.readNamedMatrixOfDouble(matrixName, &iRows, &iCols, matrixDouble);
236
237 return matrixDouble;
238 }
239 return null;
240
241 }
242 //=============================================================================
243 /// <summary>
244 /// Get dimensions of a named matrix in scilab
245 /// </summary>
246 /// <returns>a int array.
247 /// if variable name does not exist dimensions are null </returns>
248 public unsafe int[] getNamedVarDimension(string matrixName)
249 {
250 int[] iDim = null;
251 int iRows = 0;
252 int iCols = 0;
253
254 if (Scilab_cs_wrapper.getNamedVarDimension(matrixName, &iRows, &iCols) == 0)
255 {
256 iDim = new int[2];
257 iDim[0] = iRows;
258 iDim[1] = iCols;
259 }
260 return iDim;
261 }
262 //=============================================================================
263 /// <summary>
264 /// Read a named matrix of string from scilab
265 /// </summary>
266 /// <param name="matrixName"> variable name</param>
267 /// <returns>a matrix of string from scilab. If Variable name does not exist returns null</returns>
268 public unsafe string[] readNamedMatrixOfString(string matrixName)
269 {
270 string[] matrixString = null;
271
272 int[] iDim = getNamedVarDimension(matrixName);
273
274 if (iDim != null)
275 {
276 int iRows = iDim[0];
277 int iCols = iDim[1];
278
279 // we allocate lengthmatrixString
280 int[] lengthmatrixString = new int[iRows * iCols];
281
282 // we get length of strings
283 Scilab_cs_wrapper.readNamedMatrixOfString(matrixName,
284 &iRows, &iCols,
285 lengthmatrixString, null);
286
287 // we allocate each string
288 matrixString = new string[iRows * iCols];
289 for (int i = 0; i < iRows * iCols; i++)
290 {
291 matrixString[i] = new string(' ', lengthmatrixString[i]);
292 }
293
294 // we get strings from scilab
295 Scilab_cs_wrapper.readNamedMatrixOfString(matrixName,
296 &iRows, &iCols,
297 lengthmatrixString,
298 matrixString);
299 }
300 return matrixString;
301 }
302 //=============================================================================
303 /// <summary>
304 /// Read a named matrix of boolean from Scilab
305 /// </summary>
306 /// <param name="matrixName"> variable name</param>
307 /// <returns>a matrix of boolean from scilab. If Variable name does not exist returns null</returns>
308 public unsafe Boolean[] getNamedMatrixOfBoolean(string matrixName)
309 {
310 Boolean[] matrixBoolean = null;
311 int[] iDim = getNamedVarDimension(matrixName);
312
313 if (iDim != null)
314 {
315 int iRows = iDim[0];
316 int iCols = iDim[1];
317 int[] matrixInt = new int[iRows * iCols];
318
319 // get values in matrixDouble
320 Scilab_cs_wrapper.readNamedMatrixOfBoolean(matrixName,
321 &iRows, &iCols,
322 matrixInt);
323
324 if (matrixInt != null)
325 {
326 matrixBoolean = new Boolean[iRows * iCols];
327 for (int i = 0; i < iRows * iCols; i++)
328 {
329 if (matrixInt[i] == 1)
330 {
331 matrixBoolean[i] = true;
332 }
333 else
334 {
335 matrixBoolean[i] = false;
336 }
337 }
338 }
339 }
340 return matrixBoolean;
341 }
342 //=============================================================================
343 /// <summary>
344 /// Read a named matrix of complex double in Scilab (Real part)
345 /// </summary>
346 /// <param name="matrixName">variable name</param>
347 /// <returns> real part. If Variable name does not exist returns null</returns>
348 public unsafe double[] readNamedComplexMatrixOfDoubleRealPart(string matrixName)
349 {
350 double[] dRealPart = null;
351 int[] iDim = getNamedVarDimension(matrixName);
352 if (iDim != null)
353 {
354 int iRows = iDim[0];
355 int iCols = iDim[1];
356
357 double[] dImagPart = new double[iRows * iCols];
358 dRealPart = new double[iRows * iCols];
359
360 Scilab_cs_wrapper.readNamedComplexMatrixOfDouble(matrixName,
361 &iRows, &iCols,
362 dRealPart,
363 dImagPart);
364 }
365 return dRealPart;
366 }
367 //=============================================================================
368 /// <summary>
369 /// Read a named matrix of complex double in Scilab (Imag part)
370 /// </summary>
371 /// <param name="matrixName">variable name</param>
372 /// <returns> img part. If Variable name does not exist returns null</returns>
373 public unsafe double[] readNamedComplexMatrixOfDoubleImgPart(string matrixName)
374 {
375 double[] dImagPart = null;
376 int[] iDim = getNamedVarDimension(matrixName);
377 if (iDim != null)
378 {
379 int iRows = iDim[0];
380 int iCols = iDim[1];
381
382 double[] dRealPart = new double[iRows * iCols];
383 dImagPart = new double[iRows * iCols];
384
385 Scilab_cs_wrapper.readNamedComplexMatrixOfDouble(matrixName,
386 &iRows, &iCols,
387 dRealPart,
388 dImagPart);
389 }
390 return dImagPart;
391 }
392 //=============================================================================
393 /// <summary>
394 /// Read a named matrix of int(32) in Scilab
395 /// </summary>
396 /// <param name="matrixName"> variable name</param>
397 /// <returns>a matrix of int(32) from scilab. If Variable name does not exist returns null</returns>
398 public unsafe int[] readNamedMatrixOfInt32(string matrixName)
399 {
400 int[] matrixInt = null;
401 int[] iDim = getNamedVarDimension(matrixName);
402 if (iDim != null)
403 {
404 int iRows = iDim[0];
405 int iCols = iDim[1];
406
407 // we allocate matrixInt array
408 matrixInt = new int[iRows * iCols];
409
410 // get values in matrixInt
411 Scilab_cs_wrapper.readNamedMatrixOfInteger32(matrixName, &iRows, &iCols, matrixInt);
412 }
413 return matrixInt;
414 }
415 //=============================================================================
416 /// <summary>
417 /// get scilab type of named matrix
418 /// </summary>
419 /// <param name="matrixName"> variable name</param>
420 /// <returns>scilab type (see enum ScilabType)</returns>
421 public int getNamedVarType(string matrixName)
422 {
423 return Scilab_cs_wrapper.getNamedVarType(matrixName);
424 }
425 //=============================================================================
426 /// <summary>
427 /// Detect if a variable name exists in Scilab
428 /// </summary>
429 /// <param name="matrixName"> variable name</param>
430 /// <returns> true if exists</returns>
431 public unsafe Boolean existNamedVariable(string matrixName)
432 {
433 int* piAdress = null;
434 int ierr = Scilab_cs_wrapper.getVarAddressFromName(matrixName, &piAdress);
435 if ((ierr == 1) && (piAdress != null)) return true;
436 return false;
437 }
438 //=============================================================================
439 /// <summary>
440 /// Execute a scilab script .sce
441 /// </summary>
442 /// <param name="scriptFilename">the path to the .sce file</param>
443 /// <returns>error code operation, 0 : OK</returns>
444 public int execScilabScript(String scriptFilename)
445 {
446 return Scilab_cs_wrapper.SendScilabJob("exec('" + scriptFilename + "');");
447 }
448 //=============================================================================
449 /// <summary>
450 /// Detect if a Scilab graphic window is opened
451 /// </summary>
452 /// <returns>true or false</returns>
453 public Boolean HaveAGraph()
454 {
455 if (withGraphics)
456 {
457 int ierr = Scilab_cs_wrapper.sciHasFigures();
458 if (ierr == 1) return true;
459 }
460 return false;
461 }
462 //=============================================================================
463 /// <summary>
464 /// do a scilab event
465 /// parser need to run to do a event
466 /// </summary>
467 /// <returns>error code operation, 0 : OK</returns>
468 public int doEvent()
469 {
470 // do a pause (we do not want 100% CPU used)
471 // ugly but it works ...
472 Thread.Sleep(1);
473 // do a loop of parser
474 return SendScilabJob("");
475 }
476 //=============================================================================
477 /// <summary>
478 /// get scilab type of named matrix
479 /// </summary>
480 /// <param name="matrixName"> variable name</param>
481 /// <returns>scilab type (see enum ScilabType)</returns>
482 public int isNamedVarComplex(string matrixName)
483 {
484 return Scilab_cs_wrapper.isNamedVarComplex(matrixName);
485 }
486 //=============================================================================
487 }
488}
489//=============================================================================
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab_cs_wrapper.cs b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab_cs_wrapper.cs
new file mode 100644
index 0000000..0146b7f
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/C#/dotnetsci/Scilab_cs_wrapper.cs
@@ -0,0 +1,216 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2009 - DIGITEO - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12//=============================================================================
13using System;
14using System.Collections.Generic;
15using System.Runtime.InteropServices;
16//=============================================================================
17namespace DotNetScilab
18{
19 class Scilab_cs_wrapper
20 {
21 //=============================================================================
22 private const string CALL_SCILAB_DLL = "call_scilab.dll";
23 private const string API_SCILAB_DLL = "api_scilab.dll";
24 private const string GRAPHICS_DLL = "graphics.dll";
25 private const string OUTPUT_STREAM_DLL = "scioutput_stream.dll";
26 //=============================================================================
27 /// <summary>
28 /// import SendScilabJob from C (see CallScilab.h)
29 /// </summary>
30 [DllImport(CALL_SCILAB_DLL, CharSet = CharSet.Ansi)]
31 public static extern int SendScilabJob([In]String job);
32 //=============================================================================
33 /// <summary>
34 /// import StartScilab from C (see CallScilab.h)
35 /// </summary>
36 [DllImport(CALL_SCILAB_DLL, CharSet = CharSet.Ansi)]
37 public static extern int StartScilab([In] String SCIpath,
38 [In] String ScilabStartup,
39 [In] Int32[] Stacksize);
40 //=============================================================================
41 /// <summary>
42 /// import TerminateScilab from C (see CallScilab.h)
43 /// </summary>
44 [DllImport(CALL_SCILAB_DLL, CharSet = CharSet.Ansi)]
45 public static extern int TerminateScilab([In] String ScilabQuit);
46 //=============================================================================
47 /// <summary>
48 /// import DisableInteractiveMode from C (see CallScilab.h)
49 /// </summary>
50 [DllImport(CALL_SCILAB_DLL, CharSet = CharSet.Ansi)]
51 public static extern void DisableInteractiveMode();
52 //=============================================================================
53 /// <summary>
54 /// import createNamedMatrixOfString from C (see api_string.h)
55 /// </summary>
56 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
57 public static extern int createNamedMatrixOfString([In] String _pstName,
58 [In] int _iRows, [In] int _iCols,
59 [In] String[] _pstStrings);
60 //=============================================================================
61 /// <summary>
62 /// import createNamedMatrixOfWideString from C (see api_string.h)
63 /// </summary>
64 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Unicode)]
65 public static extern int createNamedMatrixOfWideString([In] String _pstName,
66 [In] int _iRows, [In] int _iCols,
67 [In] String[] _pstStrings);
68 //=============================================================================
69 /// <summary>
70 /// import createNamedMatrixOfDouble from C (see api_double.h)
71 /// </summary>
72 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
73 public static extern int createNamedMatrixOfDouble([In] String _pstName,
74 [In] int _iRows, [In] int _iCols,
75 [In] double[] _pdblReal);
76 //=============================================================================
77 /// <summary>
78 /// import createNamedMatrixOfBoolean from C (see api_boolean.h)
79 /// </summary>
80 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
81 public static extern int createNamedMatrixOfBoolean([In] String _pstName,
82 [In] int _iRows, [In] int _iCols,
83 [In] int[] _piBool);
84 //=============================================================================
85 /// <summary>
86 /// import createNamedMatrixOfInteger32 from C (see api_int.h)
87 /// </summary>
88 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
89 public unsafe static extern int createNamedMatrixOfInteger32([In] String _pstName,
90 [In] int _iRows, [In] int _iCols,
91 [In] int[] _piData);
92 //=============================================================================
93 /// <summary>
94 /// import createNamedComplexMatrixOfDouble from C (see api_double.h)
95 /// </summary>
96 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
97 public unsafe static extern int createNamedComplexMatrixOfDouble([In] String _pstName,
98 [In] int _iRows, [In] int _iCols,
99 [In] double[] _pdblReal,
100 [In] double[] _pdblImg);
101 //=============================================================================
102 /// <summary>
103 /// import readNamedMatrixOfString from C (see api_string.h)
104 /// </summary>
105 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
106 public unsafe static extern int readNamedMatrixOfString([In] String _pstName,
107 [Out] Int32* _piRows, [Out] Int32* _piCols,
108 [In, Out] int[] _piLength,
109 [In, Out] String[] _pstStrings);
110 //=============================================================================
111 /// <summary>
112 /// import readNamedMatrixOfWideString from C (see api_string.h)
113 /// </summary>
114 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Unicode)]
115 public unsafe static extern int readNamedMatrixOfWideString([In] String _pstName,
116 [Out] Int32* _piRows, [Out] Int32* _piCols,
117 [In, Out] int[] _piLength,
118 [In, Out] String[] _pstStrings);
119 //=============================================================================
120 /// <summary>
121 /// import readNamedMatrixOfDouble from C (see api_double.h)
122 /// </summary>
123 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
124 public unsafe static extern int readNamedMatrixOfDouble([In] String _pstName,
125 [Out] Int32* _piRows, [Out] Int32* _piCols,
126 [In, Out] Double[] _pdblReal);
127 //=============================================================================
128 /// <summary>
129 /// import readNamedMatrixOfBoolean from C (see api_boolean.h)
130 /// </summary>
131 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
132 public unsafe static extern int readNamedMatrixOfBoolean([In] String _pstName,
133 [Out] Int32* _piRows, [Out] Int32* _piCols,
134 [In, Out] int[] _piBool);
135 //=============================================================================
136 /// <summary>
137 /// import readNamedMatrixOfInteger32 from C (see api_int.h)
138 /// </summary>
139 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
140 public unsafe static extern int readNamedMatrixOfInteger32([In] String _pstName,
141 [Out] Int32* _piRows, [Out] Int32* _piCols,
142 [In, Out] int[] _piData);
143
144 //=============================================================================
145 /// <summary>
146 /// import readNamedComplexMatrixOfDouble from C (see api_double.h)
147 /// </summary>
148 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
149 public unsafe static extern int readNamedComplexMatrixOfDouble([In] String _pstName,
150 [Out] Int32* _piRows, [Out] Int32* _piCols,
151 [In, Out] double[] _pdblReal,
152 [In, Out] double[] _pdblImg);
153 //=============================================================================
154 /// <summary>
155 /// get Variable Adress in scilab stack from name
156 /// used for getNamedMatrixType (internal)
157 /// </summary>
158 /// <param name="_pstName">variable name</param>
159 /// <param name="_piAddress"> stack address</param>
160 /// <returns>1 if ok</returns>
161 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
162 public unsafe static extern int getVarAddressFromName([In] String _pstName,
163 [Out] Int32** _piAddress);
164 //=============================================================================
165 /// <summary>
166 /// get Variable type in scilab stack from name
167 /// </summary>
168 /// <param name="_pstName">variable name</param>
169 /// <returns>type or -1</returns>
170 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
171 public unsafe static extern int getNamedVarType([In] String _pstName);
172 //=============================================================================
173 /// <summary>
174 /// get variable type with adress in scilab stack
175 /// used for getNamedMatrixType (internal)
176 /// </summary>
177 /// <param name="_piAddress"> stack address</param>
178 /// <returns>scilab type, 0 fails</returns>
179 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
180 public unsafe static extern int getVarType([In] Int32* _piAddress);
181 //=============================================================================
182 /// <summary>
183 /// Detect if a Scilab graphic window is opened
184 /// </summary>
185 /// <returns>0 (FALSE) or 1 (TRUE)</returns>
186 [DllImport(GRAPHICS_DLL, CharSet = CharSet.Ansi)]
187 public unsafe static extern int sciHasFigures();
188 //=============================================================================
189 /// <summary>
190 /// get last error code
191 /// </summary>
192 /// <returns>last error code</returns>
193 [DllImport(OUTPUT_STREAM_DLL, CharSet = CharSet.Ansi)]
194 public unsafe static extern int GetLastErrorCode();
195 //=============================================================================
196 /// <summary>
197 /// Get variable dimension
198 /// </summary>
199 /// import getNamedVarDimension from C (see api_common.h)
200 /// <returns>int last error code</returns>
201 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
202 public unsafe static extern int getNamedVarDimension([In] String _pstName,
203 [Out] Int32* _piRows, [Out] Int32* _piCols);
204 //=============================================================================
205 /// <summary>
206 /// Get named complex information
207 /// </summary>
208 /// import isNamedVarComplex from C (see api_common.h)
209 /// <returns>int if complex 1 otherwise 0</returns>
210 [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
211 public unsafe static extern int isNamedVarComplex([In] String _pstName);
212 //=============================================================================
213
214 }
215}
216//=============================================================================
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/.gitignore b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/.gitignore
new file mode 100644
index 0000000..c77d249
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/.gitignore
@@ -0,0 +1,6 @@
1#
2#generated files (windows)
3#
4bin/
5obj/
6*.suo
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.Designer.vb b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.Designer.vb
new file mode 100644
index 0000000..7daf013
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.Designer.vb
@@ -0,0 +1,13 @@
1'------------------------------------------------------------------------------
2' <auto-generated>
3' This code was generated by a tool.
4' Runtime Version:2.0.50727.3082
5'
6' Changes to this file may cause incorrect behavior and will be lost if
7' the code is regenerated.
8' </auto-generated>
9'------------------------------------------------------------------------------
10
11Option Strict On
12Option Explicit On
13
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.myapp b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.myapp
new file mode 100644
index 0000000..e62f1a5
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Application.myapp
@@ -0,0 +1,10 @@
1<?xml version="1.0" encoding="utf-8"?>
2<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3 <MySubMain>false</MySubMain>
4 <SingleInstance>false</SingleInstance>
5 <ShutdownMode>0</ShutdownMode>
6 <EnableVisualStyles>true</EnableVisualStyles>
7 <AuthenticationMode>0</AuthenticationMode>
8 <ApplicationType>2</ApplicationType>
9 <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
10</MyApplicationData>
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/AssemblyInfo.vb b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/AssemblyInfo.vb
new file mode 100644
index 0000000..363694a
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/AssemblyInfo.vb
@@ -0,0 +1,35 @@
1Imports System
2Imports System.Reflection
3Imports System.Runtime.InteropServices
4
5' Les informations générales relatives à un assembly dépendent de
6' l'ensemble d'attributs suivant. Changez les valeurs de ces attributs pour modifier les informations
7' associées à un assembly.
8
9' Vérifiez les valeurs des attributs de l'assembly
10
11<Assembly: AssemblyTitle("VB_example")>
12<Assembly: AssemblyDescription("")>
13<Assembly: AssemblyCompany("Aucune")>
14<Assembly: AssemblyProduct("VB_example")>
15<Assembly: AssemblyCopyright("Copyright © Aucune 2009")>
16<Assembly: AssemblyTrademark("")>
17
18<Assembly: ComVisible(False)>
19
20'Le GUID suivant est pour l'ID de la typelib si ce projet est exposé à COM
21<Assembly: Guid("c5cbb040-95cd-4b10-aa88-811a05739d54")>
22
23' Les informations de version pour un assembly se composent des quatre valeurs suivantes :
24'
25' Version principale
26' Version secondaire
27' Numéro de build
28' Révision
29'
30' Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
31' en utilisant '*', comme indiqué ci-dessous :
32' <Assembly: AssemblyVersion("1.0.*")>
33
34<Assembly: AssemblyVersion("1.0.0.0")>
35<Assembly: AssemblyFileVersion("1.0.0.0")>
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.Designer.vb b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.Designer.vb
new file mode 100644
index 0000000..f6b06b7
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.Designer.vb
@@ -0,0 +1,62 @@
1'------------------------------------------------------------------------------
2' <auto-generated>
3' This code was generated by a tool.
4' Runtime Version:2.0.50727.3082
5'
6' Changes to this file may cause incorrect behavior and will be lost if
7' the code is regenerated.
8' </auto-generated>
9'------------------------------------------------------------------------------
10
11Option Strict On
12Option Explicit On
13
14
15Namespace My.Resources
16
17 'This class was auto-generated by the StronglyTypedResourceBuilder
18 'class via a tool like ResGen or Visual Studio.
19 'To add or remove a member, edit your .ResX file then rerun ResGen
20 'with the /str option, or rebuild your VS project.
21 '<summary>
22 ' A strongly-typed resource class, for looking up localized strings, etc.
23 '</summary>
24 <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0"), _
25 Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
26 Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
27 Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
28 Friend Module Resources
29
30 Private resourceMan As Global.System.Resources.ResourceManager
31
32 Private resourceCulture As Global.System.Globalization.CultureInfo
33
34 '<summary>
35 ' Returns the cached ResourceManager instance used by this class.
36 '</summary>
37 <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
38 Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
39 Get
40 If Object.ReferenceEquals(resourceMan, Nothing) Then
41 Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("VB_example.Resources", GetType(Resources).Assembly)
42 resourceMan = temp
43 End If
44 Return resourceMan
45 End Get
46 End Property
47
48 '<summary>
49 ' Overrides the current thread's CurrentUICulture property for all
50 ' resource lookups using this strongly typed resource class.
51 '</summary>
52 <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
53 Friend Property Culture() As Global.System.Globalization.CultureInfo
54 Get
55 Return resourceCulture
56 End Get
57 Set(ByVal value As Global.System.Globalization.CultureInfo)
58 resourceCulture = value
59 End Set
60 End Property
61 End Module
62End Namespace
diff --git a/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.resx b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/scilab/modules/call_scilab/examples/call_scilab/NET/VB.NET/My Project/Resources.resx
@@ -0,0 +1,117 @@
1<?xml version="1.0" encoding="utf-8"?>
2<root>
3 <!--
4 Microsoft ResX Schema
5
6 Version 2.0
7
8 The primary goals of this format is to allow a simple XML format
9 that is mostly human readable. The generation and parsing of the
10 various data types are done through the TypeConverter classes
11 associated with the data types.
12
13 Example:
14
15 ... ado.net/XML headers & schema ...
16 <resheader name="resmimetype">text/microsoft-resx</resheader>
17 <resheader name="version">2.0</resheader>
18 <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19 <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20 <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21 <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22 <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23 <value>[base64 mime encoded serialized .NET Framework object]</value>
24 </data>
25 <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26 <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27 <comment>This is a comment</comment>
28 </data>
29
30 There are any number of "resheader" rows that contain simple
31 name/value pairs.
32
33 Each data row contains a name, and value. The row also contains a
34 type or mimetype. Type corresponds to a .NET class that support
35 text/value conversion through the TypeConverter architecture.
36 Classes that don't support this are serialized and stored with the
37 mimetype set.
38
39 The mimetype is used for serialized objects, and tells the
40 ResXResourceReader how to depersist the object. This is currently not
41 extensible. For a given mimetype the value must be set accordingly:
42
43 Note - application/x-microsoft.net.object.binary.base64 is the format
44 that the ResXResourceWriter will generate, however the reader can
45 read any of the formats listed below.
46
47 mimetype: application/x-microsoft.net.object.binary.base64
48 value : The object must be serialized with
49 : System.Serialization.Formatters.Binary.BinaryFormatter