summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--SEP/INDEX1
-rw-r--r--SEP/SEP_102_members.odtbin0 -> 5076 bytes
-rw-r--r--scilab/CHANGES_5.5.X6
-rw-r--r--scilab/Scilab.sln27
-rw-r--r--scilab/Scilab_f2c.sln7
-rw-r--r--scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj4
-rw-r--r--scilab/Visual-Studio-settings/giws-all/giws-all.vcxproj4
-rw-r--r--scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj12
-rw-r--r--scilab/Visual-Studio-settings/swig-all/swig-all.vcxproj4
-rw-r--r--scilab/Visual-Studio-settings/test-all/test-all.vcxproj4
-rw-r--r--scilab/Visual-Studio-settings/test-level/test-level.vcxproj4
-rw-r--r--scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj4
-rw-r--r--scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj4
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.vcxproj4
-rw-r--r--scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c217
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.cpp224
-rw-r--r--scilab/modules/action_binding/src/jni/Signal.hxx150
-rw-r--r--scilab/modules/api_scilab/api_scilab.vcxproj4
-rw-r--r--scilab/modules/api_scilab/includes/returnProperty.h62
-rw-r--r--scilab/modules/api_scilab/src/cpp/returnProperty.cpp108
-rw-r--r--scilab/modules/arnoldi/arnoldi.vcxproj4
-rw-r--r--scilab/modules/ast/ast-tools/ast-tools.vcxproj4
-rw-r--r--scilab/modules/ast/ast.vcxproj4
-rw-r--r--scilab/modules/boolean/src/c/boolean.vcxproj6
-rw-r--r--scilab/modules/boolean/src/cpp/boolean_gw.vcxproj4
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj4
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.vcxproj4
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj4
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj4
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcxproj4
-rw-r--r--scilab/modules/commons/src/c/commons.vcxproj6
-rw-r--r--scilab/modules/commons/src/jni/CommonFileUtils_wrap.c183
-rw-r--r--scilab/modules/commons/src/jni/ScilabCommons_wrap.c506
-rw-r--r--scilab/modules/completion/src/c/completion.vcxproj4
-rw-r--r--scilab/modules/completion/src/jni/Completion_wrap.c1138
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.vcxproj4
-rw-r--r--scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj4
-rw-r--r--scilab/modules/console/src/c/console.vcxproj4
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.cpp553
-rw-r--r--scilab/modules/console/src/jni/CallScilabBridge.hxx178
-rw-r--r--scilab/modules/console/src/jni/DropFiles_wrap.c189
-rw-r--r--scilab/modules/console/src/jni/GuiManagement_wrap.c146
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.vcxproj4
-rw-r--r--scilab/modules/core/sci_gateway/cpp/core_gw.vcxproj4
-rw-r--r--scilab/modules/core/src/c/core.vcxproj4
-rw-r--r--scilab/modules/core/src/fortran/core_f2c.vcxproj4
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.vcxproj4
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f2c.vcxproj4
-rw-r--r--scilab/modules/differential_equations/sci_gateway/differential_equations_gw.vcxproj4
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.vcxproj4
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcxproj4
-rw-r--r--scilab/modules/dynamic_link/macros/detectmsvc64tools.sci24
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwConfigureVcx64.sci60
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwConfigureVcx86.sci98
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwFindMsVcCompiler.sci26
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwGet64BitPath.sci38
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwGetSdkPath.sci16
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwGetVc11ExpressPath.sci28
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwGetVc11ProPath.sci29
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwIsVc11Express.sci20
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwIsVc11Pro.sci22
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwSetEnvCommonVc11.sci197
-rw-r--r--scilab/modules/dynamic_link/macros/windows/dlwSetEnvVc11.sci39
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/cpp/dynamic_link_gw.vcxproj6
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj4
-rw-r--r--scilab/modules/elementary_functions/help/en_US/setoperations/intersect.xml3
-rw-r--r--scilab/modules/elementary_functions/help/en_US/setoperations/members.xml146
-rw-r--r--scilab/modules/elementary_functions/help/en_US/setoperations/unique.xml3
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/setoperations/intersect.xml3
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/setoperations/members.xml147
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/setoperations/unique.xml3
-rw-r--r--scilab/modules/elementary_functions/macros/members.sci250
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcxproj6
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.vcxproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f2c.vcxproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcxproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f2c.vcxproj4
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f2c.vcxproj4
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/members.dia.ref307
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/members.tst366
-rw-r--r--scilab/modules/external_objects/external_objects.vcxproj4
-rw-r--r--scilab/modules/fftw/fftw.vcxproj4
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.vcxproj4
-rw-r--r--scilab/modules/fileio/fileio.vcxproj10
-rw-r--r--scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcxproj4
-rw-r--r--scilab/modules/functions/sci_gateway/cpp/functions_gw.vcxproj4
-rw-r--r--scilab/modules/functions/scripts/buildmacros/BuildMacros.vcxproj4
-rw-r--r--scilab/modules/functions/src/c/functions.vcxproj4
-rw-r--r--scilab/modules/functions_manager/functions_manager.vcxproj4
-rw-r--r--scilab/modules/graph/tests/java/graph-JAVA-tests.vcxproj4
-rw-r--r--scilab/modules/graphic_export/graphic_export.vcxproj6
-rw-r--r--scilab/modules/graphic_export/src/jni/Driver.cpp419
-rw-r--r--scilab/modules/graphic_export/src/jni/Driver.hxx158
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.cpp275
-rw-r--r--scilab/modules/graphic_export/src/jni/FileExporter.hxx150
-rw-r--r--scilab/modules/graphic_export/src/jni/JOGLConstant.cpp1401
-rw-r--r--scilab/modules/graphic_export/src/jni/JOGLConstant.hxx290
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.vcxproj4
-rw-r--r--scilab/modules/graphic_objects/Makefile.am3
-rw-r--r--scilab/modules/graphic_objects/Makefile.in14
-rw-r--r--scilab/modules/graphic_objects/includes/ColorComputer.hxx153
-rw-r--r--scilab/modules/graphic_objects/includes/DataLoader.hxx54
-rw-r--r--scilab/modules/graphic_objects/includes/DataProperties.hxx8
-rw-r--r--scilab/modules/graphic_objects/includes/DecompositionUtils.hxx30
-rw-r--r--scilab/modules/graphic_objects/includes/MatPlotDecomposer.hxx7
-rw-r--r--scilab/modules/graphic_objects/includes/Matplot.h99
-rw-r--r--scilab/modules/graphic_objects/includes/NgonGridDataDecomposer.hxx2
-rw-r--r--scilab/modules/graphic_objects/includes/NgonGridMatplotData.hxx111
-rw-r--r--scilab/modules/graphic_objects/includes/NgonGridMatplotDataDecomposer.hxx27
-rw-r--r--scilab/modules/graphic_objects/includes/Texture.hxx61
-rw-r--r--scilab/modules/graphic_objects/includes/graphicObjectProperties.h638
-rw-r--r--scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj7
-rw-r--r--scilab/modules/graphic_objects/src/c/graphic_objects.vcxproj.filters9
-rw-r--r--scilab/modules/graphic_objects/src/cpp/ColorComputer.cpp61
-rw-r--r--scilab/modules/graphic_objects/src/cpp/DataLoader.cpp106
-rw-r--r--scilab/modules/graphic_objects/src/cpp/MatPlotDecomposer.cpp184
-rw-r--r--scilab/modules/graphic_objects/src/cpp/NgonGridDataDecomposer.cpp11
-rw-r--r--scilab/modules/graphic_objects/src/cpp/NgonGridMatplotData.cpp397
-rw-r--r--scilab/modules/graphic_objects/src/cpp/NgonGridMatplotDataDecomposer.cpp459
-rw-r--r--scilab/modules/graphic_objects/src/cpp/Texture.cpp1293
-rw-r--r--scilab/modules/graphic_objects/src/cpp/Triangulator.cpp4
-rw-r--r--scilab/modules/graphic_objects/src/cpp/getGraphicObjectProperty.cpp14
-rw-r--r--scilab/modules/graphic_objects/src/cpp/setGraphicObjectProperty.cpp5
-rw-r--r--scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoader.java31
-rw-r--r--scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/DataLoaderJNI.java7
-rw-r--r--scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/MainDataLoader.java57
-rw-r--r--scilab/modules/graphic_objects/src/java/org/scilab/modules/graphic_objects/graphicObject/GraphicObjectProperties.java638
-rw-r--r--scilab/modules/graphic_objects/src/jni/CallGraphicController.cpp1792
-rw-r--r--scilab/modules/graphic_objects/src/jni/CallGraphicController.hxx256
-rw-r--r--scilab/modules/graphic_objects/src/jni/DataLoader.i17
-rw-r--r--scilab/modules/graphic_objects/src/jni/DataLoader_wrap.c2109
-rw-r--r--scilab/modules/graphic_objects/src/jni/GraphicObjectBuilder.cpp259
-rw-r--r--scilab/modules/graphic_objects/src/jni/GraphicObjectBuilder.hxx150
-rw-r--r--scilab/modules/graphic_objects/src/jni/ScilabNativeView_wrap.c373
-rw-r--r--scilab/modules/graphic_objects/src/nographic_objects/nographic_objects.vcxproj10
-rwxr-xr-xscilab/modules/graphic_objects/src/scripts/genPropertiesName.sh36
-rw-r--r--scilab/modules/graphic_objects/src/scripts/propertiesMap.properties677
-rw-r--r--scilab/modules/graphics/Makefile.am2
-rw-r--r--scilab/modules/graphics/Makefile.in20
-rw-r--r--scilab/modules/graphics/graphics.vcxproj6
-rw-r--r--scilab/modules/graphics/graphics.vcxproj.filters8
-rw-r--r--scilab/modules/graphics/includes/BuildObjects.h2
-rw-r--r--scilab/modules/graphics/includes/GrayPlot.h10
-rw-r--r--scilab/modules/graphics/includes/sciCall.h4
-rw-r--r--scilab/modules/graphics/macros/%h_p.sci5
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_matplot.c230
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_matplot1.c223
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_set.c99
-rw-r--r--scilab/modules/graphics/sci_gateway/cpp/graphics_gw.vcxproj4
-rw-r--r--scilab/modules/graphics/src/c/BuildObjects.c110
-rw-r--r--scilab/modules/graphics/src/c/Gray.c188
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/GetHashTable.c5
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/SetHashTable.c5
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/getHandleProperty.h2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_data_property.c138
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_data_property.h4
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_image_type_property.c76
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_data_property.c316
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_image_type_property.c119
-rw-r--r--scilab/modules/graphics/src/c/sciCall.c30
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.vcxproj4
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj4
-rw-r--r--scilab/modules/gui/src/c/gui.vcxproj6
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java5
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvasImpl.java10
-rw-r--r--scilab/modules/gui/src/jni/CallScilabBridge.cpp3786
-rw-r--r--scilab/modules/gui/src/jni/CallScilabBridge.hxx408
-rw-r--r--scilab/modules/gui/src/jni/Juigetfile.cpp2268
-rw-r--r--scilab/modules/gui/src/jni/Juigetfile.hxx252
-rw-r--r--scilab/modules/gui/src/jni/Jxclick.cpp503
-rw-r--r--scilab/modules/gui/src/jni/Jxclick.hxx166
-rw-r--r--scilab/modules/gui/src/jni/Jxgetmouse.cpp480
-rw-r--r--scilab/modules/gui/src/jni/Jxgetmouse.hxx166
-rw-r--r--scilab/modules/gui/src/jni/LookAndFeelManager.cpp449
-rw-r--r--scilab/modules/gui/src/jni/LookAndFeelManager.hxx166
-rw-r--r--scilab/modules/gui/src/jni/ScilabDisplayTree.cpp290
-rw-r--r--scilab/modules/gui/src/jni/ScilabDisplayTree.hxx152
-rw-r--r--scilab/modules/gui/src/jni/ScilabTermination_wrap.c115
-rw-r--r--scilab/modules/gui/src/jni/SwingView.cpp261
-rw-r--r--scilab/modules/gui/src/jni/SwingView.hxx150
-rw-r--r--scilab/modules/gui/src/jni/UIElementMapper.cpp202
-rw-r--r--scilab/modules/gui/src/jni/UIElementMapper.hxx150
-rw-r--r--scilab/modules/gui/src/nogui/nogui.vcxproj4
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.vcxproj4
-rw-r--r--scilab/modules/helptools/src/BuildChm/BuildChm.vcxproj4
-rw-r--r--scilab/modules/helptools/src/BuildHelp.vcxproj4
-rw-r--r--scilab/modules/helptools/src/CheckHelp/CheckHelp.vcxproj4
-rw-r--r--scilab/modules/helptools/src/c/helptools.vcxproj6
-rw-r--r--scilab/modules/helptools/src/javadoc/javadoc.vcxproj6
-rw-r--r--scilab/modules/helptools/src/jni/BuildDocObject.cpp374
-rw-r--r--scilab/modules/helptools/src/jni/BuildDocObject.hxx158
-rw-r--r--scilab/modules/helptools/src/jni/SciDocMain.cpp515
-rw-r--r--scilab/modules/helptools/src/jni/SciDocMain.hxx170
-rw-r--r--scilab/modules/history_browser/src/c/history_browser.vcxproj6
-rw-r--r--scilab/modules/history_browser/src/jni/CommandHistory.cpp420
-rw-r--r--scilab/modules/history_browser/src/jni/CommandHistory.hxx170
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.vcxproj6
-rw-r--r--scilab/modules/history_manager/sci_gateway/cpp/history_manager_gw.vcxproj4
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.vcxproj4
-rw-r--r--scilab/modules/history_manager/src/jni/HistoryManagement_wrap.c1123
-rw-r--r--scilab/modules/integer/src/c/integer.vcxproj4
-rw-r--r--scilab/modules/integer/src/cpp/integer_gw.vcxproj4
-rw-r--r--scilab/modules/integer/src/fortran/integer_f2c.vcxproj4
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.vcxproj6
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f2c.vcxproj4
-rw-r--r--scilab/modules/io/src/c/io.vcxproj6
-rw-r--r--scilab/modules/io/src/cpp/io_gw.vcxproj4
-rw-r--r--scilab/modules/javasci/Javasci.vcxproj6
-rw-r--r--scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_Scilab.java234
-rw-r--r--scilab/modules/javasci/src/java/org/scilab/modules/javasci/Call_ScilabJNI.java106
-rw-r--r--scilab/modules/javasci/src/java/org/scilab/modules/javasci/Scilab.java46
-rw-r--r--scilab/modules/javasci/src/java/org/scilab/modules/javasci/ScilabVariablesJavasci.java19
-rw-r--r--scilab/modules/javasci/src/jni/call_scilab_wrap.c2722
-rw-r--r--scilab/modules/javasci/tests/java/javasci-JAVA-tests.vcxproj4
-rw-r--r--scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWrite.java1
-rw-r--r--scilab/modules/javasci/tests/java/org/scilab/tests/modules/javasci/testReadWriteBuf.java207
-rw-r--r--scilab/modules/jvm/libjvm.vcxproj4
-rw-r--r--scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj4
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.vcxproj4
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/cpp/linear_algebra_gw.vcxproj4
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.vcxproj4
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f2c.vcxproj4
-rw-r--r--scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj4
-rw-r--r--scilab/modules/localization/src/jni/LocaleToLCID_wrap.c149
-rw-r--r--scilab/modules/localization/src/jni/Messages_wrap.c149
-rw-r--r--scilab/modules/localization/src/jni/setdefaultlanguage_wrap.c166
-rw-r--r--scilab/modules/localization/src/localization.vcxproj4
-rw-r--r--scilab/modules/m2sci/help/en_US/m2sci_equivalents/i/ismember.xml49
-rw-r--r--scilab/modules/m2sci/macros/kernel/not_yet_converted.sci1
-rw-r--r--scilab/modules/matio/matio.vcxproj4
-rw-r--r--scilab/modules/matio/sci_gateway/cpp/matio_gw.vcxproj6
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.vcxproj4
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.vcxproj4
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.vcxproj4
-rw-r--r--scilab/modules/operations/operations.vcxproj4
-rw-r--r--scilab/modules/optimization/src/c/optimization.vcxproj6
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f2c.vcxproj4
-rw-r--r--scilab/modules/output_stream/sci_gateway/cpp/output_stream_gw/output_stream_gw.vcxproj4
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcxproj4
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f2c.vcxproj4
-rw-r--r--scilab/modules/overloading/macros/%hm_i_h.sci12
-rw-r--r--scilab/modules/parallel/src/c/forkWindows.c28
-rw-r--r--scilab/modules/parallel/src/c/parallel.vcxproj6
-rw-r--r--scilab/modules/parameters/parameters.vcxproj4
-rw-r--r--scilab/modules/parse/parse.vcxproj4
-rw-r--r--scilab/modules/polynomials/src/c/polynomials.vcxproj4
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f2c.vcxproj4
-rw-r--r--scilab/modules/preferences/src/c/preferences.vcxproj6
-rw-r--r--scilab/modules/preferences/src/jni/ScilabPreferences.cpp342
-rw-r--r--scilab/modules/preferences/src/jni/ScilabPreferences.hxx154
-rw-r--r--scilab/modules/randlib/src/c/randlib.vcxproj4
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f2c.vcxproj4
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.vcxproj4
-rw-r--r--scilab/modules/renderer/renderer.vcxproj6
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java19
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/FecDrawer.java1
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/ScilabTextureManager.java56
-rw-r--r--scilab/modules/renderer/src/jni/CallRenderer.cpp996
-rw-r--r--scilab/modules/renderer/src/jni/CallRenderer.hxx178
-rw-r--r--scilab/modules/renderer/src/jni/XlFontManager.cpp672
-rw-r--r--scilab/modules/renderer/src/jni/XlFontManager.hxx186
-rw-r--r--scilab/modules/scicos/src/c/cli/scicos-cli.vcxproj6
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.vcxproj4
-rw-r--r--scilab/modules/scicos/src/c/scicos.vcxproj4
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f2c.vcxproj4
-rw-r--r--scilab/modules/scicos/src/modelica_compiler/Modelicac.vcxproj4
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcxproj6
-rw-r--r--scilab/modules/scicos/src/translator/translator.vcxproj4
-rw-r--r--scilab/modules/scicos/src/xml2modelica/xml2modelica.vcxproj4
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.dia.ref84
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.tst13
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.unix.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Bouncing.win.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.dia.ref122
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.tst13
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.unix.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Hydraulics.win.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_ODE.dia.ref11
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_ODE.tst9
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.dia.ref105
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.tst10
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.unix.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_Platform.win.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.dia.ref135
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.tst13
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.unix.dia.ref62
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrK_RLC.win.dia.ref62
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.dia.ref84
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.tst13
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.unix.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Bouncing.win.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.dia.ref122
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.tst13
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.unix.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Hydraulics.win.dia.ref49
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_ODE.dia.ref11
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_ODE.tst9
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.tst7
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.unix.dia.ref (renamed from scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.dia.ref)43
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_Platform.win.dia.ref60
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.dia.ref135
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.tst13
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.unix.dia.ref62
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DDaskrN_RLC.win.dia.ref62
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DoPri.dia.ref3
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/DoPri.tst4
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/ExpRK.dia.ref3
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/ExpRK.tst4
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/ImpRK.dia.ref3
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/ImpRK.tst4
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/LSodar.dia.ref9
-rw-r--r--scilab/modules/scicos/tests/unit_tests/Solvers/LSodar.tst10
-rw-r--r--scilab/modules/scicos_blocks/src/c/cli/scicos_blocks-cli.vcxproj6
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj6
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f2c.vcxproj4
-rw-r--r--scilab/modules/scicos_blocks/src/jni/AfficheBlock.cpp286
-rw-r--r--scilab/modules/scicos_blocks/src/jni/AfficheBlock.hxx152
-rw-r--r--scilab/modules/scinotes/src/c/scinotes.vcxproj6
-rw-r--r--scilab/modules/scinotes/src/jni/SciNotes.cpp494
-rw-r--r--scilab/modules/scinotes/src/jni/SciNotes.hxx164
-rw-r--r--scilab/modules/scinotes/src/jni/ScilabKeywords_wrap.c313
-rw-r--r--scilab/modules/scirenderer/examples/org/scilab/forge/scirenderer/examples/TextureExample.java2
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/g2d/texture/G2DTextureManager.java376
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCanvas.java20
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/JoGLCapacity.java9
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/implementation/jogl/texture/JoGLTextureManager.java530
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/texture/AbstractTextureDataProvider.java12
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/texture/DrawnTextureDataProvider.java34
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/texture/TextureBufferedImage.java26
-rw-r--r--scilab/modules/scirenderer/src/org/scilab/forge/scirenderer/texture/TextureDataProvider.java65
-rw-r--r--scilab/modules/signal_processing/help/en_US/transforms/dct.xml50
-rw-r--r--scilab/modules/signal_processing/help/en_US/transforms/dst.xml36
-rw-r--r--scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj4
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.vcxproj6
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f2c.vcxproj4
-rw-r--r--scilab/modules/sound/sound.vcxproj4
-rw-r--r--scilab/modules/sound/src/nosound/nosound.vcxproj4
-rw-r--r--scilab/modules/sparse/sci_gateway/cpp/sparse_gw.vcxproj4
-rw-r--r--scilab/modules/sparse/src/c/sparse.vcxproj4
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f2c.vcxproj4
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcxproj4
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f2c.vcxproj6
-rw-r--r--scilab/modules/spreadsheet/spreadsheet.vcxproj4
-rw-r--r--scilab/modules/spreadsheet/spreadsheet.vcxproj.filters29
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcxproj4
-rw-r--r--scilab/modules/statistics/sci_gateway/cpp/statistics_gw.vcxproj6
-rw-r--r--scilab/modules/statistics/src/c/statistics.vcxproj6
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f2c.vcxproj4
-rw-r--r--scilab/modules/string/sci_gateway/cpp/string_gw.vcxproj4
-rw-r--r--scilab/modules/string/src/c/string.vcxproj4
-rw-r--r--scilab/modules/string/src/c/string.vcxproj.filters14
-rw-r--r--scilab/modules/symbol/symbol.vcxproj4
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.vcxproj6
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f2c.vcxproj4
-rw-r--r--scilab/modules/system_env/system_env.vcxproj4
-rw-r--r--scilab/modules/tclsci/tclsci.vcxproj4
-rw-r--r--scilab/modules/threads/threads.vcxproj4
-rw-r--r--scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj4
-rw-r--r--scilab/modules/time/time.vcxproj6
-rw-r--r--scilab/modules/types/includes/GetScilabVariable.h3
-rw-r--r--scilab/modules/types/includes/ScilabToJava.hxx123
-rw-r--r--scilab/modules/types/sci_gateway/cpp/types_gw.vcxproj4
-rw-r--r--scilab/modules/types/src/cpp/ScilabToJava.cpp244
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariable.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/GetScilabVariableJNI.java1
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java68
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanReference.java135
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabBooleanSparse.java7
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java143
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabDoubleReference.java210
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java248
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabIntegerReference.java416
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java19
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java19
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabPolynomial.java7
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabSparse.java284
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java7
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java19
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java5
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabTypeUtils.java641
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabVariables.java347
-rw-r--r--scilab/modules/types/src/jni/ScilabVariables.cpp3751
-rw-r--r--scilab/modules/types/src/jni/ScilabVariables.giws.xml2
-rw-r--r--scilab/modules/types/src/jni/ScilabVariables.hxx271
-rw-r--r--scilab/modules/types/src/jni/ScilabVariablesRefresh.cpp310
-rw-r--r--scilab/modules/types/src/jni/ScilabVariablesRefresh.hxx150
-rw-r--r--scilab/modules/types/src/jni/getScilabVariable.i2
-rw-r--r--scilab/modules/types/src/jni/getScilabVariable_wrap.c163
-rw-r--r--scilab/modules/types/tests/java/org/scilab/tests/modules/types/testEquals.java2
-rw-r--r--scilab/modules/types/tests/java/types-JAVA-tests.vcxproj4
-rw-r--r--scilab/modules/types/types.vcxproj4
-rw-r--r--scilab/modules/types/typesjni/typesjni.vcxproj221
-rw-r--r--scilab/modules/types/typesjni/typesjni.vcxproj.filters48
-rw-r--r--scilab/modules/types/typesmacro/typesmacro.vcxproj4
-rw-r--r--scilab/modules/ui_data/src/c/ui_data.vcxproj4
-rw-r--r--scilab/modules/ui_data/src/jni/BrowseVar.cpp605
-rw-r--r--scilab/modules/ui_data/src/jni/BrowseVar.hxx164
-rw-r--r--scilab/modules/ui_data/src/jni/EditVar.cpp3023
-rw-r--r--scilab/modules/ui_data/src/jni/EditVar.hxx264
-rw-r--r--scilab/modules/ui_data/src/jni/FileBrowser.cpp257
-rw-r--r--scilab/modules/ui_data/src/jni/FileBrowser.hxx150
-rw-r--r--scilab/modules/ui_data/src/jni/ui_data_wrap.c231
-rw-r--r--scilab/modules/ui_data/src/noui_data/noui_data.vcxproj6
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.vcxproj6
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.vcxproj4
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.vcxproj4
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.vcxproj4
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcxproj4
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.vcxproj4
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcxproj4
-rw-r--r--scilab/modules/xcos/examples/solvers/Rootfinding.sce10
-rw-r--r--scilab/modules/xcos/examples/solvers/RootfindingSimple.sce10
-rw-r--r--scilab/modules/xcos/examples/solvers/benchBasic.sce9
-rw-r--r--scilab/modules/xcos/examples/solvers/benchKalman.sce15
-rw-r--r--scilab/modules/xcos/examples/solvers/benchSine.sce (renamed from scilab/modules/xcos/examples/solvers/benchSinus.sce)5
-rw-r--r--scilab/modules/xcos/examples/solvers/integCVode.sce2
-rw-r--r--scilab/modules/xcos/examples/solvers/integDoPri.sce2
-rw-r--r--scilab/modules/xcos/examples/solvers/integImpRK.sce4
-rw-r--r--scilab/modules/xcos/examples/solvers/integLSodar.sce2
-rw-r--r--scilab/modules/xcos/examples/solvers/integRK.sce2
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Events_pal/VirtualCLK0.xml12
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Lookuptables_pal/INTRPLBLK_f.xml14
-rw-r--r--scilab/modules/xcos/help/en_US/solvers/8-Rootfinding.xml14
-rw-r--r--scilab/modules/xcos/help/en_US/solvers/9-Comparisons.xml98
-rw-r--r--scilab/modules/xcos/help/fr_FR/solvers/8-Racines.xml14
-rw-r--r--scilab/modules/xcos/help/fr_FR/solvers/9-Comparaisons.xml2
-rw-r--r--scilab/modules/xcos/src/c/xcos.vcxproj6
-rw-r--r--scilab/modules/xcos/src/jni/Modelica.cpp240
-rw-r--r--scilab/modules/xcos/src/jni/Modelica.hxx150
-rw-r--r--scilab/modules/xcos/src/jni/Palette.cpp770
-rw-r--r--scilab/modules/xcos/src/jni/Palette.hxx174
-rw-r--r--scilab/modules/xcos/src/jni/Xcos.cpp695
-rw-r--r--scilab/modules/xcos/src/jni/Xcos.hxx180
-rw-r--r--scilab/modules/xcos/tests/java/xcos-JAVA-tests.vcxproj4
-rw-r--r--scilab/modules/xml/xml.vcxproj4
-rw-r--r--scilab/tools/Dumpexts/Dumpexts.vcxproj4
-rw-r--r--scilab/tools/Dumpexts/winDumpExts.c776
-rw-r--r--scilab/tools/SetupAtlas/SetupAtlas.vcxproj4
-rw-r--r--scilab/tools/localization/generatePoFile.vcxproj4
440 files changed, 34825 insertions, 25472 deletions
diff --git a/SEP/INDEX b/SEP/INDEX
index b717ef1..337538a 100644
--- a/SEP/INDEX
+++ b/SEP/INDEX
@@ -97,3 +97,4 @@ SEP #098: New output argument for qp_solve function
97SEP #099: Matrices of strings as input argument for clear 97SEP #099: Matrices of strings as input argument for clear
98SEP #100: Extends history size 98SEP #100: Extends history size
99SEP #101: File browser 99SEP #101: File browser
100SEP #102: members function.
diff --git a/SEP/SEP_102_members.odt b/SEP/SEP_102_members.odt
new file mode 100644
index 0000000..c4db1fb
--- /dev/null
+++ b/SEP/SEP_102_members.odt
Binary files differ
diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 850553f..5f5ac97 100644
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -38,7 +38,8 @@ BDF methods with direct and preconditioned Krylov linear solvers, from ODEPACK.
38 38
39* In browsevar, allows a user to plot the variable (already available in 39* In browsevar, allows a user to plot the variable (already available in
40 editvar). 40 editvar).
41 41
42* Update Windows Solution to Visual Studio 2012.
42 43
43Syntax changes 44Syntax changes
44=============== 45===============
@@ -502,6 +503,9 @@ Bug fixes
502 503
503* Bug #12703 fixed - In SciNotes, common shortcuts 'SHIFT DELETE', 'SHIFT INSERT' (and others) added. 504* Bug #12703 fixed - In SciNotes, common shortcuts 'SHIFT DELETE', 'SHIFT INSERT' (and others) added.
504 505
506* Bug #12705 fixed - Function members() added. It allows to find number of occurrences and linear indexes
507 for common values between two matrices of the same type.
508
505* Bug #12706 fixed - A wrong size matrix as input argument of cross function was not detected. 509* Bug #12706 fixed - A wrong size matrix as input argument of cross function was not detected.
506 510
507* Bug #12708 fixed - Incorrect display in SciNotes preferences fixed (onmouseover styles). 511* Bug #12708 fixed - Incorrect display in SciNotes preferences fixed (onmouseover styles).
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index 45b86d9..0c77819 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 11.00 1Microsoft Visual Studio Solution File, Format Version 12.00
2# Visual Studio 2010 2# Visual Studio 2012
3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}" 3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
4 ProjectSection(ProjectDependencies) = postProject 4 ProjectSection(ProjectDependencies) = postProject
5 {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409} 5 {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409}
@@ -50,7 +50,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\
50 {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8} 50 {96248E56-C84A-4803-9F50-25E2089AB6B8} = {96248E56-C84A-4803-9F50-25E2089AB6B8}
51 {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA} 51 {BC462A57-C5B3-4F93-8067-80363827DCDA} = {BC462A57-C5B3-4F93-8067-80363827DCDA}
52 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} 52 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
53 {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A} = {C4C3EA58-1C27-4EFB-A5BF-0DB24EC5F87A}
54 {273B1F5C-C137-46D1-B516-FFE5764FABE5} = {273B1F5C-C137-46D1-B516-FFE5764FABE5} 53 {273B1F5C-C137-46D1-B516-FFE5764FABE5} = {273B1F5C-C137-46D1-B516-FFE5764FABE5}
55 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} 54 {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
56 {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD} 55 {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
@@ -58,13 +57,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\
58 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9} 57 {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
59 {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} 58 {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
60 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} 59 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
61 {0BB16C71-0FCD-4FB9-B7C0-F2601330C980} = {0BB16C71-0FCD-4FB9-B7C0-F2601330C980}
62 {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA} 60 {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
63 {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} = {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} 61 {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604} = {6A6A6F76-CCC0-40C4-8AEE-8A010F49A604}
64 {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA} 62 {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
65 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E} 63 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
66 {C352587B-F5E4-457C-80EE-A1AEAB176C8E} = {C352587B-F5E4-457C-80EE-A1AEAB176C8E}
67 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
68 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} 64 {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895} = {D2B63E7D-1E66-4EFC-892E-FA6DAF4E5895}
69 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503} 65 {982BF37F-42C4-4D37-8D14-60521B141503} = {982BF37F-42C4-4D37-8D14-60521B141503}
70 {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163} 66 {EAB6C580-22B3-4359-BA1D-DD7499A96163} = {EAB6C580-22B3-4359-BA1D-DD7499A96163}
@@ -74,10 +70,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "modules\core\src\c\
74 {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8} 70 {A2207388-FB55-46B2-A24D-D76C0FE796F8} = {A2207388-FB55-46B2-A24D-D76C0FE796F8}
75 {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} 71 {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF} = {AB1EEB8F-86F7-45B7-8CEC-B18C8E97EEFF}
76 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238} 72 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
77 {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
78 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393} 73 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
79 {1D219098-007C-4F76-9AE6-271ABBB7D393} = {1D219098-007C-4F76-9AE6-271ABBB7D393}
80 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
81 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3} 74 {EAF0949C-28D2-497C-954F-FC13B32FF2F3} = {EAF0949C-28D2-497C-954F-FC13B32FF2F3}
82 {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} = {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} 75 {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76} = {B7A168A0-DFC0-4C6D-B0CC-6079912A4A76}
83 {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E} 76 {620D8FA7-3704-438E-BB1E-391C84401A2E} = {620D8FA7-3704-438E-BB1E-391C84401A2E}
@@ -600,6 +593,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos-cli", "modules\scico
600EndProject 593EndProject
601Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}" 594Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scicos_blocks-cli", "modules\scicos_blocks\src\c\cli\scicos_blocks-cli.vcxproj", "{424A5578-BA28-435F-8313-8D85886A3539}"
602EndProject 595EndProject
596Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "giws-all", "Visual-Studio-settings\giws-all\giws-all.vcxproj", "{88E95224-A931-4B3E-AC6C-5A40B3961421}"
597EndProject
598Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "typesjni", "modules\types\typesjni\typesjni.vcxproj", "{FC2F9DEC-EF14-401B-A0A9-CCD88552A359}"
599EndProject
603Global 600Global
604 GlobalSection(SolutionConfigurationPlatforms) = preSolution 601 GlobalSection(SolutionConfigurationPlatforms) = preSolution
605 Debug|Win32 = Debug|Win32 602 Debug|Win32 = Debug|Win32
@@ -1856,6 +1853,18 @@ Global
1856 {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32 1853 {424A5578-BA28-435F-8313-8D85886A3539}.Release|Win32.Build.0 = Release|Win32
1857 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64 1854 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.ActiveCfg = Release|x64
1858 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64 1855 {424A5578-BA28-435F-8313-8D85886A3539}.Release|x64.Build.0 = Release|x64
1856 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|Win32.ActiveCfg = Debug|Win32
1857 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Debug|x64.ActiveCfg = Debug|x64
1858 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|Win32.ActiveCfg = Release|Win32
1859 {88E95224-A931-4B3E-AC6C-5A40B3961421}.Release|x64.ActiveCfg = Release|x64
1860 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|Win32.ActiveCfg = Debug|Win32
1861 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|Win32.Build.0 = Debug|Win32
1862 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|x64.ActiveCfg = Debug|x64
1863 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Debug|x64.Build.0 = Debug|x64
1864 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|Win32.ActiveCfg = Release|Win32
1865 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|Win32.Build.0 = Release|Win32
1866 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|x64.ActiveCfg = Release|x64
1867 {FC2F9DEC-EF14-401B-A0A9-CCD88552A359}.Release|x64.Build.0 = Release|x64
1859 EndGlobalSection 1868 EndGlobalSection
1860 GlobalSection(SolutionProperties) = preSolution 1869 GlobalSection(SolutionProperties) = preSolution
1861 HideSolutionNode = FALSE 1870 HideSolutionNode = FALSE
diff --git a/scilab/Scilab_f2c.sln b/scilab/Scilab_f2c.sln
index abe9371..8f576ed 100644
--- a/scilab/Scilab_f2c.sln
+++ b/scilab/Scilab_f2c.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 11.00 1Microsoft Visual Studio Solution File, Format Version 12.00
2# Visual Studio 2010 2# Visual Studio 2012
3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}" 3Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WScilex", "modules\windows_tools\src\c\WScilex\WScilex.vcxproj", "{CCD80549-EB9C-42AA-9B86-D687377E94F6}"
4 ProjectSection(ProjectDependencies) = postProject 4 ProjectSection(ProjectDependencies) = postProject
5 {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409} 5 {A9A2020D-5541-44F2-B080-DF3C9426C409} = {A9A2020D-5541-44F2-B080-DF3C9426C409}
@@ -1860,4 +1860,7 @@ Global
1860 GlobalSection(SolutionProperties) = preSolution 1860 GlobalSection(SolutionProperties) = preSolution
1861 HideSolutionNode = FALSE 1861 HideSolutionNode = FALSE
1862 EndGlobalSection 1862 EndGlobalSection
1863 GlobalSection(Performance) = preSolution
1864 HasPerformanceSessions = true
1865 EndGlobalSection
1863EndGlobal 1866EndGlobal
diff --git a/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj b/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
index 543737e..69544f5 100644
--- a/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
+++ b/scilab/Visual-Studio-settings/ant-all/ant-all.vcxproj
@@ -31,24 +31,28 @@
31 <UseDebugLibraries>true</UseDebugLibraries> 31 <UseDebugLibraries>true</UseDebugLibraries>
32 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 32 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
33 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 33 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
34 <PlatformToolset>v110</PlatformToolset>
34 </PropertyGroup> 35 </PropertyGroup>
35 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
36 <ConfigurationType>Makefile</ConfigurationType> 37 <ConfigurationType>Makefile</ConfigurationType>
37 <UseDebugLibraries>true</UseDebugLibraries> 38 <UseDebugLibraries>true</UseDebugLibraries>
38 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 39 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
39 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 40 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
41 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 42 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 43 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
42 <ConfigurationType>Makefile</ConfigurationType> 44 <ConfigurationType>Makefile</ConfigurationType>
43 <UseDebugLibraries>false</UseDebugLibraries> 45 <UseDebugLibraries>false</UseDebugLibraries>
44 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 46 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
45 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 47 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
48 <PlatformToolset>v110</PlatformToolset>
46 </PropertyGroup> 49 </PropertyGroup>
47 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 50 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48 <ConfigurationType>Makefile</ConfigurationType> 51 <ConfigurationType>Makefile</ConfigurationType>
49 <UseDebugLibraries>false</UseDebugLibraries> 52 <UseDebugLibraries>false</UseDebugLibraries>
50 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 53 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
51 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 54 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
55 <PlatformToolset>v110</PlatformToolset>
52 </PropertyGroup> 56 </PropertyGroup>
53 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 57 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
54 <ImportGroup Label="ExtensionSettings"> 58 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/Visual-Studio-settings/giws-all/giws-all.vcxproj b/scilab/Visual-Studio-settings/giws-all/giws-all.vcxproj
index 78a946d..db31ee5 100644
--- a/scilab/Visual-Studio-settings/giws-all/giws-all.vcxproj
+++ b/scilab/Visual-Studio-settings/giws-all/giws-all.vcxproj
@@ -26,18 +26,22 @@
26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 <ConfigurationType>Makefile</ConfigurationType> 27 <ConfigurationType>Makefile</ConfigurationType>
28 <UseDebugLibraries>true</UseDebugLibraries> 28 <UseDebugLibraries>true</UseDebugLibraries>
29 <PlatformToolset>v110</PlatformToolset>
29 </PropertyGroup> 30 </PropertyGroup>
30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 31 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
31 <ConfigurationType>Makefile</ConfigurationType> 32 <ConfigurationType>Makefile</ConfigurationType>
32 <UseDebugLibraries>true</UseDebugLibraries> 33 <UseDebugLibraries>true</UseDebugLibraries>
34 <PlatformToolset>v110</PlatformToolset>
33 </PropertyGroup> 35 </PropertyGroup>
34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35 <ConfigurationType>Makefile</ConfigurationType> 37 <ConfigurationType>Makefile</ConfigurationType>
36 <UseDebugLibraries>false</UseDebugLibraries> 38 <UseDebugLibraries>false</UseDebugLibraries>
39 <PlatformToolset>v110</PlatformToolset>
37 </PropertyGroup> 40 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
39 <ConfigurationType>Makefile</ConfigurationType> 42 <ConfigurationType>Makefile</ConfigurationType>
40 <UseDebugLibraries>false</UseDebugLibraries> 43 <UseDebugLibraries>false</UseDebugLibraries>
44 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 45 </PropertyGroup>
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43 <ImportGroup Label="ExtensionSettings"> 47 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj b/scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj
index 48c4e85..6cc9a5b 100644
--- a/scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj
+++ b/scilab/Visual-Studio-settings/rename-vc-files/rename-vc-files.vcxproj
@@ -27,21 +27,25 @@
27 <ConfigurationType>Utility</ConfigurationType> 27 <ConfigurationType>Utility</ConfigurationType>
28 <UseOfMfc>false</UseOfMfc> 28 <UseOfMfc>false</UseOfMfc>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <PlatformToolset>v110</PlatformToolset>
30 </PropertyGroup> 31 </PropertyGroup>
31 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
32 <ConfigurationType>Utility</ConfigurationType> 33 <ConfigurationType>Utility</ConfigurationType>
33 <UseOfMfc>false</UseOfMfc> 34 <UseOfMfc>false</UseOfMfc>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>Utility</ConfigurationType> 39 <ConfigurationType>Utility</ConfigurationType>
38 <UseOfMfc>false</UseOfMfc> 40 <UseOfMfc>false</UseOfMfc>
39 <CharacterSet>MultiByte</CharacterSet> 41 <CharacterSet>MultiByte</CharacterSet>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>Utility</ConfigurationType> 45 <ConfigurationType>Utility</ConfigurationType>
43 <UseOfMfc>false</UseOfMfc> 46 <UseOfMfc>false</UseOfMfc>
44 <CharacterSet>MultiByte</CharacterSet> 47 <CharacterSet>MultiByte</CharacterSet>
48 <PlatformToolset>v110</PlatformToolset>
45 </PropertyGroup> 49 </PropertyGroup>
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <ImportGroup Label="ExtensionSettings"> 51 <ImportGroup Label="ExtensionSettings">
@@ -78,7 +82,7 @@
78 </HeaderFileName> 82 </HeaderFileName>
79 </Midl> 83 </Midl>
80 <PostBuildEvent> 84 <PostBuildEvent>
81 </PostBuildEvent> 85 </PostBuildEvent>
82 </ItemDefinitionGroup> 86 </ItemDefinitionGroup>
83 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 87 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
84 <Midl> 88 <Midl>
@@ -88,7 +92,7 @@
88 </HeaderFileName> 92 </HeaderFileName>
89 </Midl> 93 </Midl>
90 <PostBuildEvent> 94 <PostBuildEvent>
91 </PostBuildEvent> 95 </PostBuildEvent>
92 </ItemDefinitionGroup> 96 </ItemDefinitionGroup>
93 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 97 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
94 <Midl> 98 <Midl>
@@ -97,7 +101,7 @@
97 </HeaderFileName> 101 </HeaderFileName>
98 </Midl> 102 </Midl>
99 <PostBuildEvent> 103 <PostBuildEvent>
100 </PostBuildEvent> 104 </PostBuildEvent>
101 </ItemDefinitionGroup> 105 </ItemDefinitionGroup>
102 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 106 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
103 <Midl> 107 <Midl>
@@ -107,7 +111,7 @@
107 </HeaderFileName> 111 </HeaderFileName>
108 </Midl> 112 </Midl>
109 <PostBuildEvent> 113 <PostBuildEvent>
110 </PostBuildEvent> 114 </PostBuildEvent>
111 </ItemDefinitionGroup> 115 </ItemDefinitionGroup>
112 <ItemGroup> 116 <ItemGroup>
113 <rename_vc_extension_files Include="..\..\etc\logging.properties.vc" /> 117 <rename_vc_extension_files Include="..\..\etc\logging.properties.vc" />
diff --git a/scilab/Visual-Studio-settings/swig-all/swig-all.vcxproj b/scilab/Visual-Studio-settings/swig-all/swig-all.vcxproj
index b3d3d4e..aa17b9e 100644
--- a/scilab/Visual-Studio-settings/swig-all/swig-all.vcxproj
+++ b/scilab/Visual-Studio-settings/swig-all/swig-all.vcxproj
@@ -28,24 +28,28 @@
28 <UseDebugLibraries>true</UseDebugLibraries> 28 <UseDebugLibraries>true</UseDebugLibraries>
29 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 29 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
30 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 30 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33 <ConfigurationType>Makefile</ConfigurationType> 34 <ConfigurationType>Makefile</ConfigurationType>
34 <UseDebugLibraries>true</UseDebugLibraries> 35 <UseDebugLibraries>true</UseDebugLibraries>
35 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 36 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
36 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 37 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
38 <PlatformToolset>v110</PlatformToolset>
37 </PropertyGroup> 39 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 40 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
39 <ConfigurationType>Makefile</ConfigurationType> 41 <ConfigurationType>Makefile</ConfigurationType>
40 <UseDebugLibraries>false</UseDebugLibraries> 42 <UseDebugLibraries>false</UseDebugLibraries>
41 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 43 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
42 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 44 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
45 <PlatformToolset>v110</PlatformToolset>
43 </PropertyGroup> 46 </PropertyGroup>
44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 47 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
45 <ConfigurationType>Makefile</ConfigurationType> 48 <ConfigurationType>Makefile</ConfigurationType>
46 <UseDebugLibraries>false</UseDebugLibraries> 49 <UseDebugLibraries>false</UseDebugLibraries>
47 <OutDir>$(ProjectDir)$(Configuration)\</OutDir> 50 <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
48 <IntDir>$(ProjectDir)$(Configuration)\</IntDir> 51 <IntDir>$(ProjectDir)$(Configuration)\</IntDir>
52 <PlatformToolset>v110</PlatformToolset>
49 </PropertyGroup> 53 </PropertyGroup>
50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 54 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
51 <ImportGroup Label="ExtensionSettings"> 55 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/Visual-Studio-settings/test-all/test-all.vcxproj b/scilab/Visual-Studio-settings/test-all/test-all.vcxproj
index 19f07ea..56b3f08 100644
--- a/scilab/Visual-Studio-settings/test-all/test-all.vcxproj
+++ b/scilab/Visual-Studio-settings/test-all/test-all.vcxproj
@@ -26,18 +26,22 @@
26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 <ConfigurationType>Makefile</ConfigurationType> 27 <ConfigurationType>Makefile</ConfigurationType>
28 <UseDebugLibraries>true</UseDebugLibraries> 28 <UseDebugLibraries>true</UseDebugLibraries>
29 <PlatformToolset>v110</PlatformToolset>
29 </PropertyGroup> 30 </PropertyGroup>
30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 31 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
31 <ConfigurationType>Makefile</ConfigurationType> 32 <ConfigurationType>Makefile</ConfigurationType>
32 <UseDebugLibraries>true</UseDebugLibraries> 33 <UseDebugLibraries>true</UseDebugLibraries>
34 <PlatformToolset>v110</PlatformToolset>
33 </PropertyGroup> 35 </PropertyGroup>
34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35 <ConfigurationType>Makefile</ConfigurationType> 37 <ConfigurationType>Makefile</ConfigurationType>
36 <UseDebugLibraries>false</UseDebugLibraries> 38 <UseDebugLibraries>false</UseDebugLibraries>
39 <PlatformToolset>v110</PlatformToolset>
37 </PropertyGroup> 40 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
39 <ConfigurationType>Makefile</ConfigurationType> 42 <ConfigurationType>Makefile</ConfigurationType>
40 <UseDebugLibraries>false</UseDebugLibraries> 43 <UseDebugLibraries>false</UseDebugLibraries>
44 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 45 </PropertyGroup>
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43 <ImportGroup Label="ExtensionSettings"> 47 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/Visual-Studio-settings/test-level/test-level.vcxproj b/scilab/Visual-Studio-settings/test-level/test-level.vcxproj
index 0b9fff5..d257319 100644
--- a/scilab/Visual-Studio-settings/test-level/test-level.vcxproj
+++ b/scilab/Visual-Studio-settings/test-level/test-level.vcxproj
@@ -26,18 +26,22 @@
26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 <ConfigurationType>Makefile</ConfigurationType> 27 <ConfigurationType>Makefile</ConfigurationType>
28 <UseDebugLibraries>true</UseDebugLibraries> 28 <UseDebugLibraries>true</UseDebugLibraries>
29 <PlatformToolset>v110</PlatformToolset>
29 </PropertyGroup> 30 </PropertyGroup>
30 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 31 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
31 <ConfigurationType>Makefile</ConfigurationType> 32 <ConfigurationType>Makefile</ConfigurationType>
32 <UseDebugLibraries>true</UseDebugLibraries> 33 <UseDebugLibraries>true</UseDebugLibraries>
34 <PlatformToolset>v110</PlatformToolset>
33 </PropertyGroup> 35 </PropertyGroup>
34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35 <ConfigurationType>Makefile</ConfigurationType> 37 <ConfigurationType>Makefile</ConfigurationType>
36 <UseDebugLibraries>false</UseDebugLibraries> 38 <UseDebugLibraries>false</UseDebugLibraries>
39 <PlatformToolset>v110</PlatformToolset>
37 </PropertyGroup> 40 </PropertyGroup>
38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
39 <ConfigurationType>Makefile</ConfigurationType> 42 <ConfigurationType>Makefile</ConfigurationType>
40 <UseDebugLibraries>false</UseDebugLibraries> 43 <UseDebugLibraries>false</UseDebugLibraries>
44 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 45 </PropertyGroup>
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
43 <ImportGroup Label="ExtensionSettings"> 47 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj b/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
index 21cdea4..8f8dbf3 100644
--- a/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
+++ b/scilab/libs/GetWindowsVersion/GetWindowsVersion.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj b/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
index 25d2dd0..7c76aa0 100644
--- a/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
+++ b/scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcxproj b/scilab/modules/action_binding/src/c/action_binding.vcxproj
index f5dabdf..36fe751 100644
--- a/scilab/modules/action_binding/src/c/action_binding.vcxproj
+++ b/scilab/modules/action_binding/src/c/action_binding.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c b/scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c
index 4fec0eb..26ecc96 100644
--- a/scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c
+++ b/scilab/modules/action_binding/src/jni/InterpreterManagement_wrap.c
@@ -1,11 +1,11 @@
1/* ---------------------------------------------------------------------------- 1/* ----------------------------------------------------------------------------
2 * This file was automatically generated by SWIG (http://www.swig.org). 2 * This file was automatically generated by SWIG (http://www.swig.org).
3 * Version 2.0.4 3 * Version 2.0.7
4 * 4 *
5 * This file is not intended to be easily readable and contains a number of 5 * This file is not intended to be easily readable and contains a number of
6 * coding conventions designed to improve portability and efficiency. Do not make 6 * coding conventions designed to improve portability and efficiency. Do not make
7 * changes to this file unless you know what you are doing--modify the SWIG 7 * changes to this file unless you know what you are doing--modify the SWIG
8 * interface file instead. 8 * interface file instead.
9 * ----------------------------------------------------------------------------- */ 9 * ----------------------------------------------------------------------------- */
10 10
11#define SWIGJAVA 11#define SWIGJAVA
@@ -41,28 +41,28 @@
41#ifndef SWIGUNUSED 41#ifndef SWIGUNUSED
42# if defined(__GNUC__) 42# if defined(__GNUC__)
43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) 43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
44# define SWIGUNUSED __attribute__ ((__unused__)) 44# define SWIGUNUSED __attribute__ ((__unused__))
45# else 45# else
46# define SWIGUNUSED 46# define SWIGUNUSED
47# endif 47# endif
48# elif defined(__ICC) 48# elif defined(__ICC)
49# define SWIGUNUSED __attribute__ ((__unused__)) 49# define SWIGUNUSED __attribute__ ((__unused__))
50# else 50# else
51# define SWIGUNUSED 51# define SWIGUNUSED
52# endif 52# endif
53#endif 53#endif
54 54
55#ifndef SWIG_MSC_UNSUPPRESS_4505 55#ifndef SWIG_MSC_UNSUPPRESS_4505
56# if defined(_MSC_VER) 56# if defined(_MSC_VER)
57# pragma warning(disable : 4505) /* unreferenced local function has been removed */ 57# pragma warning(disable : 4505) /* unreferenced local function has been removed */
58# endif 58# endif
59#endif 59#endif
60 60
61#ifndef SWIGUNUSEDPARM 61#ifndef SWIGUNUSEDPARM
62# ifdef __cplusplus 62# ifdef __cplusplus
63# define SWIGUNUSEDPARM(p) 63# define SWIGUNUSEDPARM(p)
64# else 64# else
65# define SWIGUNUSEDPARM(p) p SWIGUNUSED 65# define SWIGUNUSEDPARM(p) p SWIGUNUSED
66# endif 66# endif
67#endif 67#endif
68 68
@@ -105,7 +105,7 @@
105# define SWIGSTDCALL __stdcall 105# define SWIGSTDCALL __stdcall
106# else 106# else
107# define SWIGSTDCALL 107# define SWIGSTDCALL
108# endif 108# endif
109#endif 109#endif
110 110
111/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ 111/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,7 +122,7 @@
122 122
123/* Fix for jlong on some versions of gcc on Windows */ 123/* Fix for jlong on some versions of gcc on Windows */
124#if defined(__GNUC__) && !defined(__INTEL_COMPILER) 124#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
125typedef long long __int64; 125 typedef long long __int64;
126#endif 126#endif
127 127
128/* Fix for jlong on 64-bit x86 Solaris */ 128/* Fix for jlong on 64-bit x86 Solaris */
@@ -138,55 +138,47 @@ typedef long long __int64;
138 138
139 139
140/* Support for throwing Java exceptions */ 140/* Support for throwing Java exceptions */
141typedef enum 141typedef enum {
142{ 142 SWIG_JavaOutOfMemoryError = 1,
143 SWIG_JavaOutOfMemoryError = 1, 143 SWIG_JavaIOException,
144 SWIG_JavaIOException, 144 SWIG_JavaRuntimeException,
145 SWIG_JavaRuntimeException, 145 SWIG_JavaIndexOutOfBoundsException,
146 SWIG_JavaIndexOutOfBoundsException, 146 SWIG_JavaArithmeticException,
147 SWIG_JavaArithmeticException, 147 SWIG_JavaIllegalArgumentException,
148 SWIG_JavaIllegalArgumentException, 148 SWIG_JavaNullPointerException,
149 SWIG_JavaNullPointerException, 149 SWIG_JavaDirectorPureVirtual,
150 SWIG_JavaDirectorPureVirtual, 150 SWIG_JavaUnknownError
151 SWIG_JavaUnknownError
152} SWIG_JavaExceptionCodes; 151} SWIG_JavaExceptionCodes;
153 152
154typedef struct 153typedef struct {
155{ 154 SWIG_JavaExceptionCodes code;
156 SWIG_JavaExceptionCodes code; 155 const char *java_exception;
157 const char *java_exception;
158} SWIG_JavaExceptions_t; 156} SWIG_JavaExceptions_t;
159 157
160 158
161static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) 159static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
162{ 160 jclass excep;
163 jclass excep; 161 static const SWIG_JavaExceptions_t java_exceptions[] = {
164 static const SWIG_JavaExceptions_t java_exceptions[] = 162 { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
165 { 163 { SWIG_JavaIOException, "java/io/IOException" },
166 { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, 164 { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
167 { SWIG_JavaIOException, "java/io/IOException" }, 165 { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
168 { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, 166 { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
169 { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, 167 { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
170 { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, 168 { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
171 { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, 169 { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
172 { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, 170 { SWIG_JavaUnknownError, "java/lang/UnknownError" },
173 { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" }, 171 { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" }
174 { SWIG_JavaUnknownError, "java/lang/UnknownError" }, 172 };
175 { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } 173 const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
176 }; 174
177 const SWIG_JavaExceptions_t *except_ptr = java_exceptions; 175 while (except_ptr->code != code && except_ptr->code)
178 176 except_ptr++;
179 while (except_ptr->code != code && except_ptr->code) 177
180 { 178 (*jenv)->ExceptionClear(jenv);
181 except_ptr++; 179 excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
182 } 180 if (excep)
183 181 (*jenv)->ThrowNew(jenv, excep, msg);
184 (*jenv)->ExceptionClear(jenv);
185 excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
186 if (excep)
187 {
188 (*jenv)->ThrowNew(jenv, excep, msg);
189 }
190} 182}
191 183
192 184
@@ -202,71 +194,54 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
202extern "C" { 194extern "C" {
203#endif 195#endif
204 196
205 SWIGEXPORT jint JNICALL Java_org_scilab_modules_action_1binding_InterpreterManagementJNI_putCommandInScilabQueue(JNIEnv *jenv, jclass jcls, jstring jarg1) 197SWIGEXPORT jint JNICALL Java_org_scilab_modules_action_1binding_InterpreterManagementJNI_putCommandInScilabQueue(JNIEnv *jenv, jclass jcls, jstring jarg1) {
206 { 198 jint jresult = 0 ;
207 jint jresult = 0 ; 199 char *arg1 = (char *) 0 ;
208 char *arg1 = (char *) 0 ; 200 int result;
209 int result; 201
210 202 (void)jenv;
211 (void)jenv; 203 (void)jcls;
212 (void)jcls; 204 arg1 = 0;
213 arg1 = 0; 205 if (jarg1) {
214 if (jarg1) 206 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
215 { 207 if (!arg1) return 0;
216 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0); 208 }
217 if (!arg1) 209 result = (int)putCommandInScilabQueue(arg1);
218 { 210 jresult = (jint)result;
219 return 0; 211 if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
220 } 212 return jresult;
221 } 213}
222 result = (int)putCommandInScilabQueue(arg1); 214
223 jresult = (jint)result; 215
224 if (arg1) 216SWIGEXPORT jint JNICALL Java_org_scilab_modules_action_1binding_InterpreterManagementJNI_requestScilabExec(JNIEnv *jenv, jclass jcls, jstring jarg1) {
225 { 217 jint jresult = 0 ;
226 (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1); 218 char *arg1 = (char *) 0 ;
227 } 219 int result;
228 return jresult; 220
229 } 221 (void)jenv;
230 222 (void)jcls;
231 223 arg1 = 0;
232 SWIGEXPORT jint JNICALL Java_org_scilab_modules_action_1binding_InterpreterManagementJNI_requestScilabExec(JNIEnv *jenv, jclass jcls, jstring jarg1) 224 if (jarg1) {
233 { 225 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
234 jint jresult = 0 ; 226 if (!arg1) return 0;
235 char *arg1 = (char *) 0 ; 227 }
236 int result; 228 result = (int)requestScilabExec(arg1);
237 229 jresult = (jint)result;
238 (void)jenv; 230 if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
239 (void)jcls; 231 return jresult;
240 arg1 = 0; 232}
241 if (jarg1) 233
242 { 234
243 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0); 235SWIGEXPORT jint JNICALL Java_org_scilab_modules_action_1binding_InterpreterManagementJNI_interruptScilab(JNIEnv *jenv, jclass jcls) {
244 if (!arg1) 236 jint jresult = 0 ;
245 { 237 int result;
246 return 0; 238
247 } 239 (void)jenv;
248 } 240 (void)jcls;
249 result = (int)requestScilabExec(arg1); 241 result = (int)interruptScilab();
250 jresult = (jint)result; 242 jresult = (jint)result;
251 if (arg1) 243 return jresult;
252 { 244}
253 (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
254 }
255 return jresult;
256 }
257
258
259 SWIGEXPORT jint JNICALL Java_org_scilab_modules_action_1binding_InterpreterManagementJNI_interruptScilab(JNIEnv *jenv, jclass jcls)
260 {
261 jint jresult = 0 ;
262 int result;
263
264 (void)jenv;
265 (void)jcls;
266 result = (int)interruptScilab();
267 jresult = (jint)result;
268 return jresult;
269 }
270 245
271 246
272#ifdef __cplusplus 247#ifdef __cplusplus
diff --git a/scilab/modules/action_binding/src/jni/Signal.cpp b/scilab/modules/action_binding/src/jni/Signal.cpp
index 1c2c457..65f5cb9 100644
--- a/scilab/modules/action_binding/src/jni/Signal.cpp
+++ b/scilab/modules/action_binding/src/jni/Signal.cpp
@@ -1,6 +1,6 @@
1#include "Signal.hxx" 1#include "Signal.hxx"
2/* Generated by GIWS (version 2.0.1) with command: 2/* Generated by GIWS (version 2.0.1) with command:
3giws --disable-return-size-array --output-dir src/jni/ --throws-exception-on-error --description-file src/jni/Signal.giws.xml 3giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\action_binding\src\jni\ --throws-exception-on-error --description-file Signal.giws.xml
4*/ 4*/
5/* 5/*
6 6
@@ -10,16 +10,16 @@ This software is a computer program whose purpose is to hide the complexity
10of accessing Java objects/methods from C++ code. 10of accessing Java objects/methods from C++ code.
11 11
12This software is governed by the CeCILL-B license under French law and 12This software is governed by the CeCILL-B license under French law and
13abiding by the rules of distribution of free software. You can use, 13abiding by the rules of distribution of free software. You can use,
14modify and/ or redistribute the software under the terms of the CeCILL-B 14modify and/ or redistribute the software under the terms of the CeCILL-B
15license as circulated by CEA, CNRS and INRIA at the following URL 15license as circulated by CEA, CNRS and INRIA at the following URL
16"http://www.cecill.info". 16"http://www.cecill.info".
17 17
18As a counterpart to the access to the source code and rights to copy, 18As a counterpart to the access to the source code and rights to copy,
19modify and redistribute granted by the license, users are provided only 19modify and redistribute granted by the license, users are provided only
20with a limited warranty and the software's author, the holder of the 20with a limited warranty and the software's author, the holder of the
21economic rights, and the successive licensors have only limited 21economic rights, and the successive licensors have only limited
22liability. 22liability.
23 23
24In this respect, the user's attention is drawn to the risks associated 24In this respect, the user's attention is drawn to the risks associated
25with loading, using, modifying and/or developing or reproducing the 25with loading, using, modifying and/or developing or reproducing the
@@ -28,169 +28,149 @@ that may mean that it is complicated to manipulate, and that also
28therefore means that it is reserved for developers and experienced 28therefore means that it is reserved for developers and experienced
29professionals having in-depth computer knowledge. Users are therefore 29professionals having in-depth computer knowledge. Users are therefore
30encouraged to load and test the software's suitability as regards their 30encouraged to load and test the software's suitability as regards their
31requirements in conditions enabling the security of their systems and/or 31requirements in conditions enabling the security of their systems and/or
32data to be ensured and, more generally, to use and operate it in the 32data to be ensured and, more generally, to use and operate it in the
33same conditions as regards security. 33same conditions as regards security.
34 34
35The fact that you are presently reading this means that you have had 35The fact that you are presently reading this means that you have had
36knowledge of the CeCILL-B license and that you accept its terms. 36knowledge of the CeCILL-B license and that you accept its terms.
37*/ 37*/
38 38
39namespace org_scilab_modules_action_binding_utils 39namespace org_scilab_modules_action_binding_utils {
40{
41
42// Static declarations (if any)
43 40
41 // Static declarations (if any)
42
44// Returns the current env 43// Returns the current env
45 44
46JNIEnv * Signal::getCurrentEnv() 45JNIEnv * Signal::getCurrentEnv() {
47{ 46JNIEnv * curEnv = NULL;
48 JNIEnv * curEnv = NULL; 47jint res=this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
49 jint res = this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL); 48if (res != JNI_OK) {
50 if (res != JNI_OK) 49throw GiwsException::JniException(getCurrentEnv());
51 { 50}
52 throw GiwsException::JniException(getCurrentEnv()); 51return curEnv;
53 }
54 return curEnv;
55} 52}
56// Destructor 53// Destructor
57 54
58Signal::~Signal() 55Signal::~Signal() {
59{ 56JNIEnv * curEnv = NULL;
60 JNIEnv * curEnv = NULL; 57this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
61 this->jvm->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
62 58
63 curEnv->DeleteGlobalRef(this->instance); 59curEnv->DeleteGlobalRef(this->instance);
64 curEnv->DeleteGlobalRef(this->instanceClass); 60curEnv->DeleteGlobalRef(this->instanceClass);
65} 61}
66// Constructors 62// Constructors
67Signal::Signal(JavaVM * jvm_) 63Signal::Signal(JavaVM * jvm_) {
68{ 64jmethodID constructObject = NULL ;
69 jmethodID constructObject = NULL ; 65jobject localInstance ;
70 jobject localInstance ; 66jclass localClass ;
71 jclass localClass ;
72 67
73 const std::string construct = "<init>"; 68const std::string construct="<init>";
74 const std::string param = "()V"; 69const std::string param="()V";
75 jvm = jvm_; 70jvm=jvm_;
76 71
77 JNIEnv * curEnv = getCurrentEnv(); 72JNIEnv * curEnv = getCurrentEnv();
78 73
79 localClass = curEnv->FindClass( this->className().c_str() ) ; 74localClass = curEnv->FindClass( this->className().c_str() ) ;
80 if (localClass == NULL) 75if (localClass == NULL) {
81 { 76 throw GiwsException::JniClassNotFoundException(curEnv, this->className());
82 throw GiwsException::JniClassNotFoundException(curEnv, this->className()); 77}
83 }
84
85 this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
86 78
87 /* localClass is not needed anymore */ 79this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
88 curEnv->DeleteLocalRef(localClass);
89 80
90 if (this->instanceClass == NULL) 81/* localClass is not needed anymore */
91 { 82curEnv->DeleteLocalRef(localClass);
92 throw GiwsException::JniObjectCreationException(curEnv, this->className());
93 }
94 83
84if (this->instanceClass == NULL) {
85throw GiwsException::JniObjectCreationException(curEnv, this->className());
86}
95 87
96 constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
97 if (constructObject == NULL)
98 {
99 throw GiwsException::JniObjectCreationException(curEnv, this->className());
100 }
101 88
102 localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ; 89constructObject = curEnv->GetMethodID( this->instanceClass, construct.c_str() , param.c_str() ) ;
103 if (localInstance == NULL) 90if(constructObject == NULL){
104 { 91throw GiwsException::JniObjectCreationException(curEnv, this->className());
105 throw GiwsException::JniObjectCreationException(curEnv, this->className()); 92}
106 }
107 93
108 this->instance = curEnv->NewGlobalRef(localInstance) ; 94localInstance = curEnv->NewObject( this->instanceClass, constructObject ) ;
109 if (this->instance == NULL) 95if(localInstance == NULL){
110 { 96throw GiwsException::JniObjectCreationException(curEnv, this->className());
111 throw GiwsException::JniObjectCreationException(curEnv, this->className()); 97}
112 } 98
113 /* localInstance not needed anymore */ 99this->instance = curEnv->NewGlobalRef(localInstance) ;
114 curEnv->DeleteLocalRef(localInstance); 100if(this->instance == NULL){
101throw GiwsException::JniObjectCreationException(curEnv, this->className());
102}
103/* localInstance not needed anymore */
104curEnv->DeleteLocalRef(localInstance);
115 105
116 /* Methods ID set to NULL */ 106 /* Methods ID set to NULL */
117 voidnotifyjstringjava_lang_StringID = NULL; 107voidnotifyjstringjava_lang_StringID=NULL;
118 108
119 109
120} 110}
121 111
122Signal::Signal(JavaVM * jvm_, jobject JObj) 112Signal::Signal(JavaVM * jvm_, jobject JObj) {
123{ 113 jvm=jvm_;
124 jvm = jvm_;
125 114
126 JNIEnv * curEnv = getCurrentEnv(); 115 JNIEnv * curEnv = getCurrentEnv();
127 116
128 jclass localClass = curEnv->GetObjectClass(JObj); 117jclass localClass = curEnv->GetObjectClass(JObj);
129 this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass)); 118 this->instanceClass = static_cast<jclass>(curEnv->NewGlobalRef(localClass));
130 curEnv->DeleteLocalRef(localClass); 119 curEnv->DeleteLocalRef(localClass);
131 120
132 if (this->instanceClass == NULL) 121 if (this->instanceClass == NULL) {
133 { 122throw GiwsException::JniObjectCreationException(curEnv, this->className());
134 throw GiwsException::JniObjectCreationException(curEnv, this->className()); 123 }
135 }
136 124
137 this->instance = curEnv->NewGlobalRef(JObj) ; 125 this->instance = curEnv->NewGlobalRef(JObj) ;
138 if (this->instance == NULL) 126 if(this->instance == NULL){
139 { 127throw GiwsException::JniObjectCreationException(curEnv, this->className());
140 throw GiwsException::JniObjectCreationException(curEnv, this->className()); 128 }
141 } 129 /* Methods ID set to NULL */
142 /* Methods ID set to NULL */ 130 voidnotifyjstringjava_lang_StringID=NULL;
143 voidnotifyjstringjava_lang_StringID = NULL;
144 131
145 132
146} 133}
147 134
148// Generic methods 135// Generic methods
149 136
150void Signal::synchronize() 137void Signal::synchronize() {
151{ 138if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) {
152 if (getCurrentEnv()->MonitorEnter(instance) != JNI_OK) 139throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal");
153 { 140}
154 throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal");
155 }
156} 141}
157 142
158void Signal::endSynchronize() 143void Signal::endSynchronize() {
159{ 144if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) {
160 if ( getCurrentEnv()->MonitorExit(instance) != JNI_OK) 145throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal");
161 { 146}
162 throw GiwsException::JniMonitorException(getCurrentEnv(), "Signal");
163 }
164} 147}
165// Method(s) 148// Method(s)
166 149
167void Signal::notify (JavaVM * jvm_, char const* ID) 150void Signal::notify (JavaVM * jvm_, char const* ID){
151
152JNIEnv * curEnv = NULL;
153jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL);
154jclass cls = curEnv->FindClass( className().c_str() );
155
156jmethodID voidnotifyjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "notify", "(Ljava/lang/String;)V" ) ;
157if (voidnotifyjstringjava_lang_StringID == NULL) {
158throw GiwsException::JniMethodNotFoundException(curEnv, "notify");
159}
160
161jstring ID_ = curEnv->NewStringUTF( ID );
162if (ID != NULL && ID_ == NULL)
168{ 163{
164throw GiwsException::JniBadAllocException(curEnv);
165}
166
169 167
170 JNIEnv * curEnv = NULL; 168 curEnv->CallStaticVoidMethod(cls, voidnotifyjstringjava_lang_StringID ,ID_);
171 jvm_->AttachCurrentThread(reinterpret_cast<void **>(&curEnv), NULL); 169 curEnv->DeleteLocalRef(ID_);
172 jclass cls = curEnv->FindClass( className().c_str() ); 170curEnv->DeleteLocalRef(cls);
173 171if (curEnv->ExceptionCheck()) {
174 jmethodID voidnotifyjstringjava_lang_StringID = curEnv->GetStaticMethodID(cls, "notify", "(Ljava/lang/String;)V" ) ; 172throw GiwsException::JniCallMethodException(curEnv);
175 if (voidnotifyjstringjava_lang_StringID == NULL) 173}
176 {
177 throw GiwsException::JniMethodNotFoundException(curEnv, "notify");
178 }
179
180 jstring ID_ = curEnv->NewStringUTF( ID );
181 if (ID != NULL && ID_ == NULL)
182 {
183 throw GiwsException::JniBadAllocException(curEnv);
184 }
185
186
187 curEnv->CallStaticVoidMethod(cls, voidnotifyjstringjava_lang_StringID , ID_);
188 curEnv->DeleteLocalRef(ID_);
189 curEnv->DeleteLocalRef(cls);
190 if (curEnv->ExceptionCheck())
191 {
192 throw GiwsException::JniCallMethodException(curEnv);
193 }
194} 174}
195 175
196} 176}
diff --git a/scilab/modules/action_binding/src/jni/Signal.hxx b/scilab/modules/action_binding/src/jni/Signal.hxx
index 24aa9cc..9b71be8 100644
--- a/scilab/modules/action_binding/src/jni/Signal.hxx
+++ b/scilab/modules/action_binding/src/jni/Signal.hxx
@@ -1,5 +1,5 @@
1/* Generated by GIWS (version 2.0.1) with command: 1/* Generated by GIWS (version 2.0.1) with command:
2giws --disable-return-size-array --output-dir src/jni/ --throws-exception-on-error --description-file src/jni/Signal.giws.xml 2giws --disable-return-size-array --output-dir D:\git\debug\similan\scilab\modules\action_binding\src\jni\ --throws-exception-on-error --description-file Signal.giws.xml
3*/ 3*/
4/* 4/*
5 5
@@ -9,16 +9,16 @@ This software is a computer program whose purpose is to hide the complexity
9of accessing Java objects/methods from C++ code. 9of accessing Java objects/methods from C++ code.
10 10
11This software is governed by the CeCILL-B license under French law and 11This software is governed by the CeCILL-B license under French law and
12abiding by the rules of distribution of free software. You can use, 12abiding by the rules of distribution of free software. You can use,
13modify and/ or redistribute the software under the terms of the CeCILL-B 13modify and/ or redistribute the software under the terms of the CeCILL-B
14license as circulated by CEA, CNRS and INRIA at the following URL 14license as circulated by CEA, CNRS and INRIA at the following URL
15"http://www.cecill.info". 15"http://www.cecill.info".
16 16
17As a counterpart to the access to the source code and rights to copy, 17As a counterpart to the access to the source code and rights to copy,
18modify and redistribute granted by the license, users are provided only 18modify and redistribute granted by the license, users are provided only
19with a limited warranty and the software's author, the holder of the 19with a limited warranty and the software's author, the holder of the
20economic rights, and the successive licensors have only limited 20economic rights, and the successive licensors have only limited
21liability. 21liability.
22 22
23In this respect, the user's attention is drawn to the risks associated 23In this respect, the user's attention is drawn to the risks associated
24with loading, using, modifying and/or developing or reproducing the 24with loading, using, modifying and/or developing or reproducing the
@@ -27,9 +27,9 @@ that may mean that it is complicated to manipulate, and that also
27therefore means that it is reserved for developers and experienced 27therefore means that it is reserved for developers and experienced
28professionals having in-depth computer knowledge. Users are therefore 28professionals having in-depth computer knowledge. Users are therefore
29encouraged to load and test the software's suitability as regards their 29encouraged to load and test the software's suitability as regards their
30requirements in conditions enabling the security of their systems and/or 30requirements in conditions enabling the security of their systems and/or
31data to be ensured and, more generally, to use and operate it in the 31data to be ensured and, more generally, to use and operate it in the
32same conditions as regards security. 32same conditions as regards security.
33 33
34The fact that you are presently reading this means that you have had 34The fact that you are presently reading this means that you have had
35knowledge of the CeCILL-B license and that you accept its terms. 35knowledge of the CeCILL-B license and that you accept its terms.
@@ -46,11 +46,11 @@ knowledge of the CeCILL-B license and that you accept its terms.
46 46
47#include "GiwsException.hxx" 47#include "GiwsException.hxx"
48 48
49#if defined(_MSC_VER) /* Defined anyway with Visual */ 49 #if defined(_MSC_VER) /* Defined anyway with Visual */
50#include <Windows.h> 50 #include <Windows.h>
51#else 51 #else
52typedef signed char byte; 52 typedef signed char byte;
53#endif 53 #endif
54 54
55 55
56#ifndef GIWSEXPORT 56#ifndef GIWSEXPORT
@@ -69,88 +69,86 @@ typedef signed char byte;
69# endif 69# endif
70#endif 70#endif
71 71
72namespace org_scilab_modules_action_binding_utils 72namespace org_scilab_modules_action_binding_utils {
73{ 73class GIWSEXPORT Signal {
74class GIWSEXPORT Signal
75{
76 74
77private: 75private:
78 JavaVM * jvm; 76JavaVM * jvm;
79 77
80protected: 78protected:
81 jmethodID voidnotifyjstringjava_lang_StringID; // cache method id 79jmethodID voidnotifyjstringjava_lang_StringID; // cache method id
82
83 80
84 81
85 jobject instance;
86 jclass instanceClass; // cache class
87 82
83jobject instance;
84jclass instanceClass; // cache class
88 85
89 // Caching (if any) 86
87// Caching (if any)
90 88
91 89
92 /** 90/**
93 * Get the environment matching to the current thread. 91* Get the environment matching to the current thread.
94 */ 92*/
95 virtual JNIEnv * getCurrentEnv(); 93virtual JNIEnv * getCurrentEnv();
96 94
97public: 95public:
98 // Constructor 96// Constructor
99 /** 97/**
100 * Create a wrapping of the object from a JNIEnv. 98* Create a wrapping of the object from a JNIEnv.
101 * It will call the default constructor 99* It will call the default constructor
102 * @param JEnv_ the Java Env 100* @param JEnv_ the Java Env
103 */ 101*/
104 Signal(JavaVM * jvm_); 102Signal(JavaVM * jvm_);
105
106 /**
107 * Create a wrapping of an already existing object from a JNIEnv.
108 * The object must have already been instantiated
109 * @param JEnv_ the Java Env
110 * @param JObj the object
111 */
112 Signal(JavaVM * jvm_, jobject JObj);
113
114
115 /**
116 * This is a fake constructor to avoid the constructor
117 * chaining when dealing with extended giws classes
118 */
119#ifdef FAKEGIWSDATATYPE
120 Signal(fakeGiwsDataType::fakeGiwsDataType /* unused */) {}
121#endif
122
123 // Destructor
124 ~Signal();
125
126 // Generic method
127 // Synchronization methods
128 /**
129 * Enter monitor associated with the object.
130 * Equivalent of creating a "synchronized(obj)" scope in Java.
131 */
132 void synchronize();
133 103
134 /** 104/**
135 * Exit monitor associated with the object. 105* Create a wrapping of an already existing object from a JNIEnv.
136 * Equivalent of ending a "synchronized(obj)" scope. 106* The object must have already been instantiated
137 */ 107* @param JEnv_ the Java Env
138 void endSynchronize(); 108* @param JObj the object
109*/
110Signal(JavaVM * jvm_, jobject JObj);
139 111
140 // Methods
141 static void notify(JavaVM * jvm_, char const* ID);
142 112
113/**
114* This is a fake constructor to avoid the constructor
115* chaining when dealing with extended giws classes
116*/
117#ifdef FAKEGIWSDATATYPE
118Signal(fakeGiwsDataType::fakeGiwsDataType /* unused */) {}
119#endif
143 120
144 /** 121// Destructor
145 * Get class name to use for static methods 122~Signal();
146 * @return class name to use for static methods
147 */
148 123
149 static const std::string className() 124// Generic method
150 { 125// Synchronization methods
151 return "org/scilab/modules/action_binding/utils/Signal"; 126/**
152 } 127* Enter monitor associated with the object.
128* Equivalent of creating a "synchronized(obj)" scope in Java.
129*/
130void synchronize();
153 131
132/**
133* Exit monitor associated with the object.
134* Equivalent of ending a "synchronized(obj)" scope.
135*/
136void endSynchronize();
137
138// Methods
139static void notify(JavaVM * jvm_, char const* ID);
140
141
142 /**
143 * Get class name to use for static methods
144 * @return class name to use for static methods
145 */
146
147 static const std::string className()
148 {
149 return "org/scilab/modules/action_binding/utils/Signal";
150 }
151
154}; 152};
155 153
156 154
diff --git a/scilab/modules/api_scilab/api_scilab.vcxproj b/scilab/modules/api_scilab/api_scilab.vcxproj
index 251db12..bf2d093 100644
--- a/scilab/modules/api_scilab/api_scilab.vcxproj
+++ b/scilab/modules/api_scilab/api_scilab.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/api_scilab/includes/returnProperty.h b/scilab/modules/api_scilab/includes/returnProperty.h
index b0e5767..0629dc1 100644
--- a/scilab/modules/api_scilab/includes/returnProperty.h
+++ b/scilab/modules/api_scilab/includes/returnProperty.h
@@ -119,6 +119,68 @@ extern "C" {
119 */ 119 */
120 void* sciReturnUserData(const int * userData, int userDataSize ) ; 120 void* sciReturnUserData(const int * userData, int userDataSize ) ;
121 121
122 /**
123 * copy a matrix stored has a double hypermatrix
124 * into a Scilab matrix in the stack in order to see it the console.
125 * @return 0 if the function was executed correctly, -1 if an error occurred.
126 */
127 void* sciReturnHypermatOfDouble(int dims[], int ndims, double values[]);
128
129 /**
130 * copy a matrix stored has a int8 hypermatrix
131 * into a Scilab matrix in the stack in order to see it the console.
132 * @return 0 if the function was executed correctly, -1 if an error occurred.
133 */
134 void* sciReturnHypermatOfInteger8(int dims[], int ndims, char values[]);
135
136 /**
137 * copy a matrix stored has a uint8 hypermatrix
138 * into a Scilab matrix in the stack in order to see it the console.
139 * @return 0 if the function was executed correctly, -1 if an error occurred.
140 */
141 void* sciReturnHypermatOfUnsignedInteger8(int dims[], int ndims, unsigned char values[]);
142
143 /**
144 * copy a matrix stored has a int8 array
145 * into a Scilab matrix in the stack in order to see it the console.
146 * @return 0 if the function was executed correctly, -1 if an error occurred.
147 */
148 void* sciReturnMatrixOfInteger8(char values[], int nbRow, int nbCol);
149
150 /**
151 * copy a matrix stored has a uint8 array
152 * into a Scilab matrix in the stack in order to see it the console.
153 * @return 0 if the function was executed correctly, -1 if an error occurred.
154 */
155 void* sciReturnMatrixOfUnsignedInteger8(unsigned char values[], int nbRow, int nbCol);
156
157 /**
158 * copy a matrix stored has a int16 array
159 * into a Scilab matrix in the stack in order to see it the console.
160 * @return 0 if the function was executed correctly, -1 if an error occurred.
161 */
162 void* sciReturnMatrixOfInteger16(short values[], int nbRow, int nbCol);
163
164 /**
165 * copy a matrix stored has a uint16 array
166 * into a Scilab matrix in the stack in order to see it the console.
167 * @return 0 if the function was executed correctly, -1 if an error occurred.
168 */
169 void* sciReturnMatrixOfUnsignedInteger16(unsigned short values[], int nbRow, int nbCol);
170
171 /**
172 * copy a matrix stored has a int32 array
173 * into a Scilab matrix in the stack in order to see it the console.
174 * @return 0 if the function was executed correctly, -1 if an error occurred.
175 */
176 void* sciReturnMatrixOfInteger32(int values[], int nbRow, int nbCol);
177
178 /**
179 * copy a matrix stored has a uint32 array
180 * into a Scilab matrix in the stack in order to see it the console.
181 * @return 0 if the function was executed correctly, -1 if an error occurred.
182 */
183 void* sciReturnMatrixOfUnsignedInteger32(unsigned int values[], int nbRow, int nbCol);
122#ifdef __cplusplus 184#ifdef __cplusplus
123} 185}
124#endif 186#endif
diff --git a/scilab/modules/api_scilab/src/cpp/returnProperty.cpp b/scilab/modules/api_scilab/src/cpp/returnProperty.cpp
index b277936..21493d2 100644
--- a/scilab/modules/api_scilab/src/cpp/returnProperty.cpp
+++ b/scilab/modules/api_scilab/src/cpp/returnProperty.cpp
@@ -219,3 +219,111 @@ void* sciReturnUserData(const int * userData, int userDataSize)
219 } 219 }
220} 220}
221/*--------------------------------------------------------------------------*/ 221/*--------------------------------------------------------------------------*/
222void* sciReturnHypermatOfDouble(int dims[], int ndims, double values[])
223{
224 //SciErr sciErr = createHypermatOfDouble(_pvCtx, nbInputArgument(_pvCtx) + 1, dims, ndims, values);
225 //if (sciErr.iErr)
226 //{
227 // printError(&sciErr, 0);
228 // return 1;
229 //}
230
231 return 0;
232}
233/*--------------------------------------------------------------------------*/
234void* sciReturnHypermatOfInteger8(int dims[], int ndims, char values[])
235{
236 //SciErr sciErr = createHypermatOfInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, dims, ndims, values);
237 //if (sciErr.iErr)
238 //{
239 // printError(&sciErr, 0);
240 // return 1;
241 //}
242
243 return 0;
244}
245/*--------------------------------------------------------------------------*/
246void* sciReturnHypermatOfUnsignedInteger8(int dims[], int ndims, unsigned char values[])
247{
248 //SciErr sciErr = createHypermatOfUnsignedInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, dims, ndims, values);
249 //if (sciErr.iErr)
250 //{
251 // printError(&sciErr, 0);
252 // return 1;
253 //}
254
255 return 0;
256}
257/*--------------------------------------------------------------------------*/
258void* sciReturnMatrixOfInteger8(char values[], int nbRow, int nbCol)
259{
260 //SciErr sciErr = createMatrixOfInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
261 //if (sciErr.iErr)
262 //{
263 // printError(&sciErr, 0);
264 // return 1;
265 //}
266
267 return 0;
268}
269/*--------------------------------------------------------------------------*/
270void* sciReturnMatrixOfUnsignedInteger8(unsigned char values[], int nbRow, int nbCol)
271{
272 //SciErr sciErr = createMatrixOfUnsignedInteger8(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
273 //if (sciErr.iErr)
274 //{
275 // printError(&sciErr, 0);
276 // return 1;
277 //}
278
279 return 0;
280}
281/*--------------------------------------------------------------------------*/
282void* sciReturnMatrixOfInteger16(short values[], int nbRow, int nbCol)
283{
284 //SciErr sciErr = createMatrixOfInteger16(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
285 //if (sciErr.iErr)
286 //{
287 // printError(&sciErr, 0);
288 // return 1;
289 //}
290
291 return 0;
292}
293/*--------------------------------------------------------------------------*/
294void* sciReturnMatrixOfUnsignedInteger16(unsigned short values[], int nbRow, int nbCol)
295{
296 //SciErr sciErr = createMatrixOfUnsignedInteger16(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
297 //if (sciErr.iErr)
298 //{
299 // printError(&sciErr, 0);
300 // return 1;
301 //}
302
303 return 0;
304}
305/*--------------------------------------------------------------------------*/
306void* sciReturnMatrixOfInteger32(int values[], int nbRow, int nbCol)
307{
308 //SciErr sciErr = createMatrixOfInteger32(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
309 //if (sciErr.iErr)
310 //{
311 // printError(&sciErr, 0);
312 // return 1;
313 //}
314
315 return 0;
316}
317/*--------------------------------------------------------------------------*/
318void* sciReturnMatrixOfUnsignedInteger32(unsigned int values[], int nbRow, int nbCol)
319{
320 //SciErr sciErr = createMatrixOfUnsignedInteger32(_pvCtx, nbInputArgument(_pvCtx) + 1, nbRow, nbCol, values);
321 //if (sciErr.iErr)
322 //{
323 // printError(&sciErr, 0);
324 // return 1;
325 //}
326
327 return 0;
328}
329/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/arnoldi/arnoldi.vcxproj b/scilab/modules/arnoldi/arnoldi.vcxproj
index 768348f..b83baaf 100644
--- a/scilab/modules/arnoldi/arnoldi.vcxproj
+++ b/scilab/modules/arnoldi/arnoldi.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/ast/ast-tools/ast-tools.vcxproj b/scilab/modules/ast/ast-tools/ast-tools.vcxproj
index bbc669d..ef4bcf8 100644
--- a/scilab/modules/ast/ast-tools/ast-tools.vcxproj
+++ b/scilab/modules/ast/ast-tools/ast-tools.vcxproj
@@ -29,19 +29,23 @@
29 <ConfigurationType>DynamicLibrary</ConfigurationType> 29 <ConfigurationType>DynamicLibrary</ConfigurationType>
30 <CharacterSet>Unicode</CharacterSet> 30 <CharacterSet>Unicode</CharacterSet>
31 <WholeProgramOptimization>true</WholeProgramOptimization> 31 <WholeProgramOptimization>true</WholeProgramOptimization>
32 <PlatformToolset>v110</PlatformToolset>
32 </PropertyGroup> 33 </PropertyGroup>
33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34 <ConfigurationType>DynamicLibrary</ConfigurationType> 35 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <CharacterSet>Unicode</CharacterSet> 36 <CharacterSet>Unicode</CharacterSet>
37 <PlatformToolset>v110</PlatformToolset>
36 </PropertyGroup> 38 </PropertyGroup>
37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 39 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
38 <ConfigurationType>DynamicLibrary</ConfigurationType> 40 <ConfigurationType>DynamicLibrary</ConfigurationType>
39 <CharacterSet>Unicode</CharacterSet> 41 <CharacterSet>Unicode</CharacterSet>
40 <WholeProgramOptimization>true</WholeProgramOptimization> 42 <WholeProgramOptimization>true</WholeProgramOptimization>
43 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 44 </PropertyGroup>
42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 45 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43 <ConfigurationType>DynamicLibrary</ConfigurationType> 46 <ConfigurationType>DynamicLibrary</ConfigurationType>
44 <CharacterSet>Unicode</CharacterSet> 47 <CharacterSet>Unicode</CharacterSet>
48 <PlatformToolset>v110</PlatformToolset>
45 </PropertyGroup> 49 </PropertyGroup>
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <ImportGroup Label="ExtensionSettings"> 51 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/ast/ast.vcxproj b/scilab/modules/ast/ast.vcxproj
index 1528db2..c4ebf0f 100644
--- a/scilab/modules/ast/ast.vcxproj
+++ b/scilab/modules/ast/ast.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>Unicode</CharacterSet> 29 <CharacterSet>Unicode</CharacterSet>
30 <WholeProgramOptimization>true</WholeProgramOptimization> 30 <WholeProgramOptimization>true</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>Unicode</CharacterSet> 35 <CharacterSet>Unicode</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>Unicode</CharacterSet> 40 <CharacterSet>Unicode</CharacterSet>
39 <WholeProgramOptimization>true</WholeProgramOptimization> 41 <WholeProgramOptimization>true</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>Unicode</CharacterSet> 46 <CharacterSet>Unicode</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/boolean/src/c/boolean.vcxproj b/scilab/modules/boolean/src/c/boolean.vcxproj
index cf68c7e..61b65ad 100644
--- a/scilab/modules/boolean/src/c/boolean.vcxproj
+++ b/scilab/modules/boolean/src/c/boolean.vcxproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup Label="ProjectConfigurations"> 3 <ItemGroup Label="ProjectConfigurations">
4 <ProjectConfiguration Include="Debug|Win32"> 4 <ProjectConfiguration Include="Debug|Win32">
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/boolean/src/cpp/boolean_gw.vcxproj b/scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
index 6e3617f..c7f7de2 100644
--- a/scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
+++ b/scilab/modules/boolean/src/cpp/boolean_gw.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>Unicode</CharacterSet> 29 <CharacterSet>Unicode</CharacterSet>
30 <WholeProgramOptimization>true</WholeProgramOptimization> 30 <WholeProgramOptimization>true</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>Unicode</CharacterSet> 35 <CharacterSet>Unicode</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>Unicode</CharacterSet> 40 <CharacterSet>Unicode</CharacterSet>
39 <WholeProgramOptimization>true</WholeProgramOptimization> 41 <WholeProgramOptimization>true</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>Unicode</CharacterSet> 46 <CharacterSet>Unicode</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj b/scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
index 63a6f73..503cc3f 100644
--- a/scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
+++ b/scilab/modules/boolean/src/fortran/boolean_f2c.vcxproj
@@ -29,19 +29,23 @@
29 <ConfigurationType>DynamicLibrary</ConfigurationType> 29 <ConfigurationType>DynamicLibrary</ConfigurationType>
30 <CharacterSet>Unicode</CharacterSet> 30 <CharacterSet>Unicode</CharacterSet>
31 <WholeProgramOptimization>true</WholeProgramOptimization> 31 <WholeProgramOptimization>true</WholeProgramOptimization>
32 <PlatformToolset>v110</PlatformToolset>
32 </PropertyGroup> 33 </PropertyGroup>
33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34 <ConfigurationType>DynamicLibrary</ConfigurationType> 35 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <CharacterSet>Unicode</CharacterSet> 36 <CharacterSet>Unicode</CharacterSet>
37 <PlatformToolset>v110</PlatformToolset>
36 </PropertyGroup> 38 </PropertyGroup>
37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 39 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
38 <ConfigurationType>DynamicLibrary</ConfigurationType> 40 <ConfigurationType>DynamicLibrary</ConfigurationType>
39 <CharacterSet>Unicode</CharacterSet> 41 <CharacterSet>Unicode</CharacterSet>
40 <WholeProgramOptimization>true</WholeProgramOptimization> 42 <WholeProgramOptimization>true</WholeProgramOptimization>
43 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 44 </PropertyGroup>
42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 45 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43 <ConfigurationType>DynamicLibrary</ConfigurationType> 46 <ConfigurationType>DynamicLibrary</ConfigurationType>
44 <CharacterSet>Unicode</CharacterSet> 47 <CharacterSet>Unicode</CharacterSet>
48 <PlatformToolset>v110</PlatformToolset>
45 </PropertyGroup> 49 </PropertyGroup>
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <ImportGroup Label="ExtensionSettings"> 51 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/cacsd/src/c/cacsd.vcxproj b/scilab/modules/cacsd/src/c/cacsd.vcxproj
index 849fc2d..656c9f9 100644
--- a/scilab/modules/cacsd/src/c/cacsd.vcxproj
+++ b/scilab/modules/cacsd/src/c/cacsd.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj b/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj
index a1be1ce..5e9cdaf 100644
--- a/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj
+++ b/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcxproj
@@ -29,19 +29,23 @@
29 <ConfigurationType>DynamicLibrary</ConfigurationType> 29 <ConfigurationType>DynamicLibrary</ConfigurationType>
30 <CharacterSet>Unicode</CharacterSet> 30 <CharacterSet>Unicode</CharacterSet>
31 <WholeProgramOptimization>true</WholeProgramOptimization> 31 <WholeProgramOptimization>true</WholeProgramOptimization>
32 <PlatformToolset>v110</PlatformToolset>
32 </PropertyGroup> 33 </PropertyGroup>
33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34 <ConfigurationType>DynamicLibrary</ConfigurationType> 35 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <CharacterSet>Unicode</CharacterSet> 36 <CharacterSet>Unicode</CharacterSet>
37 <PlatformToolset>v110</PlatformToolset>
36 </PropertyGroup> 38 </PropertyGroup>
37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 39 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
38 <ConfigurationType>DynamicLibrary</ConfigurationType> 40 <ConfigurationType>DynamicLibrary</ConfigurationType>
39 <CharacterSet>Unicode</CharacterSet> 41 <CharacterSet>Unicode</CharacterSet>
40 <WholeProgramOptimization>true</WholeProgramOptimization> 42 <WholeProgramOptimization>true</WholeProgramOptimization>
43 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 44 </PropertyGroup>
42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 45 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43 <ConfigurationType>DynamicLibrary</ConfigurationType> 46 <ConfigurationType>DynamicLibrary</ConfigurationType>
44 <CharacterSet>Unicode</CharacterSet> 47 <CharacterSet>Unicode</CharacterSet>
48 <PlatformToolset>v110</PlatformToolset>
45 </PropertyGroup> 49 </PropertyGroup>
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <ImportGroup Label="ExtensionSettings"> 51 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj
index 3c0da89..bb25b4f 100644
--- a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj
+++ b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcxproj
@@ -29,19 +29,23 @@
29 <ConfigurationType>DynamicLibrary</ConfigurationType> 29 <ConfigurationType>DynamicLibrary</ConfigurationType>
30 <CharacterSet>Unicode</CharacterSet> 30 <CharacterSet>Unicode</CharacterSet>
31 <WholeProgramOptimization>true</WholeProgramOptimization> 31 <WholeProgramOptimization>true</WholeProgramOptimization>
32 <PlatformToolset>v110</PlatformToolset>
32 </PropertyGroup> 33 </PropertyGroup>
33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34 <ConfigurationType>DynamicLibrary</ConfigurationType> 35 <ConfigurationType>DynamicLibrary</ConfigurationType>
35 <CharacterSet>Unicode</CharacterSet> 36 <CharacterSet>Unicode</CharacterSet>
37 <PlatformToolset>v110</PlatformToolset>
36 </PropertyGroup> 38 </PropertyGroup>
37 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 39 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
38 <ConfigurationType>DynamicLibrary</ConfigurationType> 40 <ConfigurationType>DynamicLibrary</ConfigurationType>
39 <CharacterSet>Unicode</CharacterSet> 41 <CharacterSet>Unicode</CharacterSet>
40 <WholeProgramOptimization>true</WholeProgramOptimization> 42 <WholeProgramOptimization>true</WholeProgramOptimization>
43 <PlatformToolset>v110</PlatformToolset>
41 </PropertyGroup> 44 </PropertyGroup>
42 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 45 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43 <ConfigurationType>DynamicLibrary</ConfigurationType> 46 <ConfigurationType>DynamicLibrary</ConfigurationType>
44 <CharacterSet>Unicode</CharacterSet> 47 <CharacterSet>Unicode</CharacterSet>
48 <PlatformToolset>v110</PlatformToolset>
45 </PropertyGroup> 49 </PropertyGroup>
46 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 50 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
47 <ImportGroup Label="ExtensionSettings"> 51 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/call_scilab/call_scilab.vcxproj b/scilab/modules/call_scilab/call_scilab.vcxproj
index b3f73f3..e6c0b13 100644
--- a/scilab/modules/call_scilab/call_scilab.vcxproj
+++ b/scilab/modules/call_scilab/call_scilab.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/commons/src/c/commons.vcxproj b/scilab/modules/commons/src/c/commons.vcxproj
index 1f28133..ab3ff5f 100644
--- a/scilab/modules/commons/src/c/commons.vcxproj
+++ b/scilab/modules/commons/src/c/commons.vcxproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ItemGroup Label="ProjectConfigurations"> 3 <ItemGroup Label="ProjectConfigurations">
4 <ProjectConfiguration Include="Debug|Win32"> 4 <ProjectConfiguration Include="Debug|Win32">
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/commons/src/jni/CommonFileUtils_wrap.c b/scilab/modules/commons/src/jni/CommonFileUtils_wrap.c
index 5a46538..0e51838 100644
--- a/scilab/modules/commons/src/jni/CommonFileUtils_wrap.c
+++ b/scilab/modules/commons/src/jni/CommonFileUtils_wrap.c
@@ -1,11 +1,11 @@
1/* ---------------------------------------------------------------------------- 1/* ----------------------------------------------------------------------------
2 * This file was automatically generated by SWIG (http://www.swig.org). 2 * This file was automatically generated by SWIG (http://www.swig.org).
3 * Version 2.0.4 3 * Version 2.0.7
4 * 4 *
5 * This file is not intended to be easily readable and contains a number of 5 * This file is not intended to be easily readable and contains a number of
6 * coding conventions designed to improve portability and efficiency. Do not make 6 * coding conventions designed to improve portability and efficiency. Do not make
7 * changes to this file unless you know what you are doing--modify the SWIG 7 * changes to this file unless you know what you are doing--modify the SWIG
8 * interface file instead. 8 * interface file instead.
9 * ----------------------------------------------------------------------------- */ 9 * ----------------------------------------------------------------------------- */
10 10
11#define SWIGJAVA 11#define SWIGJAVA
@@ -41,28 +41,28 @@
41#ifndef SWIGUNUSED 41#ifndef SWIGUNUSED
42# if defined(__GNUC__) 42# if defined(__GNUC__)
43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) 43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
44# define SWIGUNUSED __attribute__ ((__unused__)) 44# define SWIGUNUSED __attribute__ ((__unused__))
45# else 45# else
46# define SWIGUNUSED 46# define SWIGUNUSED
47# endif 47# endif
48# elif defined(__ICC) 48# elif defined(__ICC)
49# define SWIGUNUSED __attribute__ ((__unused__)) 49# define SWIGUNUSED __attribute__ ((__unused__))
50# else 50# else
51# define SWIGUNUSED 51# define SWIGUNUSED
52# endif 52# endif
53#endif 53#endif
54 54
55#ifndef SWIG_MSC_UNSUPPRESS_4505 55#ifndef SWIG_MSC_UNSUPPRESS_4505
56# if defined(_MSC_VER) 56# if defined(_MSC_VER)
57# pragma warning(disable : 4505) /* unreferenced local function has been removed */ 57# pragma warning(disable : 4505) /* unreferenced local function has been removed */
58# endif 58# endif
59#endif 59#endif
60 60
61#ifndef SWIGUNUSEDPARM 61#ifndef SWIGUNUSEDPARM
62# ifdef __cplusplus 62# ifdef __cplusplus
63# define SWIGUNUSEDPARM(p) 63# define SWIGUNUSEDPARM(p)
64# else 64# else
65# define SWIGUNUSEDPARM(p) p SWIGUNUSED 65# define SWIGUNUSEDPARM(p) p SWIGUNUSED
66# endif 66# endif
67#endif 67#endif
68 68
@@ -105,7 +105,7 @@
105# define SWIGSTDCALL __stdcall 105# define SWIGSTDCALL __stdcall
106# else 106# else
107# define SWIGSTDCALL 107# define SWIGSTDCALL
108# endif 108# endif
109#endif 109#endif
110 110
111/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ 111/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,7 +122,7 @@
122 122
123/* Fix for jlong on some versions of gcc on Windows */ 123/* Fix for jlong on some versions of gcc on Windows */
124#if defined(__GNUC__) && !defined(__INTEL_COMPILER) 124#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
125typedef long long __int64; 125 typedef long long __int64;
126#endif 126#endif
127 127
128/* Fix for jlong on 64-bit x86 Solaris */ 128/* Fix for jlong on 64-bit x86 Solaris */
@@ -138,55 +138,47 @@ typedef long long __int64;
138 138
139 139
140/* Support for throwing Java exceptions */ 140/* Support for throwing Java exceptions */
141typedef enum 141typedef enum {
142{ 142 SWIG_JavaOutOfMemoryError = 1,
143 SWIG_JavaOutOfMemoryError = 1, 143 SWIG_JavaIOException,
144 SWIG_JavaIOException, 144 SWIG_JavaRuntimeException,
145 SWIG_JavaRuntimeException, 145 SWIG_JavaIndexOutOfBoundsException,
146 SWIG_JavaIndexOutOfBoundsException, 146 SWIG_JavaArithmeticException,
147 SWIG_JavaArithmeticException, 147 SWIG_JavaIllegalArgumentException,
148 SWIG_JavaIllegalArgumentException, 148 SWIG_JavaNullPointerException,
149 SWIG_JavaNullPointerException, 149 SWIG_JavaDirectorPureVirtual,
150 SWIG_JavaDirectorPureVirtual, 150 SWIG_JavaUnknownError
151 SWIG_JavaUnknownError
152} SWIG_JavaExceptionCodes; 151} SWIG_JavaExceptionCodes;
153 152
154typedef struct 153typedef struct {
155{ 154 SWIG_JavaExceptionCodes code;
156 SWIG_JavaExceptionCodes code; 155 const char *java_exception;
157 const char *java_exception;
158} SWIG_JavaExceptions_t; 156} SWIG_JavaExceptions_t;
159 157
160 158
161static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) 159static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
162{ 160 jclass excep;
163 jclass excep; 161 static const SWIG_JavaExceptions_t java_exceptions[] = {
164 static const SWIG_JavaExceptions_t java_exceptions[] = 162 { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
165 { 163 { SWIG_JavaIOException, "java/io/IOException" },
166 { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, 164 { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
167 { SWIG_JavaIOException, "java/io/IOException" }, 165 { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
168 { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, 166 { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
169 { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, 167 { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
170 { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, 168 { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
171 { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, 169 { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
172 { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, 170 { SWIG_JavaUnknownError, "java/lang/UnknownError" },
173 { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" }, 171 { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" }
174 { SWIG_JavaUnknownError, "java/lang/UnknownError" }, 172 };
175 { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } 173 const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
176 }; 174
177 const SWIG_JavaExceptions_t *except_ptr = java_exceptions; 175 while (except_ptr->code != code && except_ptr->code)
178 176 except_ptr++;
179 while (except_ptr->code != code && except_ptr->code) 177
180 { 178 (*jenv)->ExceptionClear(jenv);
181 except_ptr++; 179 excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
182 } 180 if (excep)
183 181 (*jenv)->ThrowNew(jenv, excep, msg);
184 (*jenv)->ExceptionClear(jenv);
185 excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
186 if (excep)
187 {
188 (*jenv)->ThrowNew(jenv, excep, msg);
189 }
190} 182}
191 183
192 184
@@ -203,51 +195,42 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
203extern "C" { 195extern "C" {
204#endif 196#endif
205 197
206 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_CommonFileUtilsJNI_isEmptyDirectory(JNIEnv *jenv, jclass jcls, jstring jarg1) 198SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_CommonFileUtilsJNI_isEmptyDirectory(JNIEnv *jenv, jclass jcls, jstring jarg1) {
207 { 199 jint jresult = 0 ;
208 jint jresult = 0 ; 200 char *arg1 = (char *) 0 ;
209 char *arg1 = (char *) 0 ; 201 int result;
210 int result; 202
211 203 (void)jenv;
212 (void)jenv; 204 (void)jcls;
213 (void)jcls; 205 arg1 = 0;
214 arg1 = 0; 206 if (jarg1) {
215 if (jarg1) 207 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
216 { 208 if (!arg1) return 0;
217 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0); 209 }
218 if (!arg1) 210 result = (int)isEmptyDirectory(arg1);
219 { 211 jresult = (jint)result;
220 return 0; 212 if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
221 } 213 return jresult;
222 } 214}
223 result = (int)isEmptyDirectory(arg1); 215
224 jresult = (jint)result; 216
225 if (arg1) 217SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_CommonFileUtilsJNI_getCWD(JNIEnv *jenv, jclass jcls) {
226 { 218 jstring jresult = 0 ;
227 (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1); 219 char *result = 0 ;
228 } 220
229 return jresult; 221 (void)jenv;
230 } 222 (void)jcls;
231 223 result = (char *)getCWD();
232 224 {
233 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_CommonFileUtilsJNI_getCWD(JNIEnv *jenv, jclass jcls) 225 if (result != NULL)
234 { 226 {
235 jstring jresult = 0 ; 227 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
236 char *result = 0 ; 228 FREE(result);
237 229 result = NULL;
238 (void)jenv; 230 }
239 (void)jcls; 231 }
240 result = (char *)getCWD(); 232 return jresult;
241 { 233}
242 if (result != NULL)
243 {
244 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
245 FREE(result);
246 result = NULL;
247 }
248 }
249 return jresult;
250 }
251 234
252 235
253#ifdef __cplusplus 236#ifdef __cplusplus
diff --git a/scilab/modules/commons/src/jni/ScilabCommons_wrap.c b/scilab/modules/commons/src/jni/ScilabCommons_wrap.c
index 9acb71c..b6d0b14 100644
--- a/scilab/modules/commons/src/jni/ScilabCommons_wrap.c
+++ b/scilab/modules/commons/src/jni/ScilabCommons_wrap.c
@@ -1,11 +1,11 @@
1/* ---------------------------------------------------------------------------- 1/* ----------------------------------------------------------------------------
2 * This file was automatically generated by SWIG (http://www.swig.org). 2 * This file was automatically generated by SWIG (http://www.swig.org).
3 * Version 2.0.4 3 * Version 2.0.7
4 * 4 *
5 * This file is not intended to be easily readable and contains a number of 5 * This file is not intended to be easily readable and contains a number of
6 * coding conventions designed to improve portability and efficiency. Do not make 6 * coding conventions designed to improve portability and efficiency. Do not make
7 * changes to this file unless you know what you are doing--modify the SWIG 7 * changes to this file unless you know what you are doing--modify the SWIG
8 * interface file instead. 8 * interface file instead.
9 * ----------------------------------------------------------------------------- */ 9 * ----------------------------------------------------------------------------- */
10 10
11#define SWIGJAVA 11#define SWIGJAVA
@@ -41,28 +41,28 @@
41#ifndef SWIGUNUSED 41#ifndef SWIGUNUSED
42# if defined(__GNUC__) 42# if defined(__GNUC__)
43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) 43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
44# define SWIGUNUSED __attribute__ ((__unused__)) 44# define SWIGUNUSED __attribute__ ((__unused__))
45# else 45# else
46# define SWIGUNUSED 46# define SWIGUNUSED
47# endif 47# endif
48# elif defined(__ICC) 48# elif defined(__ICC)
49# define SWIGUNUSED __attribute__ ((__unused__)) 49# define SWIGUNUSED __attribute__ ((__unused__))
50# else 50# else
51# define SWIGUNUSED 51# define SWIGUNUSED
52# endif 52# endif
53#endif 53#endif
54 54
55#ifndef SWIG_MSC_UNSUPPRESS_4505 55#ifndef SWIG_MSC_UNSUPPRESS_4505
56# if defined(_MSC_VER) 56# if defined(_MSC_VER)
57# pragma warning(disable : 4505) /* unreferenced local function has been removed */ 57# pragma warning(disable : 4505) /* unreferenced local function has been removed */
58# endif 58# endif
59#endif 59#endif
60 60
61#ifndef SWIGUNUSEDPARM 61#ifndef SWIGUNUSEDPARM
62# ifdef __cplusplus 62# ifdef __cplusplus
63# define SWIGUNUSEDPARM(p) 63# define SWIGUNUSEDPARM(p)
64# else 64# else
65# define SWIGUNUSEDPARM(p) p SWIGUNUSED 65# define SWIGUNUSEDPARM(p) p SWIGUNUSED
66# endif 66# endif
67#endif 67#endif
68 68
@@ -105,7 +105,7 @@
105# define SWIGSTDCALL __stdcall 105# define SWIGSTDCALL __stdcall
106# else 106# else
107# define SWIGSTDCALL 107# define SWIGSTDCALL
108# endif 108# endif
109#endif 109#endif
110 110
111/* Deal with Microsoft's attempt at deprecating C standard runtime functions */ 111/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -122,7 +122,7 @@
122 122
123/* Fix for jlong on some versions of gcc on Windows */ 123/* Fix for jlong on some versions of gcc on Windows */
124#if defined(__GNUC__) && !defined(__INTEL_COMPILER) 124#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
125typedef long long __int64; 125 typedef long long __int64;
126#endif 126#endif
127 127
128/* Fix for jlong on 64-bit x86 Solaris */ 128/* Fix for jlong on 64-bit x86 Solaris */
@@ -138,55 +138,47 @@ typedef long long __int64;
138 138
139 139
140/* Support for throwing Java exceptions */ 140/* Support for throwing Java exceptions */
141typedef enum 141typedef enum {
142{ 142 SWIG_JavaOutOfMemoryError = 1,
143 SWIG_JavaOutOfMemoryError = 1, 143 SWIG_JavaIOException,
144 SWIG_JavaIOException, 144 SWIG_JavaRuntimeException,
145 SWIG_JavaRuntimeException, 145 SWIG_JavaIndexOutOfBoundsException,
146 SWIG_JavaIndexOutOfBoundsException, 146 SWIG_JavaArithmeticException,
147 SWIG_JavaArithmeticException, 147 SWIG_JavaIllegalArgumentException,
148 SWIG_JavaIllegalArgumentException, 148 SWIG_JavaNullPointerException,
149 SWIG_JavaNullPointerException, 149 SWIG_JavaDirectorPureVirtual,
150 SWIG_JavaDirectorPureVirtual, 150 SWIG_JavaUnknownError
151 SWIG_JavaUnknownError
152} SWIG_JavaExceptionCodes; 151} SWIG_JavaExceptionCodes;
153 152
154typedef struct 153typedef struct {
155{ 154 SWIG_JavaExceptionCodes code;
156 SWIG_JavaExceptionCodes code; 155 const char *java_exception;
157 const char *java_exception;
158} SWIG_JavaExceptions_t; 156} SWIG_JavaExceptions_t;
159 157
160 158
161static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) 159static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionCodes code, const char *msg) {
162{ 160 jclass excep;
163 jclass excep; 161 static const SWIG_JavaExceptions_t java_exceptions[] = {
164 static const SWIG_JavaExceptions_t java_exceptions[] = 162 { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" },
165 { 163 { SWIG_JavaIOException, "java/io/IOException" },
166 { SWIG_JavaOutOfMemoryError, "java/lang/OutOfMemoryError" }, 164 { SWIG_JavaRuntimeException, "java/lang/RuntimeException" },
167 { SWIG_JavaIOException, "java/io/IOException" }, 165 { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" },
168 { SWIG_JavaRuntimeException, "java/lang/RuntimeException" }, 166 { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" },
169 { SWIG_JavaIndexOutOfBoundsException, "java/lang/IndexOutOfBoundsException" }, 167 { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" },
170 { SWIG_JavaArithmeticException, "java/lang/ArithmeticException" }, 168 { SWIG_JavaNullPointerException, "java/lang/NullPointerException" },
171 { SWIG_JavaIllegalArgumentException, "java/lang/IllegalArgumentException" }, 169 { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" },
172 { SWIG_JavaNullPointerException, "java/lang/NullPointerException" }, 170 { SWIG_JavaUnknownError, "java/lang/UnknownError" },
173 { SWIG_JavaDirectorPureVirtual, "java/lang/RuntimeException" }, 171 { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" }
174 { SWIG_JavaUnknownError, "java/lang/UnknownError" }, 172 };
175 { (SWIG_JavaExceptionCodes)0, "java/lang/UnknownError" } 173 const SWIG_JavaExceptions_t *except_ptr = java_exceptions;
176 }; 174
177 const SWIG_JavaExceptions_t *except_ptr = java_exceptions; 175 while (except_ptr->code != code && except_ptr->code)
178 176 except_ptr++;
179 while (except_ptr->code != code && except_ptr->code) 177
180 { 178 (*jenv)->ExceptionClear(jenv);
181 except_ptr++; 179 excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
182 } 180 if (excep)
183 181 (*jenv)->ThrowNew(jenv, excep, msg);
184 (*jenv)->ExceptionClear(jenv);
185 excep = (*jenv)->FindClass(jenv, except_ptr->java_exception);
186 if (excep)
187 {
188 (*jenv)->ThrowNew(jenv, excep, msg);
189 }
190} 182}
191 183
192 184
@@ -208,230 +200,184 @@ static void SWIGUNUSED SWIG_JavaThrowException(JNIEnv *jenv, SWIG_JavaExceptionC
208extern "C" { 200extern "C" {
209#endif 201#endif
210 202
211 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getSCIHOME(JNIEnv *jenv, jclass jcls) 203SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getSCIHOME(JNIEnv *jenv, jclass jcls) {
212 { 204 jstring jresult = 0 ;
213 jstring jresult = 0 ; 205 char *result = 0 ;
214 char *result = 0 ; 206
215 207 (void)jenv;
216 (void)jenv; 208 (void)jcls;
217 (void)jcls; 209 result = (char *)getSCIHOME();
218 result = (char *)getSCIHOME(); 210 if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
219 if (result) 211 return jresult;
220 { 212}
221 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); 213
222 } 214
223 return jresult; 215SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getTMPDIR(JNIEnv *jenv, jclass jcls) {
224 } 216 jstring jresult = 0 ;
225 217 char *result = 0 ;
226 218
227 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getTMPDIR(JNIEnv *jenv, jclass jcls) 219 (void)jenv;
228 { 220 (void)jcls;
229 jstring jresult = 0 ; 221 result = (char *)getTMPDIR();
230 char *result = 0 ; 222 if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
231 223 return jresult;
232 (void)jenv; 224}
233 (void)jcls; 225
234 result = (char *)getTMPDIR(); 226
235 if (result) 227SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getlanguage(JNIEnv *jenv, jclass jcls) {
236 { 228 jstring jresult = 0 ;
237 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); 229 char *result = 0 ;
238 } 230
239 return jresult; 231 (void)jenv;
240 } 232 (void)jcls;
241 233 result = (char *)getlanguage();
242 234 if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
243 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getlanguage(JNIEnv *jenv, jclass jcls) 235 return jresult;
244 { 236}
245 jstring jresult = 0 ; 237
246 char *result = 0 ; 238
247 239SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_createtempfilename(JNIEnv *jenv, jclass jcls, jstring jarg1, jint jarg2) {
248 (void)jenv; 240 jstring jresult = 0 ;
249 (void)jcls; 241 char *arg1 = (char *) 0 ;
250 result = (char *)getlanguage(); 242 int arg2 ;
251 if (result) 243 char *result = 0 ;
252 { 244
253 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); 245 (void)jenv;
254 } 246 (void)jcls;
255 return jresult; 247 arg1 = 0;
256 } 248 if (jarg1) {
257 249 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
258 250 if (!arg1) return 0;
259 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_createtempfilename(JNIEnv *jenv, jclass jcls, jstring jarg1, jint jarg2) 251 }
260 { 252 arg2 = (int)jarg2;
261 jstring jresult = 0 ; 253 result = (char *)createtempfilename((char const *)arg1,arg2);
262 char *arg1 = (char *) 0 ; 254 if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
263 int arg2 ; 255 if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
264 char *result = 0 ; 256 return jresult;
265 257}
266 (void)jenv; 258
267 (void)jcls; 259
268 arg1 = 0; 260SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getieee(JNIEnv *jenv, jclass jcls) {
269 if (jarg1) 261 jint jresult = 0 ;
270 { 262 int result;
271 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0); 263
272 if (!arg1) 264 (void)jenv;
273 { 265 (void)jcls;
274 return 0; 266 result = (int)getieee();
275 } 267 jresult = (jint)result;
276 } 268 return jresult;
277 arg2 = (int)jarg2; 269}
278 result = (char *)createtempfilename((char const *)arg1, arg2); 270
279 if (result) 271
280 { 272SWIGEXPORT void JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_setieee(JNIEnv *jenv, jclass jcls, jint jarg1) {
281 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); 273 int arg1 ;
282 } 274
283 if (arg1) 275 (void)jenv;
284 { 276 (void)jcls;
285 (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1); 277 arg1 = (int)jarg1;
286 } 278 setieee(arg1);
287 return jresult; 279}
288 } 280
289 281
290 282SWIGEXPORT void JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_setformat(JNIEnv *jenv, jclass jcls, jstring jarg1, jint jarg2) {
291 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getieee(JNIEnv *jenv, jclass jcls) 283 char *arg1 = (char *) 0 ;
292 { 284 int arg2 ;
293 jint jresult = 0 ; 285
294 int result; 286 (void)jenv;
295 287 (void)jcls;
296 (void)jenv; 288 arg1 = 0;
297 (void)jcls; 289 if (jarg1) {
298 result = (int)getieee(); 290 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0);
299 jresult = (jint)result; 291 if (!arg1) return ;
300 return jresult; 292 }
301 } 293 arg2 = (int)jarg2;
302 294 setformat((char const *)arg1,arg2);
303 295 if (arg1) (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1);
304 SWIGEXPORT void JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_setieee(JNIEnv *jenv, jclass jcls, jint jarg1) 296}
305 { 297
306 int arg1 ; 298
307 299SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getformat(JNIEnv *jenv, jclass jcls) {
308 (void)jenv; 300 jstring jresult = 0 ;
309 (void)jcls; 301 char *result = 0 ;
310 arg1 = (int)jarg1; 302
311 setieee(arg1); 303 (void)jenv;
312 } 304 (void)jcls;
313 305 result = (char *)getformat();
314 306 if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
315 SWIGEXPORT void JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_setformat(JNIEnv *jenv, jclass jcls, jstring jarg1, jint jarg2) 307 return jresult;
316 { 308}
317 char *arg1 = (char *) 0 ; 309
318 int arg2 ; 310
319 311SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getformatwidth(JNIEnv *jenv, jclass jcls) {
320 (void)jenv; 312 jint jresult = 0 ;
321 (void)jcls; 313 int result;
322 arg1 = 0; 314
323 if (jarg1) 315 (void)jenv;
324 { 316 (void)jcls;
325 arg1 = (char *)(*jenv)->GetStringUTFChars(jenv, jarg1, 0); 317 result = (int)getformatwidth();
326 if (!arg1) 318 jresult = (jint)result;
327 { 319 return jresult;
328 return ; 320}
329 } 321
330 } 322
331 arg2 = (int)jarg2; 323SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionMajor(JNIEnv *jenv, jclass jcls) {
332 setformat((char const *)arg1, arg2); 324 jint jresult = 0 ;
333 if (arg1) 325 int result;
334 { 326
335 (*jenv)->ReleaseStringUTFChars(jenv, jarg1, (const char *)arg1); 327 (void)jenv;
336 } 328 (void)jcls;
337 } 329 result = (int)getScilabVersionMajor();
338 330 jresult = (jint)result;
339 331 return jresult;
340 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getformat(JNIEnv *jenv, jclass jcls) 332}
341 { 333
342 jstring jresult = 0 ; 334
343 char *result = 0 ; 335SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionMinor(JNIEnv *jenv, jclass jcls) {
344 336 jint jresult = 0 ;
345 (void)jenv; 337 int result;
346 (void)jcls; 338
347 result = (char *)getformat(); 339 (void)jenv;
348 if (result) 340 (void)jcls;
349 { 341 result = (int)getScilabVersionMinor();
350 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result); 342 jresult = (jint)result;
351 } 343 return jresult;
352 return jresult; 344}
353 } 345
354 346
355 347SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionMaintenance(JNIEnv *jenv, jclass jcls) {
356 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getformatwidth(JNIEnv *jenv, jclass jcls) 348 jint jresult = 0 ;
357 { 349 int result;
358 jint jresult = 0 ; 350
359 int result; 351 (void)jenv;
360 352 (void)jcls;
361 (void)jenv; 353 result = (int)getScilabVersionMaintenance();
362 (void)jcls; 354 jresult = (jint)result;
363 result = (int)getformatwidth(); 355 return jresult;
364 jresult = (jint)result; 356}
365 return jresult; 357
366 } 358
367 359SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionTimestamp(JNIEnv *jenv, jclass jcls) {
368 360 jint jresult = 0 ;
369 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionMajor(JNIEnv *jenv, jclass jcls) 361 int result;
370 { 362
371 jint jresult = 0 ; 363 (void)jenv;
372 int result; 364 (void)jcls;
373 365 result = (int)getScilabVersionTimestamp();
374 (void)jenv; 366 jresult = (jint)result;
375 (void)jcls; 367 return jresult;
376 result = (int)getScilabVersionMajor(); 368}
377 jresult = (jint)result; 369
378 return jresult; 370
379 } 371SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionAsString(JNIEnv *jenv, jclass jcls) {
380 372 jstring jresult = 0 ;
381 373 char *result = 0 ;
382 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionMinor(JNIEnv *jenv, jclass jcls) 374
383 { 375 (void)jenv;
384 jint jresult = 0 ; 376 (void)jcls;
385 int result; 377 result = (char *)getScilabVersionAsString();
386 378 if (result) jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
387 (void)jenv; 379 return jresult;
388 (void)jcls; 380}
389 result = (int)getScilabVersionMinor();
390 jresult = (jint)result;
391 return jresult;
392 }
393
394
395 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionMaintenance(JNIEnv *jenv, jclass jcls)
396 {
397 jint jresult = 0 ;
398 int result;
399
400 (void)jenv;
401 (void)jcls;
402 result = (int)getScilabVersionMaintenance();
403 jresult = (jint)result;
404 return jresult;
405 }
406
407
408 SWIGEXPORT jint JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionTimestamp(JNIEnv *jenv, jclass jcls)
409 {
410 jint jresult = 0 ;
411 int result;
412
413 (void)jenv;
414 (void)jcls;
415 result = (int)getScilabVersionTimestamp();
416 jresult = (jint)result;
417 return jresult;
418 }
419
420
421 SWIGEXPORT jstring JNICALL Java_org_scilab_modules_commons_ScilabCommonsJNI_getScilabVersionAsString(JNIEnv *jenv, jclass jcls)
422 {
423 jstring jresult = 0 ;
424 char *result = 0 ;
425
426 (void)jenv;
427 (void)jcls;
428 result = (char *)getScilabVersionAsString();
429 if (result)
430 {
431 jresult = (*jenv)->NewStringUTF(jenv, (const char *)result);
432 }
433 return jresult;
434 }
435 381
436 382
437#ifdef __cplusplus 383#ifdef __cplusplus
diff --git a/scilab/modules/completion/src/c/completion.vcxproj b/scilab/modules/completion/src/c/completion.vcxproj
index 6352d6d..5fd82f1 100644
--- a/scilab/modules/completion/src/c/completion.vcxproj
+++ b/scilab/modules/completion/src/c/completion.vcxproj
@@ -28,19 +28,23 @@
28 <ConfigurationType>DynamicLibrary</ConfigurationType> 28 <ConfigurationType>DynamicLibrary</ConfigurationType>
29 <CharacterSet>MultiByte</CharacterSet> 29 <CharacterSet>MultiByte</CharacterSet>
30 <WholeProgramOptimization>false</WholeProgramOptimization> 30 <WholeProgramOptimization>false</WholeProgramOptimization>
31 <PlatformToolset>v110</PlatformToolset>
31 </PropertyGroup> 32 </PropertyGroup>
32 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> 33 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
33 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
34 <CharacterSet>MultiByte</CharacterSet> 35 <CharacterSet>MultiByte</CharacterSet>
36 <PlatformToolset>v110</PlatformToolset>
35 </PropertyGroup> 37 </PropertyGroup>
36 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> 38 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
37 <ConfigurationType>DynamicLibrary</ConfigurationType> 39 <ConfigurationType>DynamicLibrary</ConfigurationType>
38 <CharacterSet>MultiByte</CharacterSet> 40 <CharacterSet>MultiByte</CharacterSet>
39 <WholeProgramOptimization>false</WholeProgramOptimization> 41 <WholeProgramOptimization>false</WholeProgramOptimization>
42 <PlatformToolset>v110</PlatformToolset>
40 </PropertyGroup> 43 </PropertyGroup>
41 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> 44 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42 <ConfigurationType>DynamicLibrary</ConfigurationType> 45 <ConfigurationType>DynamicLibrary</ConfigurationType>
43 <CharacterSet>MultiByte</CharacterSet> 46 <CharacterSet>MultiByte</CharacterSet>
47 <PlatformToolset>v110</PlatformToolset>
44 </PropertyGroup> 48 </PropertyGroup>
45 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 49 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
46 <ImportGroup Label="ExtensionSettings"> 50 <ImportGroup Label="ExtensionSettings">
diff --git a/scilab/modules/completion/src/jni/Completion_wrap.c b/scilab/modules/completion/src/jni/Completion_wrap.c
index 3bf6cf7..fbf19e9 100644
--- a/scilab/modules/completion/src/jni/Completion_wrap.c
+++ b/scilab/modules/completion/src/jni/Completion_wrap.c
@@ -1,11 +1,11 @@
1/* ---------------------------------------------------------------------------- 1/* ----------------------------------------------------------------------------
2 * This file was automatically generated by SWIG (http://www.swig.org). 2 * This file was automatically generated by SWIG (http://www.swig.org).
3 * Version 2.0.4 3 * Version 2.0.7
4 * 4 *
5 * This file is not intended to be easily readable and contains a number of 5 * This file is not intended to be easily readable and contains a number of
6 * coding conventions designed to improve portability and efficiency. Do not make 6 * coding conventions designed to improve portability and efficiency. Do not make
7 * changes to this file unless you know what you are doing--modify the SWIG 7 * changes to this file unless you know what you are doing--modify the SWIG
8 * interface file instead. 8 * interface file instead.
9 * ----------------------------------------------------------------------------- */ 9 * ----------------------------------------------------------------------------- */
10 10
11#define SWIGJAVA 11#define SWIGJAVA
@@ -41,28 +41,28 @@
41#ifndef SWIGUNUSED 41#ifndef SWIGUNUSED
42# if defined(__GNUC__) 42# if defined(__GNUC__)
43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) 43# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
44# define SWIGUNUSED __attribute__ ((__unused__)) 44# define SWIGUNUSED __attribute__ ((__unused__))
45# else 45# else
46# define SWIGUNUSED 46# define SWIGUNUSED
47# endif 47# endif
48# elif defined(__ICC) 48# elif defined(__ICC)
49# define SWIGUNUSED __attribute__ ((__unused__)) 49# define SWIGUNUSED __attribute__ ((__unused__))
50# else 50# else
51# define SWIGUNUSED 51# define SWIGUNUSED
52# endif 52# endif
53#endif 53#endif
54 54
55#ifndef SWIG_MSC_UNSUPPRESS_4505 55#ifndef SWIG_MSC_UNSUPPRESS_4505
56# if defined(_MSC_VER) 56# if defined(_MSC_VER)
57# pragma warning(disable : 4505) /* unreferenced local function has been removed */ 57# pragma warning(disable : 4505) /* unreferenced local function has been removed */
58# endif 58# endif
59#endif 59#endif
60 60
61#ifndef SWIGUNUSEDPARM 61#ifndef SWIGUNUSEDPARM
62# ifdef __cplusplus 62# ifdef __cplusplus
63# define SWIGUNUSEDPARM(p)