summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2009-03-18 16:49:58 +0100
committerPierre MARECHAL <pierre.marechal@scilab.org>2009-03-18 16:49:58 +0100
commit05ae75f1c7ce85b4af768fbc9b15d8e5bbde53e3 (patch)
tree6ed04ce6052a6212f619b5c831a52cb241b34216 /scilab/modules
parentf7bd5ec98eafdf99d99ef3dc23f4fab361ee4ded (diff)
parenta999ddaa5aa8b20940aa07e6bb376a9b803d7c29 (diff)
downloadscilab-05ae75f1c7ce85b4af768fbc9b15d8e5bbde53e3.zip
scilab-05ae75f1c7ce85b4af768fbc9b15d8e5bbde53e3.tar.gz
Merge commit 'refs/remotes/origin/master' into atoms
Conflicts: scilab/Version.incl scilab/configure scilab/modules/core/help/en_US/argn.xml scilab/modules/core/includes/version.h
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am22
-rw-r--r--scilab/modules/Makefile.in36
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.vcproj10
-rw-r--r--scilab/modules/action_binding/src/c/dynamic_menus.c2
-rw-r--r--scilab/modules/arnoldi/Makefile.am8
-rw-r--r--scilab/modules/arnoldi/Makefile.in12
-rw-r--r--scilab/modules/arnoldi/arnoldi.vcproj10
-rw-r--r--scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL.vfproj16
-rw-r--r--scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj16
-rw-r--r--scilab/modules/boolean/Makefile.am4
-rw-r--r--scilab/modules/boolean/Makefile.in14
-rw-r--r--scilab/modules/boolean/src/c/boolean.vcproj8
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.vfproj8
-rw-r--r--scilab/modules/cacsd/Makefile.am9
-rw-r--r--scilab/modules/cacsd/Makefile.in20
-rw-r--r--scilab/modules/cacsd/macros/obsvss.sci2
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.vcproj16
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f.vfproj8
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj16
-rw-r--r--scilab/modules/call_scilab/LibScilab_Import.def24
-rw-r--r--scilab/modules/call_scilab/Makefile.am2
-rw-r--r--scilab/modules/call_scilab/Makefile.in2
-rw-r--r--scilab/modules/call_scilab/call_scilab.def20
-rw-r--r--scilab/modules/call_scilab/call_scilab.iss6
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcproj487
-rw-r--r--scilab/modules/call_scilab/call_scilab_header.def4
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj8
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj8
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj8
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj8
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/c/common/makefile.mak4
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj46
-rw-r--r--scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak2
-rw-r--r--scilab/modules/call_scilab/src/c/CallScilab.c28
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.rc96
-rw-r--r--scilab/modules/call_scilab/src/c/resource.h14
-rw-r--r--scilab/modules/compatibility_functions/help/en_US/mtlb_eig.xml23
-rw-r--r--scilab/modules/compatibility_functions/help/fr_FR/mtlb_eig.xml25
-rw-r--r--scilab/modules/compatibility_functions/macros/mtlb_eig.sci5
-rw-r--r--scilab/modules/completion/src/c/LibScilab_Import.def2
-rw-r--r--scilab/modules/completion/src/c/completion.vcproj18
-rw-r--r--scilab/modules/completion/src/c/getfilesdictionary.c3
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.vcproj10
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3051.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_3051.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3051.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3051.unix.dia.ref46
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3297.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_3297.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3297.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3297.unix.dia.ref39
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3306.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_3306.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3306.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3306.unix.dia.ref50
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3398.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_3398.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3398.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3398.unix.dia.ref39
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3399.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_3399.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3399.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3399.unix.dia.ref35
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3757.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_3757.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3757.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_3757.unix.dia.ref35
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4039.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_4039.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4039.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4039.unix.dia.ref44
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4067.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_4067.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4067.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4067.unix.dia.ref52
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4095.dia.ref (renamed from scilab/modules/completion/tests/nonreg_tests/bug_4095.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4095.tst3
-rw-r--r--scilab/modules/completion/tests/nonreg_tests/bug_4095.unix.dia.ref63
-rw-r--r--scilab/modules/completion/tests/unit_tests/completeline.dia.ref (renamed from scilab/modules/completion/tests/unit_tests/completeline.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/unit_tests/completeline.tst3
-rw-r--r--scilab/modules/completion/tests/unit_tests/completeline.unix.dia.ref30
-rw-r--r--scilab/modules/completion/tests/unit_tests/getcommonpart.dia.ref (renamed from scilab/modules/completion/tests/unit_tests/getcommonpart.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/unit_tests/getcommonpart.tst3
-rw-r--r--scilab/modules/completion/tests/unit_tests/getcommonpart.unix.dia.ref42
-rw-r--r--scilab/modules/completion/tests/unit_tests/getfilepartlevel.dia.ref (renamed from scilab/modules/completion/tests/unit_tests/getfilepartlevel.win.dia.ref)15
-rw-r--r--scilab/modules/completion/tests/unit_tests/getfilepartlevel.tst3
-rw-r--r--scilab/modules/completion/tests/unit_tests/getfilepartlevel.unix.dia.ref44
-rw-r--r--scilab/modules/completion/tests/unit_tests/getpartlevel.dia.ref (renamed from scilab/modules/completion/tests/unit_tests/getpartlevel.win.dia.ref)20
-rw-r--r--scilab/modules/completion/tests/unit_tests/getpartlevel.tst6
-rw-r--r--scilab/modules/completion/tests/unit_tests/getpartlevel.unix.dia.ref37
-rw-r--r--scilab/modules/console/src/c/console.vcproj8
-rw-r--r--scilab/modules/console/src/cpp/ConsolePrintf.cpp1
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.vcproj10
-rw-r--r--scilab/modules/core/Makefile.am16
-rw-r--r--scilab/modules/core/Makefile.in156
-rw-r--r--scilab/modules/core/help/en_US/ans.xml9
-rw-r--r--scilab/modules/core/help/en_US/argn.xml2
-rw-r--r--scilab/modules/core/help/en_US/delbpt.xml72
-rw-r--r--scilab/modules/core/help/en_US/dispbpt.xml46
-rw-r--r--scilab/modules/core/help/en_US/dot.xml96
-rw-r--r--scilab/modules/core/help/en_US/lasterror.xml24
-rw-r--r--scilab/modules/core/help/en_US/mode.xml151
-rw-r--r--scilab/modules/core/help/en_US/predef.xml14
-rw-r--r--scilab/modules/core/help/en_US/setbpt.xml88
-rw-r--r--scilab/modules/core/help/en_US/try.xml163
-rw-r--r--scilab/modules/core/help/fr_FR/ans.xml9
-rw-r--r--scilab/modules/core/help/fr_FR/dot.xml98
-rw-r--r--scilab/modules/core/help/fr_FR/mode.xml173
-rw-r--r--scilab/modules/core/help/fr_FR/predef.xml12
-rw-r--r--scilab/modules/core/help/fr_FR/try.xml168
-rw-r--r--scilab/modules/core/includes/Thread_Wrapper.h4
-rw-r--r--scilab/modules/core/includes/gw_core.h2
-rw-r--r--scilab/modules/core/includes/mode_exec.h38
-rw-r--r--scilab/modules/core/includes/sciquit.h5
-rw-r--r--scilab/modules/core/includes/stack-c.h2
-rw-r--r--scilab/modules/core/includes/stack3.h5
-rw-r--r--scilab/modules/core/includes/version.h2
-rw-r--r--scilab/modules/core/macros/powershell.sci2
-rw-r--r--scilab/modules/core/sci_gateway/c/gw_core.c2
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_banner.c3
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_mode.c64
-rw-r--r--scilab/modules/core/sci_gateway/c/sci_predef.c100
-rw-r--r--scilab/modules/core/sci_gateway/core_gateway.xml43
-rw-r--r--scilab/modules/core/sci_gateway/fortran/sci_mode.f32
-rw-r--r--scilab/modules/core/src/c/core.vcproj92
-rw-r--r--scilab/modules/core/src/c/getdynamicDebugInfo_Windows.c80
-rw-r--r--scilab/modules/core/src/c/mode_exec.c33
-rw-r--r--scilab/modules/core/src/c/parse.c19
-rw-r--r--scilab/modules/core/src/c/predef.c63
-rw-r--r--scilab/modules/core/src/c/predef.h41
-rw-r--r--scilab/modules/core/src/c/run.c23
-rw-r--r--scilab/modules/core/src/c/stack3.c4
-rw-r--r--scilab/modules/core/src/fortran/command.f4
-rw-r--r--scilab/modules/core/src/fortran/core_f.vfproj10
-rw-r--r--scilab/modules/core/src/fortran/core_f2c.vcproj16
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_3772.dia.ref17
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_3772.tst20
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_3773.dia.ref15
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_3773.tst17
-rw-r--r--scilab/modules/core/tests/unit_tests/funptr.dia.ref2
-rw-r--r--scilab/modules/core/tests/unit_tests/funptr.tst2
-rw-r--r--scilab/modules/core/tests/unit_tests/mode.dia.ref30
-rw-r--r--scilab/modules/core/tests/unit_tests/mode.tst40
-rw-r--r--scilab/modules/core/tests/unit_tests/predef.dia.ref21
-rw-r--r--scilab/modules/core/tests/unit_tests/predef.tst27
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.vcproj16
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.vfproj8
-rw-r--r--scilab/modules/differential_equations/Makefile.am8
-rw-r--r--scilab/modules/differential_equations/Makefile.in18
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.vcproj16
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj8
-rw-r--r--scilab/modules/differential_equations/tests/unit_tests/dae.dia.ref23
-rw-r--r--scilab/modules/differential_equations/tests/unit_tests/dae.tst9
-rw-r--r--scilab/modules/differential_equations/tests/unit_tests/dae.win.dia.ref306
-rw-r--r--scilab/modules/double/Makefile.am8
-rw-r--r--scilab/modules/double/Makefile.in19
-rw-r--r--scilab/modules/double/src/c/double.vcproj16
-rw-r--r--scilab/modules/double/src/fortran/double_f.vfproj8
-rw-r--r--scilab/modules/dynamic_link/.gitignore12
-rw-r--r--scilab/modules/dynamic_link/Makefile.am10
-rw-r--r--scilab/modules/dynamic_link/Makefile.in32
-rw-r--r--scilab/modules/dynamic_link/dynamic_link.iss1
-rw-r--r--scilab/modules/dynamic_link/examples/interfaces/call_scilab_function/call_scifunction.sce20
-rw-r--r--scilab/modules/dynamic_link/examples/interfaces/call_scilab_function/readme.txt5
-rw-r--r--scilab/modules/dynamic_link/examples/interfaces/call_scilab_function/sci_call_scifunc.c125
-rw-r--r--scilab/modules/dynamic_link/help/en_US/ilib_verbose.xml142
-rw-r--r--scilab/modules/dynamic_link/includes/gw_dynamic_link.h17
-rw-r--r--scilab/modules/dynamic_link/includes/ilib_verbose.h46
-rw-r--r--scilab/modules/dynamic_link/macros/VCtoLCCLib.sci30
-rw-r--r--scilab/modules/dynamic_link/macros/configure_lcc.sci6
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_build.sci36
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_compile.sci36
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_for_link.sci183
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make.sci162
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci44
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_mex_build.sci10
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/gw_dynamic_link.c15
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_addinter.c2
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_c_link.c2
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_call.c7
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_getdynlibext.c2
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_ilib_verbose.c79
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_link.c2
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/c/sci_ulink.c2
-rw-r--r--scilab/modules/dynamic_link/sci_gateway/dynamic_link_gateway.xml1
-rw-r--r--scilab/modules/dynamic_link/src/c/LibScilab_Import.def2
-rw-r--r--scilab/modules/dynamic_link/src/c/addinter.c2
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.c38
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.vcproj30
-rw-r--r--scilab/modules/dynamic_link/src/c/ilib_verbose.c43
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f.vfproj16
-rw-r--r--scilab/modules/dynamic_link/src/scripts/Makedll.incl6
-rw-r--r--scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak167
-rw-r--r--scilab/modules/dynamic_link/src/scripts/TEMPLATE_MAKEFILE.VC10
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.macosx.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.tst7
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.unix.dia.ref9
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_2085.win.dia.ref24
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.dia.ref (renamed from scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.win.dia.ref)41
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.macosx.dia.ref72
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.tst11
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3191.unix.dia.ref72
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.dia.ref (renamed from scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.win.dia.ref)44
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.macosx.dia.ref74
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.tst13
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3392.unix.dia.ref74
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.dia.ref1
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.unix.dia.ref40
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3532.win.dia.ref39
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.dia.ref (renamed from scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.unix.dia.ref)1
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3561.win.dia.ref38
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.dia.ref44
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.macosx.dia.ref86
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.tst12
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3630.win.dia.ref84
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.dia.ref48
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.macosx.dia.ref120
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.tst15
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.unix.dia.ref120
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3639.win.dia.ref114
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3647.dia.ref (renamed from scilab/modules/dynamic_link/tests/nonreg_tests/bug_3647.win.dia.ref)25
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3647.tst12
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3647.unix.dia.ref49
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3944.dia.ref (renamed from scilab/modules/dynamic_link/tests/nonreg_tests/bug_3944.win.dia.ref)8
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3944.tst3
-rw-r--r--scilab/modules/dynamic_link/tests/nonreg_tests/bug_3944.unix.dia.ref41
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/addinter.macosx.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/addinter.tst6
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/addinter.unix.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/addinter.win.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/call.dia.ref23
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/call.tst14
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/call.unix.dia.ref43
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/call.win.dia.ref36
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build.macosx.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build.tst8
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build.unix.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build.win.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.macosx.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.tst6
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.unix.dia.ref (renamed from scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.dia.ref)7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_build_2.win.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.macosx.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.tst7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.unix.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link.win.dia.ref7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link_f77.dia.ref (renamed from scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link_f77.win.dia.ref)16
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link_f77.tst7
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_for_link_f77.unix.dia.ref38
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_mex_build.dia.ref (renamed from scilab/modules/dynamic_link/tests/unit_tests/ilib_mex_build.win.dia.ref)12
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_mex_build.tst2
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_mex_build.unix.dia.ref32
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_verbose.dia.ref32
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/ilib_verbose.tst43
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.dia.ref (renamed from scilab/modules/dynamic_link/tests/unit_tests/link.unix.dia.ref)24
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.macosx.dia.ref68
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.tst13
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/link.win.dia.ref67
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/links.dia.ref (renamed from scilab/modules/dynamic_link/tests/unit_tests/links.win.dia.ref)14
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/links.tst8
-rw-r--r--scilab/modules/dynamic_link/tests/unit_tests/links.unix.dia.ref117
-rw-r--r--scilab/modules/elementary_functions/help/en_US/acoth.xml4
-rw-r--r--scilab/modules/elementary_functions/help/en_US/dec2hex.xml2
-rw-r--r--scilab/modules/elementary_functions/help/en_US/tand.xml2
-rw-r--r--scilab/modules/elementary_functions/help/en_US/typeof.xml8
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/dec2hex.xml39
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.vcproj44
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.vfproj16
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f.vfproj8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.vfproj16
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.vfproj16
-rw-r--r--scilab/modules/elementary_functions/src/fortran/urand.f8
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_2052.dia.ref37
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_2052.tst4
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_2052.win.dia.ref92
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/gsort.dia.ref1
-rw-r--r--scilab/modules/fftw/fftw.vcproj10
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.vcproj10
-rw-r--r--scilab/modules/fileio/LibScilab_Import.def49
-rw-r--r--scilab/modules/fileio/Makefile.am28
-rw-r--r--scilab/modules/fileio/Makefile.in174
-rw-r--r--scilab/modules/fileio/fileio.vcproj124
-rw-r--r--scilab/modules/fileio/help/en_US/chdir.xml (renamed from scilab/modules/core/help/en_US/chdir.xml)0
-rw-r--r--scilab/modules/fileio/help/en_US/pwd.xml (renamed from scilab/modules/core/help/en_US/pwd.xml)0
-rw-r--r--scilab/modules/fileio/help/fr_FR/chdir.xml (renamed from scilab/modules/core/help/fr_FR/chdir.xml)0
-rw-r--r--scilab/modules/fileio/help/fr_FR/pwd.xml (renamed from scilab/modules/core/help/fr_FR/pwd.xml)0
-rw-r--r--scilab/modules/fileio/includes/cluni0.h (renamed from scilab/modules/core/includes/cluni0.h)0
-rw-r--r--scilab/modules/fileio/includes/filesmanagement.h9
-rw-r--r--scilab/modules/fileio/includes/gw_fileio.h70
-rw-r--r--scilab/modules/fileio/includes/scicurdir.h (renamed from scilab/modules/core/src/c/scicurdir.h)0
-rw-r--r--scilab/modules/fileio/io_Import.def7
-rw-r--r--scilab/modules/fileio/sci_gateway/c/gw_fileio.c70
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_NumTokens.c5
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_chdir.c (renamed from scilab/modules/core/sci_gateway/c/sci_chdir.c)4
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_createdir.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_deletefile.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fileext.c4
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fileio.c420
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_filesep.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_findfiles.c4
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fprintfMat.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fscanfMat.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_fullpath.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_getcwd.c (renamed from scilab/modules/core/sci_gateway/c/sci_getcwd.c)2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_getdrives.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_getlongpathname.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_getshortpathname.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_isdir.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_maxfiles.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mclearerr.c66
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mclose.c116
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_merror.c73
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mfprintf.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mfscanf.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mget.c134
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mgetstr.c108
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_moef.c65
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mopen.c130
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mprintf.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mput.c112
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mputstr.c84
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mscanf.c16
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mseek.c96
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_msprintf.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_msscanf.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mtell.c72
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_pathsep.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_removedir.c2
-rw-r--r--scilab/modules/fileio/sci_gateway/fileio_gateway.xml3
-rw-r--r--scilab/modules/fileio/src/c/cluni0.c (renamed from scilab/modules/core/src/c/cluni0.c)6
-rw-r--r--scilab/modules/fileio/src/c/createdirectory.c31
-rw-r--r--scilab/modules/fileio/src/c/filesmanagement.c26
-rw-r--r--scilab/modules/fileio/src/c/findfiles.c58
-rw-r--r--scilab/modules/fileio/src/c/readline.c46
-rw-r--r--scilab/modules/fileio/src/c/scicurdir.c (renamed from scilab/modules/core/src/c/scicurdir.c)0
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_2273.tst (renamed from scilab/modules/core/tests/nonreg_tests/bug_2273.tst)0
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_2320.dia.ref (renamed from scilab/modules/core/tests/nonreg_tests/bug_2320.dia.ref)0
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_2320.tst (renamed from scilab/modules/core/tests/nonreg_tests/bug_2320.tst)0
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_3053.tst32
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_3733.tst30
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_4036.dia.ref15
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_4036.tst17
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mclearerr.dia.ref9
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mclearerr.tst10
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mclose.dia.ref13
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mclose.tst17
-rw-r--r--scilab/modules/fileio/tests/unit_tests/meof.dia.ref23
-rw-r--r--scilab/modules/fileio/tests/unit_tests/meof.tst29
-rw-r--r--scilab/modules/fileio/tests/unit_tests/merror.dia.ref7
-rw-r--r--scilab/modules/fileio/tests/unit_tests/merror.tst15
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mget.dia.ref34
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mget.tst41
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mgetstr.dia.ref2
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mgetstr.tst2
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mopen.dia.ref21
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mopen.tst19
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mputstr.dia.ref16
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mputstr.tst15
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mseek.dia.ref41
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mseek.tst30
-rw-r--r--scilab/modules/functions/macros/getd.sci33
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4192.dia.ref25
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_4192.tst33
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/GAIsing2ddemo.sce7
-rwxr-xr-xscilab/modules/genetic_algorithms/demos/NSGA2demo.sce1
-rw-r--r--scilab/modules/genetic_algorithms/demos/genetic_algorithms.dem.gateway.sce14
-rw-r--r--scilab/modules/genetic_algorithms/etc/genetic_algorithms.start5
-rw-r--r--scilab/modules/graphic_export/LibScilab_Import.def3
-rw-r--r--scilab/modules/graphic_export/graphic_export.vcproj28
-rw-r--r--scilab/modules/graphic_export/graphics_Import.def2
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2bmp.xml26
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2emf.xml33
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2eps.xml43
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2fig.xml40
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2gif.xml31
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2jpg.xml27
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2pdf.xml27
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2png.xml28
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2ppm.xml28
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2ps.xml41
-rw-r--r--scilab/modules/graphic_export/help/en_US/xs2svg.xml31
-rw-r--r--scilab/modules/graphic_export/src/c/xs2file.c32
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/ExportRenderer.java2
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSRenderer.java11
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj10
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4174.tst26
-rw-r--r--scilab/modules/graphics/Makefile.am9
-rw-r--r--scilab/modules/graphics/Makefile.in49
-rw-r--r--scilab/modules/graphics/graphics.vcproj30
-rw-r--r--scilab/modules/graphics/help/en_US/figure_properties.xml11
-rw-r--r--scilab/modules/graphics/includes/Champ.h2
-rw-r--r--scilab/modules/graphics/includes/CurrentObjectsManagement.h20
-rw-r--r--scilab/modules/graphics/includes/DestroyObjects.h8
-rw-r--r--scilab/modules/graphics/includes/Format.h1
-rw-r--r--scilab/modules/graphics/includes/GetProperty.h2
-rw-r--r--scilab/modules/graphics/includes/InitObjects.h5
-rw-r--r--scilab/modules/graphics/includes/ObjectStructure.h13
-rw-r--r--scilab/modules/graphics/includes/SetProperty.h3
-rw-r--r--scilab/modules/graphics/macros/%h_load.sci6
-rw-r--r--scilab/modules/graphics/macros/%h_p.sci1
-rw-r--r--scilab/modules/graphics/macros/%h_save.sci4
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_delete.c14
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_draw.c2
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_geom3d.c2
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_matplot1.c2
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_move.c1
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_winsid.c2
-rw-r--r--scilab/modules/graphics/sci_gateway/c/sci_xarcs.c2
-rw-r--r--scilab/modules/graphics/src/c/BuildObjects.c2
-rw-r--r--scilab/modules/graphics/src/c/CurrentObjectsManagement.c7
-rw-r--r--scilab/modules/graphics/src/c/GetProperty.c23
-rw-r--r--scilab/modules/graphics/src/c/InitObjects.c1
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c37
-rw-r--r--scilab/modules/graphics/src/c/WindowList.c1
-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.h1
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_anti_aliasing_property.c61
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_background_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_callback_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_current_axes_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_current_entity_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_current_figure_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_default_axes_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_default_figure_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_interp_color_vector.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_parent_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_surface_color_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_tics_label_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_user_data_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_x_shift_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_y_shift_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_z_shift_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/setHandleProperty.h3
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_anti_aliasing_property.c86
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_callback_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_parent_property.c2
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/set_user_data_property.c2
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.c2
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.h8
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.vcproj10
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2458.tst14
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3953.tst29
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_4090.tst33
-rw-r--r--scilab/modules/gui/Makefile.am2
-rw-r--r--scilab/modules/gui/Makefile.in2
-rw-r--r--scilab/modules/gui/help/en_US/createNode.xml1
-rw-r--r--scilab/modules/gui/help/en_US/createTree.xml1
-rw-r--r--scilab/modules/gui/help/en_US/dumpTree.xml1
-rw-r--r--scilab/modules/gui/help/en_US/usecanvas.xml2
-rw-r--r--scilab/modules/gui/images/icons/list-add.pngbin0 -> 386 bytes
-rw-r--r--scilab/modules/gui/images/icons/list-remove.pngbin0 -> 252 bytes
-rw-r--r--scilab/modules/gui/images/icons/puff.pngbin0 -> 2664 bytes
-rw-r--r--scilab/modules/gui/macros/concatTree.sci41
-rw-r--r--scilab/modules/gui/macros/createNode.sci57
-rw-r--r--scilab/modules/gui/macros/createTree.sci39
-rw-r--r--scilab/modules/gui/macros/deleteNode.sci126
-rw-r--r--scilab/modules/gui/macros/dumpTree.sci70
-rw-r--r--scilab/modules/gui/macros/equalsTree.sci60
-rw-r--r--scilab/modules/gui/macros/findNode.sci148
-rw-r--r--scilab/modules/gui/macros/getChildrenNode.sci81
-rw-r--r--scilab/modules/gui/macros/getNodePosition.sci58
-rw-r--r--scilab/modules/gui/macros/getParentNode.sci91
-rw-r--r--scilab/modules/gui/macros/insertNode.sci213
-rw-r--r--scilab/modules/gui/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/gui/src/c/gui.vcproj26
-rw-r--r--scilab/modules/gui/src/cpp/InitUIMenu.cpp1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolBackgroundColor.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolFontAngle.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolFontName.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolFontSize.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolFontUnits.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolFontWeight.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolHorizontalAlignment.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolListboxTop.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolMax.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolMin.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolParent.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolPosition.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolRelief.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolSliderStep.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolString.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolUnits.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolValue.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUicontrolVerticalAlignment.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUimenuLabel.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUiobjectCallback.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUiobjectEnable.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUiobjectForegroundColor.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUiobjectTag.hxx1
-rw-r--r--scilab/modules/gui/src/cpp/SetUiobjectVisible.hxx1
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/ScilabBridge.java33
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/canvas/SwingScilabCanvas.java17
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabAxes.java16
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tab/SwingScilabTab.java51
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tree/ScilabTreeCellRenderer.java122
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/tree/SwingScilabTree.java253
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvas.java12
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/ScilabCanvasBridge.java7
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/canvas/SimpleCanvas.java1
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/events/GlobalKeyEventWatcher.java6
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/filechooser/Juigetfile.java4
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/graphicWindow/ScilabRendererProperties.java54
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTab.java10
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tab/ScilabTabBridge.java26
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tab/SimpleTab.java16
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tab/Tab.java8
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tree/ScilabTree.java294
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tree/ScilabTreeBridge.java30
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tree/SimpleTree.java23
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/tree/Tree.java71
-rw-r--r--scilab/modules/gui/tests/unit_tests/createNode.dia.ref58
-rw-r--r--scilab/modules/gui/tests/unit_tests/createNode.tst31
-rw-r--r--scilab/modules/gui/tests/unit_tests/createTree.dia.ref304
-rw-r--r--scilab/modules/gui/tests/unit_tests/createTree.tst91
-rw-r--r--scilab/modules/gui/tests/unit_tests/dumpTree.dia.ref600
-rw-r--r--scilab/modules/gui/tests/unit_tests/dumpTree.tst478
-rw-r--r--scilab/modules/helptools/src/c/helptools.vcproj18
-rw-r--r--scilab/modules/history_manager/Makefile.am7
-rw-r--r--scilab/modules/history_manager/Makefile.in10
-rw-r--r--scilab/modules/history_manager/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/history_manager/src/c/fileio_Import.def7
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.vcproj46
-rw-r--r--scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj10
-rw-r--r--scilab/modules/integer/help/en_US/int8.xml (renamed from scilab/modules/elementary_functions/help/en_US/int8.xml)0
-rw-r--r--scilab/modules/integer/help/fr_FR/int8.xml (renamed from scilab/modules/elementary_functions/help/fr_FR/int8.xml)0
-rw-r--r--scilab/modules/integer/src/c/integer.vcproj22
-rw-r--r--scilab/modules/integer/src/fortran/integer_f.vfproj16
-rw-r--r--scilab/modules/interpolation/help/en_US/bsplin3val.xml110
-rw-r--r--scilab/modules/interpolation/help/en_US/cshep2d.xml89
-rw-r--r--scilab/modules/interpolation/help/en_US/eval_cshep2d.xml108
-rw-r--r--scilab/modules/interpolation/help/en_US/interp.xml151
-rw-r--r--scilab/modules/interpolation/help/en_US/interp3d.xml113
-rw-r--r--scilab/modules/interpolation/help/en_US/interpln.xml52
-rw-r--r--scilab/modules/interpolation/help/en_US/intsplin.xml70
-rw-r--r--scilab/modules/interpolation/help/en_US/linear_interpn.xml158
-rw-r--r--scilab/modules/interpolation/help/en_US/lsq_splin.xml152
-rw-r--r--scilab/modules/interpolation/help/en_US/smooth.xml56
-rw-r--r--scilab/modules/interpolation/help/en_US/splin.xml244
-rw-r--r--scilab/modules/interpolation/help/en_US/splin3d.xml116
-rw-r--r--scilab/modules/interpolation/help/mml/bsplin3val_equation1.mml77
-rw-r--r--scilab/modules/interpolation/help/mml/eval_cshep2d_equation1.mml282
-rw-r--r--scilab/modules/interpolation/help/mml/interp3d_equation1.mml179
-rw-r--r--scilab/modules/interpolation/help/mml/interp_equation1.mml256
-rw-r--r--scilab/modules/interpolation/help/mml/interp_equation2.mml66
-rw-r--r--scilab/modules/interpolation/help/mml/interp_equation3.mml80
-rw-r--r--scilab/modules/interpolation/help/mml/interp_equation4.mml122
-rw-r--r--scilab/modules/interpolation/help/mml/linear_interpn_equation1.mml59
-rw-r--r--scilab/modules/interpolation/help/mml/linear_interpn_equation2.mml116
-rw-r--r--scilab/modules/interpolation/help/mml/linear_interpn_equation3.mml85
-rw-r--r--scilab/modules/interpolation/help/mml/lsq_splin_equation1.mml112
-rw-r--r--scilab/modules/interpolation/help/mml/splin3d_equation1.mml62
-rw-r--r--scilab/modules/interpolation/help/mml/splin_equation1.mml86
-rw-r--r--scilab/modules/interpolation/help/mml/splin_equation2.mml54
-rw-r--r--scilab/modules/interpolation/help/mml/splin_equation3.mml46
-rw-r--r--scilab/modules/interpolation/help/mml/splin_equation4.mml58
-rw-r--r--scilab/modules/interpolation/help/mml/splin_equation5.mml110
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.vcproj22
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.vfproj16
-rw-r--r--scilab/modules/intersci/examples/Makefile.mak36
-rw-r--r--scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj10
-rw-r--r--scilab/modules/intersci/src/exe/interscin/interscin.vcproj10
-rw-r--r--scilab/modules/intersci/src/lib/intersci.vcproj10
-rw-r--r--scilab/modules/io/Makefile.am7
-rw-r--r--scilab/modules/io/Makefile.in27
-rw-r--r--scilab/modules/io/includes/GetenvB.h (renamed from scilab/modules/core/includes/GetenvB.h)0
-rw-r--r--scilab/modules/io/sci_gateway/c/intfilestat.c2
-rw-r--r--scilab/modules/io/sci_gateway/c/sci_getenv.c115
-rw-r--r--scilab/modules/io/sci_gateway/fortran/intgetenv.f41
-rw-r--r--scilab/modules/io/src/c/GetenvB.c (renamed from scilab/modules/core/src/c/GetenvB.c)2
-rw-r--r--scilab/modules/io/src/c/LibScilab_Import.def2
-rw-r--r--scilab/modules/io/src/c/getenvc.c86
-rw-r--r--scilab/modules/io/src/c/io.vcproj26
-rw-r--r--scilab/modules/io/src/c/setenvc.c77
-rw-r--r--scilab/modules/io/src/c/systemc.c21
-rw-r--r--scilab/modules/io/src/fortran/LibScilab_Import.def1
-rw-r--r--scilab/modules/io/src/fortran/fileio_Import.def5
-rw-r--r--scilab/modules/io/src/fortran/io_f.vfproj27
-rw-r--r--scilab/modules/io/src/fortran/io_f2c.vcproj16
-rw-r--r--scilab/modules/io/tests/unit_tests/getenv.dia.ref34
-rw-r--r--scilab/modules/io/tests/unit_tests/getenv.tst47
-rw-r--r--scilab/modules/javasci/Javasci.vcproj10
-rw-r--r--scilab/modules/javasci/build.xml6
-rw-r--r--scilab/modules/javasci/help/en_US/compile_and_run_javasci.xml81
-rw-r--r--scilab/modules/javasci/src/c/javasci_globals.c2
-rw-r--r--scilab/modules/javasci/tests/bug_3909.tst23
-rw-r--r--scilab/modules/jvm/Call_scilab_Import.def6
-rw-r--r--scilab/modules/jvm/LibScilab_Import.def1
-rw-r--r--scilab/modules/jvm/libjvm.vcproj38
-rw-r--r--scilab/modules/linear_algebra/Makefile.am26
-rw-r--r--scilab/modules/linear_algebra/Makefile.in162
-rw-r--r--scilab/modules/linear_algebra/examples/Makefile.mak8
-rw-r--r--scilab/modules/linear_algebra/includes/gw_linear_algebra.h9
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/assembleEigenvectors.c (renamed from scilab/modules/linear_algebra/src/c/assembleEigenvectors.c)0
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/assembleEigenvectors.h (renamed from scilab/modules/linear_algebra/src/c/assembleEigenvectors.h)0
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_dgeev.c (renamed from scilab/modules/linear_algebra/src/c/intdgeev.c)12
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_dggev.c (renamed from scilab/modules/linear_algebra/src/c/intdggev.c)12
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_dsyev.c (renamed from scilab/modules/linear_algebra/src/c/intdsyev.c)5
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_eig.c25
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_zgeev.c (renamed from scilab/modules/linear_algebra/src/c/intzgeev.c)11
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_zggev.c (renamed from scilab/modules/linear_algebra/src/c/intzggev.c)164
-rw-r--r--scilab/modules/linear_algebra/sci_gateway/c/sci_zheev.c (renamed from scilab/modules/linear_algebra/src/c/intzheev.c)7
-rw-r--r--scilab/modules/linear_algebra/src/c/LibScilab_Import.def2
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.vcproj34
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f.vfproj16
-rw-r--r--scilab/modules/linear_algebra/tests/nonreg_tests/bug_2775.tst94
-rw-r--r--scilab/modules/localization/includes/charEncoding.h37
-rw-r--r--scilab/modules/localization/includes/localizationJava.h34
-rw-r--r--scilab/modules/localization/sci_gateway/c/sci_gettext.c116
-rw-r--r--scilab/modules/localization/src/c/InitializeLocalization.c2
-rw-r--r--scilab/modules/localization/src/c/charEncoding.c35
-rw-r--r--scilab/modules/localization/src/localization.vcproj34
-rw-r--r--scilab/modules/m2sci/macros/sci_files/sci_eig.sci6
-rw-r--r--scilab/modules/matio/matio.vcproj10
-rw-r--r--scilab/modules/metanet/Makefile.am5
-rw-r--r--scilab/modules/metanet/Makefile.in17
-rw-r--r--scilab/modules/metanet/src/c/metanet.vcproj18
-rw-r--r--scilab/modules/metanet/src/c/nometanet/nometanet.vcproj10
-rw-r--r--scilab/modules/metanet/src/fortran/metanet_f.vfproj16
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.vcproj18
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.vcproj18
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.vcproj18
-rw-r--r--scilab/modules/mexlib/tests/nonreg_tests/bug_614.dia.ref (renamed from scilab/modules/mexlib/tests/nonreg_tests/bug_614.win.dia.ref)9
-rw-r--r--scilab/modules/mexlib/tests/nonreg_tests/bug_614.tst2
-rw-r--r--scilab/modules/mexlib/tests/nonreg_tests/bug_614.unix.dia.ref45
-rw-r--r--scilab/modules/optimization/Makefile.am7
-rw-r--r--scilab/modules/optimization/Makefile.in18
-rw-r--r--scilab/modules/optimization/macros/datafit.sci6
-rw-r--r--scilab/modules/optimization/src/c/optimization.vcproj18
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f.vfproj16
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_sourcefortran1.dia.ref (renamed from scilab/modules/optimization/tests/unit_tests/optim_sourcefortran1.win.dia.ref)9
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_sourcefortran1.tst3
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_sourcefortran1.unix.dia.ref141
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_sourcefortran2.dia.ref10
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_sourcefortran2.tst3
-rw-r--r--scilab/modules/optimization/tests/unit_tests/optim_sourcefortran2.win.dia.ref163
-rw-r--r--scilab/modules/output_stream/Makefile.am2
-rw-r--r--scilab/modules/output_stream/Makefile.in2
-rw-r--r--scilab/modules/output_stream/includes/do_error_number.h (renamed from scilab/modules/output_stream/includes/error.h)0
-rw-r--r--scilab/modules/output_stream/src/c/error.c2
-rw-r--r--scilab/modules/output_stream/src/c/msgs.c2
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcproj10
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_2792.dia.ref12
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_2792.tst13
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_2812.dia.ref14
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_2812.tst18
-rw-r--r--scilab/modules/overloading/macros/%c_mclose.sci22
-rw-r--r--scilab/modules/overloading/macros/%hm_ones.sci10
-rw-r--r--scilab/modules/overloading/macros/%hm_rand.sci30
-rw-r--r--scilab/modules/overloading/macros/%hm_zeros.sci11
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_4266.dia.ref41
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_4266.tst48
-rwxr-xr-xscilab/modules/parameters/macros/add_param.sci3
-rw-r--r--scilab/modules/polynomials/Makefile.am9
-rw-r--r--scilab/modules/polynomials/Makefile.in18
-rw-r--r--scilab/modules/polynomials/src/c/polynomials.vcproj16
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.vfproj8
-rw-r--r--scilab/modules/pvm/LibScilab_Import.def2
-rw-r--r--scilab/modules/pvm/Makefile.am2
-rw-r--r--scilab/modules/pvm/Makefile.in2
-rw-r--r--scilab/modules/pvm/pvm.vcproj28
-rw-r--r--scilab/modules/pvm/src/nopvm/nopvm.vcproj10
-rw-r--r--scilab/modules/randlib/src/c/randlib.vcproj22
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f.vfproj16
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.vcproj10
-rw-r--r--scilab/modules/renderer/includes/GetJavaProperty.h5
-rw-r--r--scilab/modules/renderer/includes/SetJavaProperty.h9
-rw-r--r--scilab/modules/renderer/renderer.vcproj16
-rw-r--r--scilab/modules/renderer/src/cpp/BuildDrawingObserver.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/DrawingBridge.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/GetJavaProperty.cpp5
-rw-r--r--scilab/modules/renderer/src/cpp/HandleObserverManagement.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/SetJavaProperty.cpp5
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/ConcreteDrawableFigure.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigure.cpp12
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigure.h14
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigureBridge.h15
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigureJavaMapper.cpp10
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigureJavaMapper.hxx4
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigureJoGL.cpp10
-rw-r--r--scilab/modules/renderer/src/cpp/figureDrawing/DrawableFigureJoGL.h14
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutoLogSubticksComputer.cpp1
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutoLogTicksComputer.cpp5
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutomaticTicksComputer.cpp4
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/DrawableSubwin.cpp2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawer.cpp1
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/figureDrawing/DrawableFigureGL.java36
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/figureDrawing/RendererProperties.java19
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/figureDrawing/SciRenderer.java21
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/subwinDrawing/CameraGL.java6
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/CoordinateTransformation.java257
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/glTools/GLTools.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/textRendering/SciTextRenderer.java9
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.cpp36
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.giws.xml5
-rw-r--r--scilab/modules/renderer/src/jni/DrawableFigureGL.hxx6
-rw-r--r--scilab/modules/scicos/.gitignore6
-rw-r--r--scilab/modules/scicos/Makefile.am4
-rw-r--r--scilab/modules/scicos/Makefile.in26
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/buildnewblock.sci38
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.vcproj10
-rw-r--r--scilab/modules/scicos/src/c/scicos.vcproj20
-rw-r--r--scilab/modules/scicos/src/c/scicosclip.c1
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.vfproj16
-rw-r--r--scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj4
-rw-r--r--scilab/modules/scicos/src/modelica_compiler/ReadMe-Windows.txt7
-rw-r--r--scilab/modules/scicos/src/modelica_compiler/makefile.mak66
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj22
-rw-r--r--scilab/modules/scicos/tests/unit_tests/lincos.dia.ref (renamed from scilab/modules/scicos/tests/unit_tests/lincos.unix.dia.ref)10
-rw-r--r--scilab/modules/scicos/tests/unit_tests/lincos.tst1
-rw-r--r--scilab/modules/scicos/tests/unit_tests/lincos.win.dia.ref135
-rw-r--r--scilab/modules/scicos/tests/unit_tests/steadycos.dia.ref (renamed from scilab/modules/scicos/tests/unit_tests/steadycos.unix.dia.ref)10
-rw-r--r--scilab/modules/scicos/tests/unit_tests/steadycos.tst2
-rw-r--r--scilab/modules/scicos/tests/unit_tests/steadycos.win.dia.ref134
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am8
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in20
-rw-r--r--scilab/modules/scicos_blocks/includes/affich.h2
-rw-r--r--scilab/modules/scicos_blocks/src/c/LibScilab_Import.def2
-rw-r--r--scilab/modules/scicos_blocks/src/c/fileio_Import.def3
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj22
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj16
-rw-r--r--scilab/modules/scipad/changelog.txt19
-rwxr-xr-xscilab/modules/scipad/macros/scipad_internals/dynamickeywords.sce19
-rw-r--r--scilab/modules/scipad/tcl/colorize.tcl48
-rw-r--r--scilab/modules/scipad/tcl/defaults.tcl6
-rw-r--r--scilab/modules/scipad/tcl/filecommands.tcl41
-rw-r--r--scilab/modules/scipad/tcl/findinfiles.tcl28
-rw-r--r--scilab/modules/scipad/tcl/mainwindow.tcl4
-rw-r--r--scilab/modules/scipad/tcl/scipad.tcl4
-rw-r--r--scilab/modules/scipad/tcl/scipaddebug1.tcl118
-rw-r--r--scilab/modules/scipad/tcl/tkdndtools.tcl4
-rw-r--r--scilab/modules/scipad/version.xml2
-rw-r--r--scilab/modules/shell/src/c/GetCommandLine.c6
-rw-r--r--scilab/modules/shell/src/c/shell.vcproj10
-rw-r--r--scilab/modules/shell/src/c/windows/TermConsole.c30
-rw-r--r--scilab/modules/shell/src/c/windows/TermLine.c1
-rw-r--r--scilab/modules/signal_processing/Makefile.am9
-rw-r--r--scilab/modules/signal_processing/Makefile.in16
-rw-r--r--scilab/modules/signal_processing/help/en_US/remez.xml151
-rw-r--r--scilab/modules/signal_processing/help/en_US/syredi.xml96
-rw-r--r--scilab/modules/signal_processing/macros/filter.sci53
-rw-r--r--scilab/modules/signal_processing/sci_gateway/fortran/sci_remez.f9
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.vcproj18
-rw-r--r--scilab/modules/signal_processing/src/fortran/remez.f14
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj12
-rw-r--r--scilab/modules/signal_processing/tests/nonreg_tests/bug_4249.dia.ref15
-rw-r--r--scilab/modules/signal_processing/tests/nonreg_tests/bug_4249.tst17
-rwxr-xr-xscilab/modules/simulated_annealing/demos/SAIsing2ddemo.sce7
-rw-r--r--scilab/modules/simulated_annealing/demos/simulated_annealing.dem.gateway.sce11
-rw-r--r--scilab/modules/simulated_annealing/etc/simulated_annealing.start5
-rw-r--r--scilab/modules/sound/LibScilab_Import.def1
-rw-r--r--scilab/modules/sound/Makefile.am3
-rw-r--r--scilab/modules/sound/Makefile.in3
-rw-r--r--scilab/modules/sound/sound.vcproj18
-rw-r--r--scilab/modules/sound/src/nosound/nosound.vcproj10
-rw-r--r--scilab/modules/sparse/Makefile.am7
-rw-r--r--scilab/modules/sparse/Makefile.in19
-rw-r--r--scilab/modules/sparse/src/c/sparse.vcproj16
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.vfproj16
-rw-r--r--scilab/modules/special_functions/Makefile.am3
-rw-r--r--scilab/modules/special_functions/Makefile.in15
-rw-r--r--scilab/modules/special_functions/help/en_US/bessel.xml178
-rw-r--r--scilab/modules/special_functions/help/en_US/beta.xml79
-rw-r--r--scilab/modules/special_functions/help/en_US/dlgamma.xml63
-rw-r--r--scilab/modules/special_functions/help/en_US/erf.xml67
-rw-r--r--scilab/modules/special_functions/help/en_US/erfc.xml67
-rw-r--r--scilab/modules/special_functions/help/en_US/erfcx.xml56
-rw-r--r--scilab/modules/special_functions/help/en_US/gamma.xml66
-rw-r--r--scilab/modules/special_functions/help/en_US/gammaln.xml47
-rw-r--r--scilab/modules/special_functions/help/en_US/legendre.xml152
-rw-r--r--scilab/modules/special_functions/help/en_US/oldbessel.xml136
-rw-r--r--scilab/modules/special_functions/help/fr_FR/dlgamma.xml68
-rw-r--r--scilab/modules/special_functions/help/fr_FR/erf.xml73
-rw-r--r--scilab/modules/special_functions/help/fr_FR/erfc.xml76
-rw-r--r--scilab/modules/special_functions/help/fr_FR/erfcx.xml67
-rw-r--r--scilab/modules/special_functions/help/fr_FR/gammaln.xml61
-rw-r--r--scilab/modules/special_functions/help/mml/bessel_equation1.mml71
-rw-r--r--scilab/modules/special_functions/help/mml/bessel_equation2.mml71
-rw-r--r--scilab/modules/special_functions/help/mml/bessel_equation3.mml98
-rw-r--r--scilab/modules/special_functions/help/mml/beta_equation1.mml94
-rw-r--r--scilab/modules/special_functions/help/mml/dlgamma_equation1.mml58
-rw-r--r--scilab/modules/special_functions/help/mml/erf_equation1.mml45
-rw-r--r--scilab/modules/special_functions/help/mml/erfc_equation1.mml74
-rw-r--r--scilab/modules/special_functions/help/mml/erfcx_equation1.mml67
-rw-r--r--scilab/modules/special_functions/help/mml/gamma_equation1.mml50
-rw-r--r--scilab/modules/special_functions/help/mml/legendre_equation1.mml77
-rw-r--r--scilab/modules/special_functions/help/mml/legendre_equation2.mml113
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcproj20
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.vfproj8
-rw-r--r--scilab/modules/spreadsheet/LibScilab_Import.def1
-rw-r--r--scilab/modules/spreadsheet/Makefile.am4
-rw-r--r--scilab/modules/spreadsheet/Makefile.in4
-rw-r--r--scilab/modules/spreadsheet/spreadsheet.vcproj18
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj10
-rw-r--r--scilab/modules/statistics/Makefile.am5
-rw-r--r--scilab/modules/statistics/Makefile.in13
-rw-r--r--scilab/modules/statistics/src/c/statistics.vcproj18
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_DLL.vfproj8
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_DLL_f2c.vcproj8
-rw-r--r--scilab/modules/string/src/c/string.vcproj26
-rw-r--r--scilab/modules/string/src/fortran/string_f.vfproj16
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.vcproj18
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.vfproj16
-rw-r--r--scilab/modules/tclsci/src/notclsci/notclsci.vcproj10
-rw-r--r--scilab/modules/tclsci/tclsci.vcproj62
-rw-r--r--scilab/modules/time/help/fr_FR/timer.xml2
-rw-r--r--scilab/modules/time/sci_gateway/c/sci_timer.c54
-rw-r--r--scilab/modules/time/src/c/timer.c87
-rw-r--r--scilab/modules/time/src/c/timer.h45
-rw-r--r--scilab/modules/time/tests/nonreg_tests/bug_1628.tst41
-rw-r--r--scilab/modules/time/time.vcproj14
-rw-r--r--scilab/modules/umfpack/Makefile.am8
-rw-r--r--scilab/modules/umfpack/Makefile.in24
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.vcproj10
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj10
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.vcproj21
-rw-r--r--scilab/modules/windows_tools/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.vcproj19
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/console_main.c1
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj18
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c1
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.vcproj18
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcproj10
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_3992.tst30
818 files changed, 17795 insertions, 8757 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index bcfb844..5fe9ec3 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -16,8 +16,8 @@ arnoldi \
16elementary_functions \ 16elementary_functions \
17string \ 17string \
18dynamic_link \ 18dynamic_link \
19history_manager \
20fileio \ 19fileio \
20history_manager \
21spreadsheet \ 21spreadsheet \
22tclsci \ 22tclsci \
23localization \ 23localization \
@@ -103,15 +103,7 @@ libscilab_la_rootdir = $(mydatadir)
103pkglib_LTLIBRARIES = libscilab.la 103pkglib_LTLIBRARIES = libscilab.la
104libscilab_la_SOURCES = 104libscilab_la_SOURCES =
105 105
106libscilab_la_LDFLAGS = 106libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
107
108if ! USE_EMBEDDED_LAPACK
109libscilab_la_LDFLAGS += $(LAPACK_LIBS)
110endif
111
112if ! USE_EMBEDDED_BLAS
113libscilab_la_LDFLAGS += $(BLAS_LIBS)
114endif
115 107
116ALL_LIBS= $(top_builddir)/modules/fileio/libscifileio.la \ 108ALL_LIBS= $(top_builddir)/modules/fileio/libscifileio.la \
117$(top_builddir)/modules/mexlib/libmex.la \ 109$(top_builddir)/modules/mexlib/libmex.la \
@@ -193,13 +185,3 @@ $(top_builddir)/libs/hashtable/libscihashtable.la \
193$(top_builddir)/libs/MALLOC/libscimalloc.la \ 185$(top_builddir)/libs/MALLOC/libscimalloc.la \
194$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \ 186$(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
195$(top_builddir)/libs/libst/libscilibst.la 187$(top_builddir)/libs/libst/libscilibst.la
196
197if USE_EMBEDDED_BLAS
198# Use the blas provided into the Scilab tarball
199libscilab_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
200endif
201
202if USE_EMBEDDED_LAPACK
203# Use the lapack provided into the Scilab tarball
204libscilab_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
205endif
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 4da0acb..a3ca201 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -50,16 +50,8 @@ host_triplet = @host@
50# javasci should be compile at the end because it needs libscilab.la 50# javasci should be compile at the end because it needs libscilab.la
51# Don't forget that the order in subdirs does matter !!! 51# Don't forget that the order in subdirs does matter !!!
52@JAVASCI_TRUE@am__append_2 = javasci 52@JAVASCI_TRUE@am__append_2 = javasci
53@USE_EMBEDDED_LAPACK_FALSE@am__append_3 = $(LAPACK_LIBS) 53@ENABLE_STATIC_TRUE@am__append_3 = $(ALL_LIBS)
54@USE_EMBEDDED_BLAS_FALSE@am__append_4 = $(BLAS_LIBS) 54@SCICOS_TRUE@am__append_4 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
55@ENABLE_STATIC_TRUE@am__append_5 = $(ALL_LIBS)
56@SCICOS_TRUE@am__append_6 = $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la
57
58# Use the blas provided into the Scilab tarball
59@USE_EMBEDDED_BLAS_TRUE@am__append_7 = $(top_builddir)/libs/blas/libsciblas.la
60
61# Use the lapack provided into the Scilab tarball
62@USE_EMBEDDED_LAPACK_TRUE@am__append_8 = $(top_builddir)/libs/lapack/libscilapack.la
63subdir = modules 55subdir = modules
64DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 56DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 57ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -89,17 +81,16 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
89am__installdirs = "$(DESTDIR)$(pkglibdir)" 81am__installdirs = "$(DESTDIR)$(pkglibdir)"
90pkglibLTLIBRARIES_INSTALL = $(INSTALL) 82pkglibLTLIBRARIES_INSTALL = $(INSTALL)
91LTLIBRARIES = $(pkglib_LTLIBRARIES) 83LTLIBRARIES = $(pkglib_LTLIBRARIES)
92libscilab_la_DEPENDENCIES = $(ALL_LIBS) $(am__append_5) \ 84libscilab_la_DEPENDENCIES = $(ALL_LIBS) $(am__append_3) \
93 $(top_builddir)/modules/string/libscistring.la \ 85 $(top_builddir)/modules/string/libscistring.la \
94 $(top_builddir)/modules/fftw/libscifftw.la \ 86 $(top_builddir)/modules/fftw/libscifftw.la \
95 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 87 $(top_builddir)/modules/umfpack/libsciumfpack.la \
96 $(top_builddir)/modules/jvm/libscijvm.la \ 88 $(top_builddir)/modules/jvm/libscijvm.la \
97 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_6) \ 89 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_4) \
98 $(top_builddir)/libs/hashtable/libscihashtable.la \ 90 $(top_builddir)/libs/hashtable/libscihashtable.la \
99 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 91 $(top_builddir)/libs/MALLOC/libscimalloc.la \
100 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \ 92 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
101 $(top_builddir)/libs/libst/libscilibst.la $(am__append_7) \ 93 $(top_builddir)/libs/libst/libscilibst.la
102 $(am__append_8)
103am_libscilab_la_OBJECTS = 94am_libscilab_la_OBJECTS =
104libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS) 95libscilab_la_OBJECTS = $(am_libscilab_la_OBJECTS)
105libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ 96libscilab_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -129,8 +120,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
129ETAGS = etags 120ETAGS = etags
130CTAGS = ctags 121CTAGS = ctags
131DIST_SUBDIRS = core output_stream action_binding arnoldi \ 122DIST_SUBDIRS = core output_stream action_binding arnoldi \
132 elementary_functions string dynamic_link history_manager \ 123 elementary_functions string dynamic_link fileio \
133 fileio spreadsheet tclsci localization renderer shell \ 124 history_manager spreadsheet tclsci localization renderer shell \
134 completion console graphic_export gui jvm graphics \ 125 completion console graphic_export gui jvm graphics \
135 optimization symbolic randlib statistics special_functions \ 126 optimization symbolic randlib statistics special_functions \
136 interpolation linear_algebra integer data_structures mexlib \ 127 interpolation linear_algebra integer data_structures mexlib \
@@ -339,8 +330,8 @@ top_srcdir = @top_srcdir@
339# core is the main module of Scilab. All the compilation deps has been removed 330# core is the main module of Scilab. All the compilation deps has been removed
340# since it already linked almost the whole world 331# since it already linked almost the whole world
341SUBDIRS = core output_stream action_binding arnoldi \ 332SUBDIRS = core output_stream action_binding arnoldi \
342 elementary_functions string dynamic_link history_manager \ 333 elementary_functions string dynamic_link fileio \
343 fileio spreadsheet tclsci localization renderer shell \ 334 history_manager spreadsheet tclsci localization renderer shell \
344 completion console graphic_export gui jvm graphics \ 335 completion console graphic_export gui jvm graphics \
345 optimization symbolic randlib statistics special_functions \ 336 optimization symbolic randlib statistics special_functions \
346 interpolation linear_algebra integer data_structures mexlib \ 337 interpolation linear_algebra integer data_structures mexlib \
@@ -359,7 +350,7 @@ libscilab_la_rootdir = $(mydatadir)
359# 350#
360pkglib_LTLIBRARIES = libscilab.la 351pkglib_LTLIBRARIES = libscilab.la
361libscilab_la_SOURCES = 352libscilab_la_SOURCES =
362libscilab_la_LDFLAGS = $(am__append_3) $(am__append_4) 353libscilab_la_LDFLAGS = $(LAPACK_LIBS) $(BLAS_LIBS)
363ALL_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \ 354ALL_LIBS = $(top_builddir)/modules/fileio/libscifileio.la \
364$(top_builddir)/modules/mexlib/libmex.la \ 355$(top_builddir)/modules/mexlib/libmex.la \
365 $(top_builddir)/modules/boolean/libsciboolean.la \ 356 $(top_builddir)/modules/boolean/libsciboolean.la \
@@ -417,17 +408,16 @@ $(top_builddir)/modules/mexlib/libmex.la \
417#if MPI 408#if MPI
418#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la 409#libscilab_la_LIBADD += $(top_builddir)/modules/mpi/libscimpi.la
419#endif 410#endif
420libscilab_la_LIBADD = $(ALL_LIBS) $(am__append_5) \ 411libscilab_la_LIBADD = $(ALL_LIBS) $(am__append_3) \
421 $(top_builddir)/modules/string/libscistring.la \ 412 $(top_builddir)/modules/string/libscistring.la \
422 $(top_builddir)/modules/fftw/libscifftw.la \ 413 $(top_builddir)/modules/fftw/libscifftw.la \
423 $(top_builddir)/modules/umfpack/libsciumfpack.la \ 414 $(top_builddir)/modules/umfpack/libsciumfpack.la \
424 $(top_builddir)/modules/jvm/libscijvm.la \ 415 $(top_builddir)/modules/jvm/libscijvm.la \
425 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_6) \ 416 $(top_builddir)/modules/scicos/libsciscicos.la $(am__append_4) \
426 $(top_builddir)/libs/hashtable/libscihashtable.la \ 417 $(top_builddir)/libs/hashtable/libscihashtable.la \
427 $(top_builddir)/libs/MALLOC/libscimalloc.la \ 418 $(top_builddir)/libs/MALLOC/libscimalloc.la \
428 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \ 419 $(top_builddir)/libs/doublylinkedlist/libscidoublylinkedlist.la \
429 $(top_builddir)/libs/libst/libscilibst.la $(am__append_7) \ 420 $(top_builddir)/libs/libst/libscilibst.la
430 $(am__append_8)
431all: all-recursive 421all: all-recursive
432 422
433.SUFFIXES: 423.SUFFIXES:
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcproj b/scilab/modules/action_binding/src/c/action_binding.vcproj
index 1b24b11..0ec0e13 100644
--- a/scilab/modules/action_binding/src/c/action_binding.vcproj
+++ b/scilab/modules/action_binding/src/c/action_binding.vcproj
@@ -48,7 +48,7 @@
48 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED" 48 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED"
49 MinimalRebuild="true" 49 MinimalRebuild="true"
50 BasicRuntimeChecks="0" 50 BasicRuntimeChecks="0"
51 RuntimeLibrary="1" 51 RuntimeLibrary="3"
52 UsePrecompiledHeader="0" 52 UsePrecompiledHeader="0"
53 WarningLevel="3" 53 WarningLevel="3"
54 Detect64BitPortabilityProblems="false" 54 Detect64BitPortabilityProblems="false"
@@ -67,7 +67,6 @@
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCLinkerTool" 69 Name="VCLinkerTool"
70 AdditionalOptions="/fixed:no"
71 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib" 70 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib"
72 OutputFile="../../../../bin/sciaction_binding.dll" 71 OutputFile="../../../../bin/sciaction_binding.dll"
73 LinkIncremental="1" 72 LinkIncremental="1"
@@ -133,7 +132,7 @@
133 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED" 132 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED"
134 MinimalRebuild="true" 133 MinimalRebuild="true"
135 BasicRuntimeChecks="0" 134 BasicRuntimeChecks="0"
136 RuntimeLibrary="1" 135 RuntimeLibrary="3"
137 UsePrecompiledHeader="0" 136 UsePrecompiledHeader="0"
138 WarningLevel="3" 137 WarningLevel="3"
139 Detect64BitPortabilityProblems="false" 138 Detect64BitPortabilityProblems="false"
@@ -152,7 +151,6 @@
152 /> 151 />
153 <Tool 152 <Tool
154 Name="VCLinkerTool" 153 Name="VCLinkerTool"
155 AdditionalOptions="/fixed:no"
156 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib" 154 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib"
157 OutputFile="../../../../bin/sciaction_binding.dll" 155 OutputFile="../../../../bin/sciaction_binding.dll"
158 LinkIncremental="1" 156 LinkIncremental="1"
@@ -219,7 +217,7 @@
219 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 217 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
220 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED" 218 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED"
221 StringPooling="true" 219 StringPooling="true"
222 RuntimeLibrary="0" 220 RuntimeLibrary="2"
223 EnableEnhancedInstructionSet="0" 221 EnableEnhancedInstructionSet="0"
224 UsePrecompiledHeader="0" 222 UsePrecompiledHeader="0"
225 WarningLevel="3" 223 WarningLevel="3"
@@ -309,7 +307,7 @@
309 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl" 307 AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"
310 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED" 308 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS;STATIC_LINKED"
311 StringPooling="true" 309 StringPooling="true"
312 RuntimeLibrary="0" 310 RuntimeLibrary="2"
313 EnableEnhancedInstructionSet="0" 311 EnableEnhancedInstructionSet="0"
314 UsePrecompiledHeader="0" 312 UsePrecompiledHeader="0"
315 WarningLevel="3" 313 WarningLevel="3"
diff --git a/scilab/modules/action_binding/src/c/dynamic_menus.c b/scilab/modules/action_binding/src/c/dynamic_menus.c
index 04528e4..96f5153 100644
--- a/scilab/modules/action_binding/src/c/dynamic_menus.c
+++ b/scilab/modules/action_binding/src/c/dynamic_menus.c
@@ -53,7 +53,7 @@ IMPORT_SIGNAL __threadSignal LaunchScilab;
53 53
54/*--------------------------------------------------------------------------*/ 54/*--------------------------------------------------------------------------*/
55static CommandRec *commandQueue = NULL; 55static CommandRec *commandQueue = NULL;
56static __threadLock commandQueueSingleAccess; 56static __threadLock commandQueueSingleAccess = __StaticInitLock;
57 57
58/*--------------------------------------------------------------------------*/ 58/*--------------------------------------------------------------------------*/
59int StoreCommand ( char *command) 59int StoreCommand ( char *command)
diff --git a/scilab/modules/arnoldi/Makefile.am b/scilab/modules/arnoldi/Makefile.am
index 3cabfcf..828b353 100644
--- a/scilab/modules/arnoldi/Makefile.am
+++ b/scilab/modules/arnoldi/Makefile.am
@@ -82,14 +82,6 @@ INCLUDE_FLAGS = $(libsciarnoldi_la_CFLAGS)
82 82
83libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la 83libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la
84 84
85if USE_EMBEDDED_LAPACK
86libsciarnoldi_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
87endif
88
89if USE_EMBEDDED_BLAS
90libsciarnoldi_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
91endif
92
93#### Target ###### 85#### Target ######
94modulename=arnoldi 86modulename=arnoldi
95 87
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 2697674..24d21a6 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -55,12 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libsciarnoldi_la_include_HEADERS) \ 58DIST_COMMON = $(libsciarnoldi_la_include_HEADERS) \
61 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
63@NEED_JAVA_TRUE@am__append_3 = java 61@NEED_JAVA_TRUE@am__append_1 = java
64subdir = modules/arnoldi 62subdir = modules/arnoldi
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
66am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -94,8 +92,7 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
94pkglibLTLIBRARIES_INSTALL = $(INSTALL) 92pkglibLTLIBRARIES_INSTALL = $(INSTALL)
95LTLIBRARIES = $(pkglib_LTLIBRARIES) 93LTLIBRARIES = $(pkglib_LTLIBRARIES)
96libsciarnoldi_la_DEPENDENCIES = \ 94libsciarnoldi_la_DEPENDENCIES = \
97 $(top_builddir)/modules/core/libscicore.la $(am__append_1) \ 95 $(top_builddir)/modules/core/libscicore.la
98 $(am__append_2)
99am__objects_1 = libsciarnoldi_la-dsconv.lo libsciarnoldi_la-dsortc.lo \ 96am__objects_1 = libsciarnoldi_la-dsconv.lo libsciarnoldi_la-dsortc.lo \
100 libsciarnoldi_la-dsaup2.lo libsciarnoldi_la-dneigh.lo \ 97 libsciarnoldi_la-dsaup2.lo libsciarnoldi_la-dneigh.lo \
101 libsciarnoldi_la-znaupd.lo libsciarnoldi_la-dsesrt.lo \ 98 libsciarnoldi_la-znaupd.lo libsciarnoldi_la-dsesrt.lo \
@@ -427,8 +424,7 @@ libsciarnoldi_la_SOURCES = $(ARNOLDI_FORTRAN_SOURCES) $(GATEWAY_C_SOURCES)
427# For the code check (splint) 424# For the code check (splint)
428CHECK_SRC = $(GATEWAY_C_SOURCES) 425CHECK_SRC = $(GATEWAY_C_SOURCES)
429INCLUDE_FLAGS = $(libsciarnoldi_la_CFLAGS) 426INCLUDE_FLAGS = $(libsciarnoldi_la_CFLAGS)
430libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la \ 427libsciarnoldi_la_LIBADD = $(top_builddir)/modules/core/libscicore.la
431 $(am__append_1) $(am__append_2)
432 428
433#### Target ###### 429#### Target ######
434modulename = arnoldi 430modulename = arnoldi
@@ -460,7 +456,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
460#### the procedure will be the same with Microsoft Windows (C) 456#### the procedure will be the same with Microsoft Windows (C)
461#### and Linux/Unix 457#### and Linux/Unix
462####################################################################### 458#######################################################################
463TARGETS_ALL = $(am__append_3) 459TARGETS_ALL = $(am__append_1)
464 460
465################ MACROS ###################### 461################ MACROS ######################
466# Rule to build a macro 462# Rule to build a macro
diff --git a/scilab/modules/arnoldi/arnoldi.vcproj b/scilab/modules/arnoldi/arnoldi.vcproj
index 292c152..afe1161 100644
--- a/scilab/modules/arnoldi/arnoldi.vcproj
+++ b/scilab/modules/arnoldi/arnoldi.vcproj
@@ -48,7 +48,7 @@
48 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 48 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
49 MinimalRebuild="true" 49 MinimalRebuild="true"
50 BasicRuntimeChecks="0" 50 BasicRuntimeChecks="0"
51 RuntimeLibrary="1" 51 RuntimeLibrary="3"
52 UsePrecompiledHeader="0" 52 UsePrecompiledHeader="0"
53 WarningLevel="3" 53 WarningLevel="3"
54 Detect64BitPortabilityProblems="false" 54 Detect64BitPortabilityProblems="false"
@@ -67,7 +67,6 @@
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCLinkerTool" 69 Name="VCLinkerTool"
70 AdditionalOptions="/fixed:no"
71 AdditionalDependencies="LibScilab.lib" 70 AdditionalDependencies="LibScilab.lib"
72 OutputFile="../../bin/$(ProjectName).dll" 71 OutputFile="../../bin/$(ProjectName).dll"
73 LinkIncremental="1" 72 LinkIncremental="1"
@@ -132,7 +131,7 @@
132 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 131 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
133 MinimalRebuild="true" 132 MinimalRebuild="true"
134 BasicRuntimeChecks="0" 133 BasicRuntimeChecks="0"
135 RuntimeLibrary="1" 134 RuntimeLibrary="3"
136 UsePrecompiledHeader="0" 135 UsePrecompiledHeader="0"
137 WarningLevel="3" 136 WarningLevel="3"
138 Detect64BitPortabilityProblems="false" 137 Detect64BitPortabilityProblems="false"
@@ -151,7 +150,6 @@
151 /> 150 />
152 <Tool 151 <Tool
153 Name="VCLinkerTool" 152 Name="VCLinkerTool"
154 AdditionalOptions="/fixed:no"
155 AdditionalDependencies="LibScilab.lib" 153 AdditionalDependencies="LibScilab.lib"
156 OutputFile="../../bin/$(ProjectName).dll" 154 OutputFile="../../bin/$(ProjectName).dll"
157 LinkIncremental="1" 155 LinkIncremental="1"
@@ -217,7 +215,7 @@
217 AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes" 215 AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes"
218 PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 216 PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
219 StringPooling="true" 217 StringPooling="true"
220 RuntimeLibrary="0" 218 RuntimeLibrary="2"
221 EnableFunctionLevelLinking="true" 219 EnableFunctionLevelLinking="true"
222 EnableEnhancedInstructionSet="0" 220 EnableEnhancedInstructionSet="0"
223 UsePrecompiledHeader="0" 221 UsePrecompiledHeader="0"
@@ -308,7 +306,7 @@
308 AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes" 306 AdditionalIncludeDirectories="includes;src;../core/includes;../output_stream/includes;../../libs/intl;../../libs/MALLOC/includes"
309 PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 307 PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;ARNOLDI_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
310 StringPooling="true" 308 StringPooling="true"
311 RuntimeLibrary="0" 309 RuntimeLibrary="2"
312 EnableFunctionLevelLinking="true" 310 EnableFunctionLevelLinking="true"
313 EnableEnhancedInstructionSet="0" 311 EnableEnhancedInstructionSet="0"
314 UsePrecompiledHeader="0" 312 UsePrecompiledHeader="0"
diff --git a/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL.vfproj b/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL.vfproj
index 6e16265..d74ec5b 100644
--- a/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL.vfproj
+++ b/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL.vfproj
@@ -5,8 +5,8 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll /iface:cref,nomixed_str_len_arg" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" F77RuntimeCompatibility="true" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/iface:cref,nomixed_str_len_arg" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" F77RuntimeCompatibility="true" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="msvcrtd.lib" ModuleDefinitionFile="../../../../../bin/arpack.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true" AdditionalDependencies="libcmtd.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="../../../../../bin/arpack.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
12 <Tool Name="VFCustomBuildTool"/> 12 <Tool Name="VFCustomBuildTool"/>
@@ -21,8 +21,8 @@ del *.def &gt;nul
21cd.. &gt;nul"/> 21cd.. &gt;nul"/>
22 <Tool Name="VFPostBuildEventTool"/></Configuration> 22 <Tool Name="VFPostBuildEventTool"/></Configuration>
23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
24 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll /iface:cref,nomixed_str_len_arg /compile_only" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" BackslashAsNormalCharacter="false" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/"/> 24 <Tool Name="VFFortranCompilerTool" AdditionalOptions=" /iface:cref,nomixed_str_len_arg /compile_only" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" BackslashAsNormalCharacter="false" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
25 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="msvcrt.lib" ModuleDefinitionFile="../../../../../bin/arpack.def" SubSystem="subSystemWindows" SupportUnloadOfDelayLoadedDLL="true" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true" AdditionalDependencies="libcmt.lib"/> 25 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="../../../../../bin/arpack.def" SubSystem="subSystemWindows" SupportUnloadOfDelayLoadedDLL="true" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>
27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
28 <Tool Name="VFCustomBuildTool"/> 28 <Tool Name="VFCustomBuildTool"/>
@@ -37,8 +37,8 @@ del *.def &gt;nul
37cd.. &gt;nul"/> 37cd.. &gt;nul"/>
38 <Tool Name="VFPostBuildEventTool"/></Configuration> 38 <Tool Name="VFPostBuildEventTool"/></Configuration>
39 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 39 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
40 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll /iface:cref,nomixed_str_len_arg" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" F77RuntimeCompatibility="true" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 40 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/iface:cref,nomixed_str_len_arg" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" F77RuntimeCompatibility="true" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
41 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="msvcrtd.lib" ModuleDefinitionFile="../../../../../bin/arpack.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true" AdditionalDependencies="libcmtd.lib"/> 41 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="../../../../../bin/arpack.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true"/>
42 <Tool Name="VFResourceCompilerTool"/> 42 <Tool Name="VFResourceCompilerTool"/>
43 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 43 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
44 <Tool Name="VFCustomBuildTool"/> 44 <Tool Name="VFCustomBuildTool"/>
@@ -53,8 +53,8 @@ del *.def &gt;nul
53cd.. &gt;nul"/> 53cd.. &gt;nul"/>
54 <Tool Name="VFPostBuildEventTool"/></Configuration> 54 <Tool Name="VFPostBuildEventTool"/></Configuration>
55 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 55 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
56 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll /iface:cref,nomixed_str_len_arg /compile_only" SuppressStartupBanner="true" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" BackslashAsNormalCharacter="false" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/"/> 56 <Tool Name="VFFortranCompilerTool" AdditionalOptions=" /iface:cref,nomixed_str_len_arg /compile_only" SuppressStartupBanner="true" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" BackslashAsNormalCharacter="false" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
57 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" IgnoreDefaultLibraryNames="msvcrt.lib" ModuleDefinitionFile="../../../../../bin/arpack.def" SubSystem="subSystemWindows" SupportUnloadOfDelayLoadedDLL="true" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true" AdditionalDependencies="libcmt.lib"/> 57 <Tool Name="VFLinkerTool" OutputFile="../../../../../bin/arpack.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="../../../../../bin/arpack.def" SubSystem="subSystemWindows" SupportUnloadOfDelayLoadedDLL="true" ImportLibrary="../../../../../bin/arpack.lib" LinkDLL="true"/>
58 <Tool Name="VFResourceCompilerTool"/> 58 <Tool Name="VFResourceCompilerTool"/>
59 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 59 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
60 <Tool Name="VFCustomBuildTool"/> 60 <Tool Name="VFCustomBuildTool"/>
diff --git a/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj b/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj
index 8bc840c..eb764fa 100644
--- a/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj
+++ b/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj
@@ -58,10 +58,10 @@
58 ExecutionBucket="6" 58 ExecutionBucket="6"
59 Optimization="0" 59 Optimization="0"
60 AdditionalIncludeDirectories="../../../../../libs/f2c" 60 AdditionalIncludeDirectories="../../../../../libs/f2c"
61 PreprocessorDefinitions="STRICT;__STDC__;_CRT_SECURE_NO_DEPRECATE" 61 PreprocessorDefinitions="__STDC__;_CRT_SECURE_NO_DEPRECATE"
62 MinimalRebuild="true" 62 MinimalRebuild="true"
63 BasicRuntimeChecks="0" 63 BasicRuntimeChecks="0"
64 RuntimeLibrary="1" 64 RuntimeLibrary="3"
65 UsePrecompiledHeader="0" 65 UsePrecompiledHeader="0"
66 ObjectFile="$(ConfigurationName)/" 66 ObjectFile="$(ConfigurationName)/"
67 ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb" 67 ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"
@@ -154,10 +154,10 @@
154 Name="VCCLCompilerTool" 154 Name="VCCLCompilerTool"
155 Optimization="0" 155 Optimization="0"
156 AdditionalIncludeDirectories="../../../../../libs/f2c" 156 AdditionalIncludeDirectories="../../../../../libs/f2c"
157 PreprocessorDefinitions="STRICT;__STDC__;_CRT_SECURE_NO_DEPRECATE" 157 PreprocessorDefinitions="__STDC__;_CRT_SECURE_NO_DEPRECATE"
158 MinimalRebuild="true" 158 MinimalRebuild="true"
159 BasicRuntimeChecks="0" 159 BasicRuntimeChecks="0"
160 RuntimeLibrary="1" 160 RuntimeLibrary="3"
161 UsePrecompiledHeader="0" 161 UsePrecompiledHeader="0"
162 ObjectFile="$(ConfigurationName)/" 162 ObjectFile="$(ConfigurationName)/"
163 ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb" 163 ProgramDataBaseFileName="$(ConfigurationName)/vc80.pdb"
@@ -245,8 +245,8 @@
245 ExecutionBucket="6" 245 ExecutionBucket="6"
246 FavorSizeOrSpeed="1" 246 FavorSizeOrSpeed="1"
247 AdditionalIncludeDirectories="../../../../../libs/f2c" 247 AdditionalIncludeDirectories="../../../../../libs/f2c"
248 PreprocessorDefinitions="STRICT;__STDC__;_CRT_SECURE_NO_DEPRECATE" 248 PreprocessorDefinitions="__STDC__;_CRT_SECURE_NO_DEPRECATE"
249 RuntimeLibrary="0" 249 RuntimeLibrary="2"
250 EnableEnhancedInstructionSet="0" 250 EnableEnhancedInstructionSet="0"
251 UsePrecompiledHeader="0" 251 UsePrecompiledHeader="0"
252 ObjectFile="$(ConfigurationName)/" 252 ObjectFile="$(ConfigurationName)/"
@@ -339,8 +339,8 @@
339 Name="VCCLCompilerTool" 339 Name="VCCLCompilerTool"
340 FavorSizeOrSpeed="1" 340 FavorSizeOrSpeed="1"
341 AdditionalIncludeDirectories="../../../../../libs/f2c" 341 AdditionalIncludeDirectories="../../../../../libs/f2c"
342 PreprocessorDefinitions="STRICT;__STDC__;_CRT_SECURE_NO_DEPRECATE" 342 PreprocessorDefinitions="__STDC__;_CRT_SECURE_NO_DEPRECATE"
343 RuntimeLibrary="0" 343 RuntimeLibrary="2"
344 EnableEnhancedInstructionSet="1" 344 EnableEnhancedInstructionSet="1"
345 UsePrecompiledHeader="0" 345 UsePrecompiledHeader="0"
346 ObjectFile="$(ConfigurationName)/" 346 ObjectFile="$(ConfigurationName)/"
diff --git a/scilab/modules/boolean/Makefile.am b/scilab/modules/boolean/Makefile.am
index 9f76f6b..c3483f5 100644
--- a/scilab/modules/boolean/Makefile.am
+++ b/scilab/modules/boolean/Makefile.am
@@ -37,10 +37,6 @@ libsciboolean_la_LIBADD = \
37 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 37 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
38 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la 38 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
39 39
40if USE_EMBEDDED_BLAS
41libsciboolean_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
42endif
43
44modulename=boolean 40modulename=boolean
45 41
46#### boolean : Conf files #### 42#### boolean : Conf files ####
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index dbde24b..847f3f4 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -55,11 +55,10 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_BLAS_TRUE@am__append_1 = $(top_builddir)/libs/blas/libsciblas.la
59DIST_COMMON = $(libsciboolean_la_include_HEADERS) \ 58DIST_COMMON = $(libsciboolean_la_include_HEADERS) \
60 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 59 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
61 $(top_srcdir)/Makefile.incl.am 60 $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_2 = java 61@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/boolean 62subdir = modules/boolean
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 63ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 64am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -94,8 +93,7 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
94LTLIBRARIES = $(pkglib_LTLIBRARIES) 93LTLIBRARIES = $(pkglib_LTLIBRARIES)
95libsciboolean_la_DEPENDENCIES = \ 94libsciboolean_la_DEPENDENCIES = \
96 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 95 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
97 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 96 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
98 $(am__append_1)
99am__objects_1 = libsciboolean_la-matboolean.lo \ 97am__objects_1 = libsciboolean_la-matboolean.lo \
100 libsciboolean_la-vect_or.lo libsciboolean_la-vect_and.lo 98 libsciboolean_la-vect_or.lo libsciboolean_la-vect_and.lo
101am__objects_2 = logic.lo find.lo 99am__objects_2 = logic.lo find.lo
@@ -360,10 +358,10 @@ libsciboolean_la_SOURCES = $(BOOLEAN_C_SOURCES) $(BOOLEAN_FORTRAN_SOURCES) $(GAT
360# For the code check (splint) 358# For the code check (splint)
361CHECK_SRC = $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES) 359CHECK_SRC = $(BOOLEAN_C_SOURCES) $(GATEWAY_C_SOURCES)
362INCLUDE_FLAGS = $(libsciboolean_la_CFLAGS) 360INCLUDE_FLAGS = $(libsciboolean_la_CFLAGS)
363libsciboolean_la_LIBADD = \ 361libsciboolean_la_LIBADD = \
364 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 362 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
365 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \ 363 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la
366 $(am__append_1) 364
367modulename = boolean 365modulename = boolean
368 366
369#### boolean : Conf files #### 367#### boolean : Conf files ####
@@ -395,7 +393,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
395#### the procedure will be the same with Microsoft Windows (C) 393#### the procedure will be the same with Microsoft Windows (C)
396#### and Linux/Unix 394#### and Linux/Unix
397####################################################################### 395#######################################################################
398TARGETS_ALL = $(am__append_2) 396TARGETS_ALL = $(am__append_1)
399 397
400################ MACROS ###################### 398################ MACROS ######################
401# Rule to build a macro 399# Rule to build a macro
diff --git a/scilab/modules/boolean/src/c/boolean.vcproj b/scilab/modules/boolean/src/c/boolean.vcproj
index a1bbc00..1ba3c21 100644
--- a/scilab/modules/boolean/src/c/boolean.vcproj
+++ b/scilab/modules/boolean/src/c/boolean.vcproj
@@ -47,7 +47,7 @@
47 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 47 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
48 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 48 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
49 BasicRuntimeChecks="0" 49 BasicRuntimeChecks="0"
50 RuntimeLibrary="1" 50 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 51 UsePrecompiledHeader="0"
52 PrecompiledHeaderFile="" 52 PrecompiledHeaderFile=""
53 AssemblerListingLocation="$(ConfigurationName)/" 53 AssemblerListingLocation="$(ConfigurationName)/"
@@ -123,7 +123,7 @@
123 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 123 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
124 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 124 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
125 BasicRuntimeChecks="0" 125 BasicRuntimeChecks="0"
126 RuntimeLibrary="1" 126 RuntimeLibrary="3"
127 UsePrecompiledHeader="0" 127 UsePrecompiledHeader="0"
128 PrecompiledHeaderFile="" 128 PrecompiledHeaderFile=""
129 AssemblerListingLocation="$(ConfigurationName)/" 129 AssemblerListingLocation="$(ConfigurationName)/"
@@ -200,7 +200,7 @@
200 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 200 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
201 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" 201 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
202 StringPooling="true" 202 StringPooling="true"
203 RuntimeLibrary="0" 203 RuntimeLibrary="2"
204 EnableFunctionLevelLinking="true" 204 EnableFunctionLevelLinking="true"
205 EnableEnhancedInstructionSet="0" 205 EnableEnhancedInstructionSet="0"
206 UsePrecompiledHeader="0" 206 UsePrecompiledHeader="0"
@@ -279,7 +279,7 @@
279 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 279 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
280 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" 280 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
281 StringPooling="true" 281 StringPooling="true"
282 RuntimeLibrary="0" 282 RuntimeLibrary="2"
283 EnableFunctionLevelLinking="true" 283 EnableFunctionLevelLinking="true"
284 EnableEnhancedInstructionSet="0" 284 EnableEnhancedInstructionSet="0"
285 UsePrecompiledHeader="0" 285 UsePrecompiledHeader="0"
diff --git a/scilab/modules/boolean/src/fortran/boolean_f.vfproj b/scilab/modules/boolean/src/fortran/boolean_f.vfproj
index 4053293..50956dc 100644
--- a/scilab/modules/boolean/src/fortran/boolean_f.vfproj
+++ b/scilab/modules/boolean/src/fortran/boolean_f.vfproj
@@ -5,7 +5,7 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true"/> 8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true"/>
9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -19,7 +19,7 @@ copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul
19del *.def &gt;nul 19del *.def &gt;nul
20cd .."/></Configuration> 20cd .."/></Configuration>
21 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 21 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
22 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true"/> 22 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
23 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 23 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
24 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/> 24 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/>
25 <Tool Name="VFResourceCompilerTool"/> 25 <Tool Name="VFResourceCompilerTool"/>
@@ -34,7 +34,7 @@ copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul
34del *.def &gt;nul 34del *.def &gt;nul
35cd .."/></Configuration> 35cd .."/></Configuration>
36 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 36 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
37 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true"/> 37 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true"/>
38 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/> 38 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/>
39 <Tool Name="VFResourceCompilerTool"/> 39 <Tool Name="VFResourceCompilerTool"/>
40 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 40 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -48,7 +48,7 @@ copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul
48del *.def &gt;nul 48del *.def &gt;nul
49cd .."/></Configuration> 49cd .."/></Configuration>
50 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 50 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
51 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true"/> 51 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
52 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 52 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
53 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/> 53 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/>
54 <Tool Name="VFResourceCompilerTool"/> 54 <Tool Name="VFResourceCompilerTool"/>
diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index 8eed9d7..c5a5190 100644
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -230,15 +230,6 @@ INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
230libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la 230libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
231 231
232 232
233if USE_EMBEDDED_LAPACK
234libscicacsd_la_LIBADD += $(top_builddir)/libs/lapack/libscilapack.la
235endif
236
237if USE_EMBEDDED_BLAS
238libscicacsd_la_LIBADD += $(top_builddir)/libs/blas/libsciblas.la
239endif
240
241
242#### Target ###### 233#### Target ######
243modulename=cacsd 234modulename=cacsd
244 235
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 0e7b9df..518eb0c 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -55,11 +55,9 @@ PRE_UNINSTALL = :
55POST_UNINSTALL = : 55POST_UNINSTALL = :
56build_triplet = @build@ 56build_triplet = @build@
57host_triplet = @host@ 57host_triplet = @host@
58@USE_EMBEDDED_LAPACK_TRUE@am__append_1 = $(top_builddir)/libs/lapack/libscilapack.la
59@USE_EMBEDDED_BLAS_TRUE@am__append_2 = $(top_builddir)/libs/blas/libsciblas.la
60DIST_COMMON = $(libscicacsd_la_include_HEADERS) $(srcdir)/Makefile.am \ 58DIST_COMMON = $(libscicacsd_la_include_HEADERS) $(srcdir)/Makefile.am \
61 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am 59 $(srcdir)/Makefile.in $(top_srcdir)/Makefile.incl.am
62@NEED_JAVA_TRUE@am__append_3 = java 60@NEED_JAVA_TRUE@am__append_1 = java
63subdir = modules/cacsd 61subdir = modules/cacsd
64ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 62ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 63am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -100,8 +98,7 @@ libscicacsd_la_DEPENDENCIES = $(top_builddir)/modules/mexlib/libmx.la \
100 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \ 98 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
101 $(top_builddir)/modules/mexlib/libmex.la \ 99 $(top_builddir)/modules/mexlib/libmex.la \
102 $(top_builddir)/modules/core/libscicore.la \ 100 $(top_builddir)/modules/core/libscicore.la \
103 $(top_builddir)/modules/output_stream/libscioutput_stream.la \ 101 $(top_builddir)/modules/output_stream/libscioutput_stream.la
104 $(am__append_1) $(am__append_2)
105am__objects_1 = libscicacsd_la-jacl2.lo libscicacsd_la-onface.lo \ 102am__objects_1 = libscicacsd_la-jacl2.lo libscicacsd_la-onface.lo \
106 libscicacsd_la-hhdml.lo libscicacsd_la-tild.lo \ 103 libscicacsd_la-hhdml.lo libscicacsd_la-tild.lo \
107 libscicacsd_la-degl2.lo libscicacsd_la-dqrdc.lo \ 104 libscicacsd_la-degl2.lo libscicacsd_la-dqrdc.lo \
@@ -650,16 +647,7 @@ CHECK_SRC = $(GATEWAY_C_SOURCES)
650INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS) 647INCLUDE_FLAGS = $(libscicacsd_la_CFLAGS)
651 648
652# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la 649# cyclic deps $(top_builddir)/modules/polynomials/libscipolynomials.la
653libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la \ 650libscicacsd_la_LIBADD = $(top_builddir)/modules/mexlib/libmx.la $(top_builddir)/modules/mexlib/libmat.la $(top_builddir)/modules/arnoldi/libsciarnoldi.la $(top_builddir)/modules/elementary_functions/libscielementary_functions.la $(top_builddir)/modules/differential_equations/libscidifferential_equations.la $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la $(top_builddir)/modules/mexlib/libmex.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
654 $(top_builddir)/modules/mexlib/libmat.la \
655 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
656 $(top_builddir)/modules/elementary_functions/libscielementary_functions.la \
657 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
658 $(top_builddir)/modules/linear_algebra/libscilinear_algebra.la \
659 $(top_builddir)/modules/mexlib/libmex.la \
660 $(top_builddir)/modules/core/libscicore.la \
661 $(top_builddir)/modules/output_stream/libscioutput_stream.la \
662 $(am__append_1) $(am__append_2)
663 651
664#### Target ###### 652#### Target ######
665modulename = cacsd 653modulename = cacsd
@@ -696,7 +684,7 @@ SPLINT_OPTIONS = -weak -booltype BOOL
696#### the procedure will be the same with Microsoft Windows (C) 684#### the procedure will be the same with Microsoft Windows (C)
697#### and Linux/Unix 685#### and Linux/Unix
698####################################################################### 686#######################################################################
699TARGETS_ALL = $(am__append_3) 687TARGETS_ALL = $(am__append_1)
700 688
701################ MACROS ###################### 689################ MACROS ######################
702# Rule to build a macro 690# Rule to build a macro
diff --git a/scilab/modules/cacsd/macros/obsvss.sci b/scilab/modules/cacsd/macros/obsvss.sci
index e34e6f3..ba52ae0 100644
--- a/scilab/modules/cacsd/macros/obsvss.sci
+++ b/scilab/modules/cacsd/macros/obsvss.sci
@@ -20,7 +20,7 @@ function [a,b,c]=obsvss(a,b,c,tol)
20 tol = 100*%eps 20 tol = 100*%eps
21 case 4 then , 21 case 4 then ,
22 else 22 else
23 error(msprintf(gettext("%s Wrong number of input arguments: %d or %d expected.\n"),"obsvss",3,4)) 23 error(msprintf(gettext("%s: Wrong number of input arguments: %d or %d expected.\n"),"obsvss",3,4))
24 end; 24 end;
25 case 'state-space' then 25 case 'state-space' then
26 if lhs<>1 then 26 if lhs<>1 then
diff --git a/scilab/modules/cacsd/src/c/cacsd.vcproj b/scilab/modules/cacsd/src/c/cacsd.vcproj
index 4fb44f8..7a3bf3f 100644
--- a/scilab/modules/cacsd/src/c/cacsd.vcproj
+++ b/scilab/modules/cacsd/src/c/cacsd.vcproj
@@ -45,9 +45,9 @@
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 Optimization="0" 46 Optimization="0"
47 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 47 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
48 PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 48 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
49 BasicRuntimeChecks="0" 49 BasicRuntimeChecks="0"
50 RuntimeLibrary="1" 50 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 51 UsePrecompiledHeader="0"
52 PrecompiledHeaderFile="" 52 PrecompiledHeaderFile=""
53 AssemblerListingLocation="$(ConfigurationName)/" 53 AssemblerListingLocation="$(ConfigurationName)/"
@@ -121,9 +121,9 @@
121 Name="VCCLCompilerTool" 121 Name="VCCLCompilerTool"
122 Optimization="0" 122 Optimization="0"
123 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 123 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
124 PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 124 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
125 BasicRuntimeChecks="0" 125 BasicRuntimeChecks="0"
126 RuntimeLibrary="1" 126 RuntimeLibrary="3"
127 UsePrecompiledHeader="0" 127 UsePrecompiledHeader="0"
128 PrecompiledHeaderFile="" 128 PrecompiledHeaderFile=""
129 AssemblerListingLocation="$(ConfigurationName)/" 129 AssemblerListingLocation="$(ConfigurationName)/"
@@ -198,9 +198,9 @@
198 InlineFunctionExpansion="1" 198 InlineFunctionExpansion="1"
199 FavorSizeOrSpeed="1" 199 FavorSizeOrSpeed="1"
200 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 200 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
201 PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE" 201 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
202 StringPooling="true" 202 StringPooling="true"
203 RuntimeLibrary="0" 203 RuntimeLibrary="2"
204 EnableFunctionLevelLinking="true" 204 EnableFunctionLevelLinking="true"
205 EnableEnhancedInstructionSet="0" 205 EnableEnhancedInstructionSet="0"
206 UsePrecompiledHeader="0" 206 UsePrecompiledHeader="0"
@@ -277,9 +277,9 @@
277 InlineFunctionExpansion="1" 277 InlineFunctionExpansion="1"
278 FavorSizeOrSpeed="1" 278 FavorSizeOrSpeed="1"
279 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 279 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
280 PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE" 280 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
281 StringPooling="true" 281 StringPooling="true"
282 RuntimeLibrary="0" 282 RuntimeLibrary="2"
283 EnableFunctionLevelLinking="true" 283 EnableFunctionLevelLinking="true"
284 EnableEnhancedInstructionSet="0" 284 EnableEnhancedInstructionSet="0"
285 UsePrecompiledHeader="0" 285 UsePrecompiledHeader="0"
diff --git a/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj b/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
index fdf985b..333edc2 100644
--- a/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
+++ b/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
@@ -5,7 +5,7 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true"/> 8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizeBlended" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -19,7 +19,7 @@ copy cacsd_f.def ..\..\..\..\..\libs\cacsd_f.vcdef &gt;nul
19del *.def &gt;nul 19del *.def &gt;nul
20cd .."/></Configuration> 20cd .."/></Configuration>
21 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 21 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
22 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true"/> 22 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
23 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 23 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
24 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 24 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/>
25 <Tool Name="VFResourceCompilerTool"/> 25 <Tool Name="VFResourceCompilerTool"/>
@@ -34,7 +34,7 @@ copy cacsd_f.def ..\..\..\..\..\libs\cacsd_f.vcdef &gt;nul
34del *.def &gt;nul 34del *.def &gt;nul
35cd .."/></Configuration> 35cd .."/></Configuration>
36 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 36 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
37 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebug" DisableDefaultLibSearch="true"/> 37 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
38 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 38 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/>
39 <Tool Name="VFResourceCompilerTool"/> 39 <Tool Name="VFResourceCompilerTool"/>
40 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 40 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -48,7 +48,7 @@ copy cacsd_f.def ..\..\..\..\..\libs\cacsd_f.vcdef &gt;nul
48del *.def &gt;nul 48del *.def &gt;nul
49cd .."/></Configuration> 49cd .."/></Configuration>
50 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 50 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
51 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true"/> 51 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
52 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 52 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
53 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 53 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/>
54 <Tool Name="VFResourceCompilerTool"/> 54 <Tool Name="VFResourceCompilerTool"/>
diff --git a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
index 34a4a00..81615a0 100644
--- a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
+++ b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
@@ -5,8 +5,8 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true"/> 8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmtd.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremdd.lib /DLL libmmdd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
12 <Tool Name="VFCustomBuildTool"/> 12 <Tool Name="VFCustomBuildTool"/>
@@ -21,8 +21,8 @@ copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build
21lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Libscilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/> 21lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Libscilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
22 <Tool Name="VFPostBuildEventTool"/></Configuration> 22 <Tool Name="VFPostBuildEventTool"/></Configuration>
23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
24 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true"/> 24 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
25 <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 25 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>
27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
28 <Tool Name="VFCustomBuildTool"/> 28 <Tool Name="VFCustomBuildTool"/>
@@ -37,8 +37,8 @@ copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build
37lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Libscilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/> 37lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Libscilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
38 <Tool Name="VFPostBuildEventTool"/></Configuration> 38 <Tool Name="VFPostBuildEventTool"/></Configuration>
39 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 39 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
40 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true"/> 40 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
41 <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmtd.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremdd.lib /DLL libmmdd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 41 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
42 <Tool Name="VFResourceCompilerTool"/> 42 <Tool Name="VFResourceCompilerTool"/>
43 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 43 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
44 <Tool Name="VFCustomBuildTool"/> 44 <Tool Name="VFCustomBuildTool"/>
@@ -53,8 +53,8 @@ copy slicot_f_header.def+slicot_f.vcdef slicot_f.def &gt;nul" Description="Build
53lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Libscilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/> 53lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Libscilab.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Libscilab.lib (dependencies)"/>
54 <Tool Name="VFPostBuildEventTool"/></Configuration> 54 <Tool Name="VFPostBuildEventTool"/></Configuration>
55 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 55 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
56 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/dll" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" DisableDefaultLibSearch="true"/> 56 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
57 <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 57 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
58 <Tool Name="VFResourceCompilerTool"/> 58 <Tool Name="VFResourceCompilerTool"/>
59 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 59 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
60 <Tool Name="VFCustomBuildTool"/> 60 <Tool Name="VFCustomBuildTool"/>
diff --git a/scilab/modules/call_scilab/LibScilab_Import.def b/scilab/modules/call_scilab/LibScilab_Import.def
new file mode 100644
index 0000000..99eb733
--- /dev/null
+++ b/scilab/modules/call_scilab/LibScilab_Import.def
@@ -0,0 +1,24 @@
1LIBRARY LibScilab.dll
2
3
4EXPORTS
5setScilabMode
6scirun_
7inisci_
8settmpdir_
9checkrhs_
10checklhs_
11com_
12intersci_
13putlhsvar_
14createvarfromptr_
15callFunctionFromGateway
16freeArrayOfString
17cwritechain_
18cmatptr_
19creadmat_
20getScilabMode
21ExitScilab
22TerminateCorePart2
23InitializeLaunchScilabSignal
24setSCIpath \ No newline at end of file
diff --git a/scilab/modules/call_scilab/Makefile.am b/scilab/modules/call_scilab/Makefile.am
index 9ee006d..c647eaa 100644
--- a/scilab/modules/call_scilab/Makefile.am
+++ b/scilab/modules/call_scilab/Makefile.am
@@ -19,6 +19,8 @@ libscicall_scilab_la_CFLAGS= -I$(srcdir)/includes/ \
19 -I$(top_srcdir)/libs/doublylinkedlist/includes \ 19 -I$(top_srcdir)/libs/doublylinkedlist/includes \
20 -I$(top_srcdir)/modules/output_stream/includes \ 20 -I$(top_srcdir)/modules/output_stream/includes \
21 -I$(top_srcdir)/modules/action_binding/includes \ 21 -I$(top_srcdir)/modules/action_binding/includes \
22 -I$(top_srcdir)/modules/fileio/includes \
23 -I$(top_srcdir)/modules/graphics/includes \
22 -I$(top_srcdir)/modules/core/src/c/ 24 -I$(top_srcdir)/modules/core/src/c/
23 25
24pkglib_LTLIBRARIES = libscicall_scilab.la 26pkglib_LTLIBRARIES = libscicall_scilab.la
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index eec8685..92afd50 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -340,6 +340,8 @@ libscicall_scilab_la_CFLAGS = -I$(srcdir)/includes/ \
340 -I$(top_srcdir)/libs/doublylinkedlist/includes \ 340 -I$(top_srcdir)/libs/doublylinkedlist/includes \
341 -I$(top_srcdir)/modules/output_stream/includes \ 341 -I$(top_srcdir)/modules/output_stream/includes \
342 -I$(top_srcdir)/modules/action_binding/includes \ 342 -I$(top_srcdir)/modules/action_binding/includes \
343 -I$(top_srcdir)/modules/fileio/includes \
344 -I$(top_srcdir)/modules/graphics/includes \
343 -I$(top_srcdir)/modules/core/src/c/ 345 -I$(top_srcdir)/modules/core/src/c/
344 346
345pkglib_LTLIBRARIES = libscicall_scilab.la 347pkglib_LTLIBRARIES = libscicall_scilab.la
diff --git a/scilab/modules/call_scilab/call_scilab.def b/scilab/modules/call_scilab/call_scilab.def
new file mode 100644
index 0000000..3861216
--- /dev/null
+++ b/scilab/modules/call_scilab/call_scilab.def
@@ -0,0 +1,20 @@
1LIBRARY call_scilab.dll
2
3
4EXPORTS
5 DisableInteractiveMode
6 StartScilab
7 TerminateScilab
8 ScilabDoOneEvent
9 ScilabHaveAGraph
10 SetFromCToON
11 IsFromC
12 SetFromJavaToON
13 IsFromJava
14 gw_call_scilab
15 sci_fromc_
16 sci_fromjava_
17 SendScilabJob
18 GetLastJob
19 SendScilabJobs
20 \ No newline at end of file
diff --git a/scilab/modules/call_scilab/call_scilab.iss b/scilab/modules/call_scilab/call_scilab.iss
index f6e60d6..71de08a 100644
--- a/scilab/modules/call_scilab/call_scilab.iss
+++ b/scilab/modules/call_scilab/call_scilab.iss
@@ -17,8 +17,8 @@
17; 17;
18#define MODULE_CALL_SCILAB "call_scilab" 18#define MODULE_CALL_SCILAB "call_scilab"
19; 19;
20;Source: bin\call_scilab.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 20Source: bin\call_scilab.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
21;Source: bin\call_scilab.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB} 21Source: bin\call_scilab.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
22; 22;
23Source: modules\{#MODULE_CALL_SCILAB}\changelog.txt; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}; Components: {#COMPN_SCILAB} 23Source: modules\{#MODULE_CALL_SCILAB}\changelog.txt; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}; Components: {#COMPN_SCILAB}
24Source: modules\{#MODULE_CALL_SCILAB}\license.txt; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}; Components: {#COMPN_SCILAB} 24Source: modules\{#MODULE_CALL_SCILAB}\license.txt; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}; Components: {#COMPN_SCILAB}
@@ -32,7 +32,7 @@ Source: modules\{#MODULE_CALL_SCILAB}\sci_gateway\call_scilab_gateway.xml; DestD
32Source: modules\{#MODULE_CALL_SCILAB}\etc\{#MODULE_CALL_SCILAB}.quit; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\etc; Components: {#COMPN_SCILAB} 32Source: modules\{#MODULE_CALL_SCILAB}\etc\{#MODULE_CALL_SCILAB}.quit; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\etc; Components: {#COMPN_SCILAB}
33Source: modules\{#MODULE_CALL_SCILAB}\etc\{#MODULE_CALL_SCILAB}.start; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\etc; Components: {#COMPN_SCILAB} 33Source: modules\{#MODULE_CALL_SCILAB}\etc\{#MODULE_CALL_SCILAB}.start; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\etc; Components: {#COMPN_SCILAB}
34; 34;
35Source: modules\{#MODULE_CALL_SCILAB}\examples; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 35Source: modules\{#MODULE_CALL_SCILAB}\examples\*.*; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\examples; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
36; 36;
37;Source: modules\{#MODULE_CALL_SCILAB}\help\addchapter.sce; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB} 37;Source: modules\{#MODULE_CALL_SCILAB}\help\addchapter.sce; DestDir: {app}\modules\{#MODULE_CALL_SCILAB}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
38; 38;
diff --git a/scilab/modules/call_scilab/call_scilab.vcproj b/scilab/modules/call_scilab/call_scilab.vcproj
new file mode 100644
index 0000000..a47278d
--- /dev/null
+++ b/scilab/modules/call_scilab/call_scilab.vcproj
@@ -0,0 +1,487 @@
1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject
3 ProjectType="Visual C++"
4 Version="9,00"
5 Name="call_scilab"
6 ProjectGUID="{6A6A6F76-CCC0-40C4-8AEE-8A010F49A604}"
7 RootNamespace="call_scilab"
8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0"
10 >
11 <Platforms>
12 <Platform
13 Name="Win32"
14 />
15 <Platform
16 Name="x64"
17 />
18 </Platforms>
19 <ToolFiles>
20 </ToolFiles>
21 <Configurations>
22 <Configuration
23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
25 IntermediateDirectory="$(ConfigurationName)"
26 ConfigurationType="2"
27 CharacterSet="2"
28 >
29 <Tool
30 Name="VCPreBuildEventTool"
31 />
32 <Tool
33 Name="VCCustomBuildTool"
34 />
35 <Tool
36 Name="VCXMLDataGeneratorTool"
37 />
38 <Tool
39 Name="VCWebServiceProxyGeneratorTool"
40 />
41 <Tool
42 Name="VCMIDLTool"
43 />
44 <Tool
45 Name="VCCLCompilerTool"
46 Optimization="0"
47 AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes"
48 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
49 MinimalRebuild="true"
50 BasicRuntimeChecks="0"
51 RuntimeLibrary="3"
52 UsePrecompiledHeader="0"
53 WarningLevel="3"
54 Detect64BitPortabilityProblems="false"
55 DebugInformationFormat="3"
56 />
57 <Tool
58 Name="VCManagedResourceCompilerTool"
59 />
60 <Tool
61 Name="VCResourceCompilerTool"
62 />
63 <Tool
64 Name="VCPreLinkEventTool"
65 Description="Make dependencies"
66 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\bin\dumpexts -o %%~nf.def -n call_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def call_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\call_scilab_header.def+call_scilabtmp.def ..\call_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
67 />
68 <Tool
69 Name="VCLinkerTool"
70 AdditionalDependencies="LibScilab.lib"
71 OutputFile="../../bin/$(ProjectName).dll"
72 LinkIncremental="1"
73 ModuleDefinitionFile="call_scilab.def"
74 GenerateDebugInformation="true"
75 SubSystem="2"
76 RandomizedBaseAddress="1"
77 DataExecutionPrevention="0"
78 ImportLibrary="../../bin/$(ProjectName).lib"
79 TargetMachine="1"
80 CLRUnmanagedCodeCheck="true"
81 />
82 <Tool
83 Name="VCALinkTool"
84 />
85 <Tool
86 Name="VCManifestTool"
87 />
88 <Tool
89 Name="VCXDCMakeTool"
90 />
91 <Tool
92 Name="VCBscMakeTool"
93 />
94 <Tool
95 Name="VCFxCopTool"
96 />
97 <Tool
98 Name="VCAppVerifierTool"
99 />
100 <Tool
101 Name="VCPostBuildEventTool"
102 />
103 </Configuration>
104 <Configuration
105 Name="Debug|x64"
106 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
107 IntermediateDirectory="$(ConfigurationName)"
108 ConfigurationType="2"
109 CharacterSet="2"
110 >
111 <Tool
112 Name="VCPreBuildEventTool"
113 />
114 <Tool
115 Name="VCCustomBuildTool"
116 />
117 <Tool
118 Name="VCXMLDataGeneratorTool"
119 />
120 <Tool
121 Name="VCWebServiceProxyGeneratorTool"
122 />
123 <Tool
124 Name="VCMIDLTool"
125 TargetEnvironment="3"
126 />
127 <Tool
128 Name="VCCLCompilerTool"
129 Optimization="0"
130 AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes"
131 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
132 MinimalRebuild="true"
133 BasicRuntimeChecks="0"
134 RuntimeLibrary="3"
135 UsePrecompiledHeader="0"
136 WarningLevel="3"
137 Detect64BitPortabilityProblems="false"
138 DebugInformationFormat="3"
139 />
140 <Tool
141 Name="VCManagedResourceCompilerTool"
142 />
143 <Tool
144 Name="VCResourceCompilerTool"
145 />
146 <Tool
147 Name="VCPreLinkEventTool"
148 Description="Make dependencies"
149 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\bin\dumpexts -o %%~nf.def -n call_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def call_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\call_scilab_header.def+call_scilabtmp.def ..\call_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
150 />
151 <Tool
152 Name="VCLinkerTool"
153 AdditionalDependencies="LibScilab.lib"
154 OutputFile="../../bin/$(ProjectName).dll"
155 LinkIncremental="1"
156 ModuleDefinitionFile="call_scilab.def"
157 GenerateDebugInformation="true"
158 SubSystem="2"
159 RandomizedBaseAddress="1"
160 DataExecutionPrevention="0"
161 ImportLibrary="../../bin/$(ProjectName).lib"
162 TargetMachine="17"
163 CLRUnmanagedCodeCheck="true"
164 />
165 <Tool
166 Name="VCALinkTool"
167 />
168 <Tool
169 Name="VCManifestTool"
170 />
171 <Tool
172 Name="VCXDCMakeTool"
173 />
174 <Tool
175 Name="VCBscMakeTool"
176 />
177 <Tool
178 Name="VCFxCopTool"
179 />
180 <Tool
181 Name="VCAppVerifierTool"
182 />
183 <Tool
184 Name="VCPostBuildEventTool"
185 />
186 </Configuration>
187 <Configuration
188 Name="Release|Win32"
189 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
190 IntermediateDirectory="$(ConfigurationName)"
191 ConfigurationType="2"
192 CharacterSet="2"
193 WholeProgramOptimization="0"
194 >
195 <Tool
196 Name="VCPreBuildEventTool"
197 />
198 <Tool
199 Name="VCCustomBuildTool"
200 />
201 <Tool
202 Name="VCXMLDataGeneratorTool"
203 />
204 <Tool
205 Name="VCWebServiceProxyGeneratorTool"
206 />
207 <Tool
208 Name="VCMIDLTool"
209 />
210 <Tool
211 Name="VCCLCompilerTool"
212 InlineFunctionExpansion="1"
213 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false"
215 AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes"
216 PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
217 StringPooling="true"
218 RuntimeLibrary="2"
219 EnableFunctionLevelLinking="true"
220 EnableEnhancedInstructionSet="0"
221 UsePrecompiledHeader="0"
222 WarningLevel="3"
223 Detect64BitPortabilityProblems="false"
224 DebugInformationFormat="0"
225 />
226 <Tool
227 Name="VCManagedResourceCompilerTool"
228 />
229 <Tool
230 Name="VCResourceCompilerTool"
231 />
232 <Tool
233 Name="VCPreLinkEventTool"
234 Description="Make dependencies"
235 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\bin\dumpexts -o %%~nf.def -n call_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def call_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\call_scilab_header.def+call_scilabtmp.def ..\call_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
236 />
237 <Tool
238 Name="VCLinkerTool"
239 AdditionalDependencies="LibScilab.lib"
240 OutputFile="../../bin/$(ProjectName).dll"
241 LinkIncremental="1"
242 ModuleDefinitionFile="call_scilab.def"
243 GenerateDebugInformation="false"
244 SubSystem="2"
245 OptimizeReferences="2"
246 EnableCOMDATFolding="2"
247 LinkTimeCodeGeneration="0"
248 RandomizedBaseAddress="1"
249 DataExecutionPrevention="0"
250 ImportLibrary="../../bin/$(ProjectName).lib"
251 TargetMachine="1"
252 CLRUnmanagedCodeCheck="true"
253 />
254 <Tool
255 Name="VCALinkTool"
256 />
257 <Tool
258 Name="VCManifestTool"
259 />
260 <Tool
261 Name="VCXDCMakeTool"
262 />
263 <Tool
264 Name="VCBscMakeTool"
265 />
266 <Tool
267 Name="VCFxCopTool"
268 />
269 <Tool
270 Name="VCAppVerifierTool"
271 />
272 <Tool
273 Name="VCPostBuildEventTool"
274 />
275 </Configuration>
276 <Configuration
277 Name="Release|x64"
278 OutputDirectory="$(SolutionDir)$(ConfigurationName)"
279 IntermediateDirectory="$(ConfigurationName)"
280 ConfigurationType="2"
281 CharacterSet="2"
282 WholeProgramOptimization="0"
283 >
284 <Tool
285 Name="VCPreBuildEventTool"
286 />
287 <Tool
288 Name="VCCustomBuildTool"
289 />
290 <Tool
291 Name="VCXMLDataGeneratorTool"
292 />
293 <Tool
294 Name="VCWebServiceProxyGeneratorTool"
295 />
296 <Tool
297 Name="VCMIDLTool"
298 TargetEnvironment="3"
299 />
300 <Tool
301 Name="VCCLCompilerTool"
302 InlineFunctionExpansion="1"
303 FavorSizeOrSpeed="1"
304 WholeProgramOptimization="false"
305 AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../windows_tools/includes;../windows_tools/src/c/scilab_windows;../localization/includes;../action_binding/includes;../output_stream/includes;../graphics/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes"
306 PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
307 StringPooling="true"
308 RuntimeLibrary="2"
309 EnableFunctionLevelLinking="true"
310 EnableEnhancedInstructionSet="0"
311 UsePrecompiledHeader="0"
312 WarningLevel="3"
313 Detect64BitPortabilityProblems="false"
314 DebugInformationFormat="0"
315 />
316 <Tool
317 Name="VCManagedResourceCompilerTool"
318 />
319 <Tool
320 Name="VCResourceCompilerTool"
321 />
322 <Tool
323 Name="VCPreLinkEventTool"
324 Description="Make dependencies"
325 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\bin\dumpexts -o %%~nf.def -n call_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def call_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\call_scilab_header.def+call_scilabtmp.def ..\call_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
326 />
327 <Tool
328 Name="VCLinkerTool"
329 AdditionalDependencies="LibScilab.lib"
330 OutputFile="../../bin/$(ProjectName).dll"
331 LinkIncremental="1"
332 ModuleDefinitionFile="call_scilab.def"
333 GenerateDebugInformation="false"
334 SubSystem="2"
335 OptimizeReferences="2"
336 EnableCOMDATFolding="2"
337 LinkTimeCodeGeneration="0"
338 RandomizedBaseAddress="1"
339 DataExecutionPrevention="0"
340 ImportLibrary="../../bin/$(ProjectName).lib"
341 TargetMachine="17"
342 CLRUnmanagedCodeCheck="true"
343 />
344 <Tool
345 Name="VCALinkTool"
346 />
347 <Tool
348 Name="VCManifestTool"
349 />
350 <Tool
351 Name="VCXDCMakeTool"
352 />
353 <Tool
354 Name="VCBscMakeTool"
355 />
356 <Tool
357 Name="VCFxCopTool"
358 />
359 <Tool
360 Name="VCAppVerifierTool"
361 />
362 <Tool
363 Name="VCPostBuildEventTool"
364 />
365 </Configuration>
366 </Configurations>
367 <References>
368 </References>
369 <Files>
370 <Filter
371 Name="Source Files"
372 Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
373 UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
374 >
375 <File
376 RelativePath=".\src\c\CallScilab.c"
377 >
378 </File>
379 <File
380 RelativePath=".\src\c\fromc.c"
381 >
382 </File>
383 <File
384 RelativePath=".\src\c\fromjava.c"
385 >
386 </File>
387 <File
388 RelativePath=".\sci_gateway\c\gw_call_scilab.c"
389 >
390 </File>
391 <File
392 RelativePath=".\sci_gateway\c\sci_fromc.c"
393 >
394 </File>
395 <File
396 RelativePath=".\sci_gateway\c\sci_fromjava.c"
397 >
398 </File>
399 <File
400 RelativePath=".\src\c\SendScilabJobs.c"
401 >
402 </File>
403 </Filter>
404 <Filter
405 Name="Header Files"
406 Filter="h;hpp;hxx;hm;inl;inc;xsd"
407 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
408 >
409 <File
410 RelativePath=".\includes\CallScilab.h"
411 >
412 </File>
413 <File
414 RelativePath=".\src\c\fromc.h"
415 >
416 </File>
417 <File
418 RelativePath=".\includes\fromjava.h"
419 >
420 </File>
421 <File
422 RelativePath=".\includes\gw_call_scilab.h"
423 >
424 </File>
425 <File
426 RelativePath=".\src\c\resource.h"
427 >
428 </File>
429 <File
430 RelativePath=".\includes\ScilabAPI.h"
431 >
432 </File>
433 </Filter>
434 <Filter
435 Name="Resource Files"
436 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
437 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
438 >
439 <File
440 RelativePath=".\src\c\call_scilab.rc"
441 >
442 </File>
443 </Filter>
444 <Filter
445 Name="localization"
446 >
447 <File
448 RelativePath=".\locales\en_US\messages.pot"
449 >
450 </File>
451 </Filter>
452 <Filter
453 Name="Libraries Dependencies"
454 >
455 <File
456 RelativePath=".\call_scilab_header.def"
457 >
458 </File>
459 <Filter
460 Name="Imports"
461 >
462 <File
463 RelativePath=".\LibScilab_Import.def"
464 >
465 </File>
466 </Filter>
467 </Filter>
468 <File
469 RelativePath=".\call_scilab.iss"
470 >
471 </File>
472 <File
473 RelativePath=".\sci_gateway\call_scilab_gateway.xml"
474 >
475 </File>
476 <File
477 RelativePath=".\Makefile.am"
478 >
479 </File>
480 <File
481 RelativePath=".\version.xml"
482 >
483 </File>
484 </Files>
485 <Globals>
486 </Globals>
487</VisualStudioProject>
diff --git a/scilab/modules/call_scilab/call_scilab_header.def b/scilab/modules/call_scilab/call_scilab_header.def
new file mode 100644
index 0000000..725c04b
--- /dev/null
+++ b/scilab/modules/call_scilab/call_scilab_header.def
@@ -0,0 +1,4 @@
1LIBRARY call_scilab.dll
2
3
4EXPORTS
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
index 9be5239..441d58b 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
@@ -67,7 +67,7 @@
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCLinkerTool" 69 Name="VCLinkerTool"
70 AdditionalDependencies="../../../../../bin/libscilab.lib" 70 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
71 OutputFile="../../../../../bin/readwriteboolean.exe" 71 OutputFile="../../../../../bin/readwriteboolean.exe"
72 LinkIncremental="1" 72 LinkIncremental="1"
73 IgnoreDefaultLibraryNames="" 73 IgnoreDefaultLibraryNames=""
@@ -150,7 +150,7 @@
150 /> 150 />
151 <Tool 151 <Tool
152 Name="VCLinkerTool" 152 Name="VCLinkerTool"
153 AdditionalDependencies="../../../../../bin/libscilab.lib" 153 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
154 OutputFile="../../../../../bin/readwriteboolean.exe" 154 OutputFile="../../../../../bin/readwriteboolean.exe"
155 LinkIncremental="1" 155 LinkIncremental="1"
156 IgnoreDefaultLibraryNames="libcmt.lib" 156 IgnoreDefaultLibraryNames="libcmt.lib"
@@ -231,7 +231,7 @@
231 /> 231 />
232 <Tool 232 <Tool
233 Name="VCLinkerTool" 233 Name="VCLinkerTool"
234 AdditionalDependencies="../../../../../bin/libscilab.lib" 234 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
235 OutputFile="../../../../../bin/readwriteboolean.exe" 235 OutputFile="../../../../../bin/readwriteboolean.exe"
236 LinkIncremental="1" 236 LinkIncremental="1"
237 IgnoreDefaultLibraryNames="" 237 IgnoreDefaultLibraryNames=""
@@ -315,7 +315,7 @@
315 /> 315 />
316 <Tool 316 <Tool
317 Name="VCLinkerTool" 317 Name="VCLinkerTool"
318 AdditionalDependencies="../../../../../bin/libscilab.lib" 318 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
319 OutputFile="../../../../../bin/readwriteboolean.exe" 319 OutputFile="../../../../../bin/readwriteboolean.exe"
320 LinkIncremental="1" 320 LinkIncremental="1"
321 IgnoreDefaultLibraryNames="" 321 IgnoreDefaultLibraryNames=""
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
index dfd5e05..9aca4c1 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
@@ -67,7 +67,7 @@
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCLinkerTool" 69 Name="VCLinkerTool"
70 AdditionalDependencies="../../../../../bin/libscilab.lib" 70 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
71 OutputFile="../../../../../bin/readwritecomplexmatrix.exe" 71 OutputFile="../../../../../bin/readwritecomplexmatrix.exe"
72 LinkIncremental="1" 72 LinkIncremental="1"
73 IgnoreDefaultLibraryNames="" 73 IgnoreDefaultLibraryNames=""
@@ -150,7 +150,7 @@
150 /> 150 />
151 <Tool 151 <Tool
152 Name="VCLinkerTool" 152 Name="VCLinkerTool"
153 AdditionalDependencies="../../../../../bin/libscilab.lib" 153 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
154 OutputFile="../../../../../bin/readwritecomplexmatrix.exe" 154 OutputFile="../../../../../bin/readwritecomplexmatrix.exe"
155 LinkIncremental="1" 155 LinkIncremental="1"
156 IgnoreDefaultLibraryNames="libcmt.lib" 156 IgnoreDefaultLibraryNames="libcmt.lib"
@@ -231,7 +231,7 @@
231 /> 231 />
232 <Tool 232 <Tool
233 Name="VCLinkerTool" 233 Name="VCLinkerTool"
234 AdditionalDependencies="../../../../../bin/libscilab.lib" 234 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
235 OutputFile="../../../../../bin/readwritecomplexmatrix.exe" 235 OutputFile="../../../../../bin/readwritecomplexmatrix.exe"
236 LinkIncremental="1" 236 LinkIncremental="1"
237 IgnoreDefaultLibraryNames="" 237 IgnoreDefaultLibraryNames=""
@@ -315,7 +315,7 @@
315 /> 315 />
316 <Tool 316 <Tool
317 Name="VCLinkerTool" 317 Name="VCLinkerTool"
318 AdditionalDependencies="../../../../../bin/libscilab.lib" 318 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
319 OutputFile="../../../../../bin/readwritecomplexmatrix.exe" 319 OutputFile="../../../../../bin/readwritecomplexmatrix.exe"
320 LinkIncremental="1" 320 LinkIncremental="1"
321 IgnoreDefaultLibraryNames="" 321 IgnoreDefaultLibraryNames=""
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
index fbccb6d..d07c32d 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
@@ -67,7 +67,7 @@
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCLinkerTool" 69 Name="VCLinkerTool"
70 AdditionalDependencies="../../../../../bin/libscilab.lib" 70 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
71 OutputFile="../../../../../bin/readwritematrix.exe" 71 OutputFile="../../../../../bin/readwritematrix.exe"
72 LinkIncremental="1" 72 LinkIncremental="1"
73 IgnoreDefaultLibraryNames="" 73 IgnoreDefaultLibraryNames=""
@@ -150,7 +150,7 @@
150 /> 150 />
151 <Tool 151 <Tool
152 Name="VCLinkerTool" 152 Name="VCLinkerTool"
153 AdditionalDependencies="../../../../../bin/libscilab.lib" 153 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
154 OutputFile="../../../../../bin/readwritematrix.exe" 154 OutputFile="../../../../../bin/readwritematrix.exe"
155 LinkIncremental="1" 155 LinkIncremental="1"
156 IgnoreDefaultLibraryNames="libcmt.lib" 156 IgnoreDefaultLibraryNames="libcmt.lib"
@@ -231,7 +231,7 @@
231 /> 231 />
232 <Tool 232 <Tool
233 Name="VCLinkerTool" 233 Name="VCLinkerTool"
234 AdditionalDependencies="../../../../../bin/libscilab.lib" 234 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
235 OutputFile="../../../../../bin/readwritematrix.exe" 235 OutputFile="../../../../../bin/readwritematrix.exe"
236 LinkIncremental="1" 236 LinkIncremental="1"
237 IgnoreDefaultLibraryNames="" 237 IgnoreDefaultLibraryNames=""
@@ -315,7 +315,7 @@
315 /> 315 />
316 <Tool 316 <Tool
317 Name="VCLinkerTool" 317 Name="VCLinkerTool"
318 AdditionalDependencies="../../../../../bin/libscilab.lib" 318 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
319 OutputFile="../../../../../bin/readwritematrix.exe" 319 OutputFile="../../../../../bin/readwritematrix.exe"
320 LinkIncremental="1" 320 LinkIncremental="1"
321 IgnoreDefaultLibraryNames="" 321 IgnoreDefaultLibraryNames=""
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
index 0a78274..a214bb8 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
@@ -67,7 +67,7 @@
67 /> 67 />
68 <Tool 68 <Tool
69 Name="VCLinkerTool" 69 Name="VCLinkerTool"
70 AdditionalDependencies="../../../../../bin/libscilab.lib" 70 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
71 OutputFile="../../../../../bin/readwritestring.exe" 71 OutputFile="../../../../../bin/readwritestring.exe"
72 LinkIncremental="1" 72 LinkIncremental="1"
73 IgnoreDefaultLibraryNames="" 73 IgnoreDefaultLibraryNames=""
@@ -150,7 +150,7 @@
150 /> 150 />
151 <Tool 151 <Tool
152 Name="VCLinkerTool" 152 Name="VCLinkerTool"
153 AdditionalDependencies="../../../../../bin/libscilab.lib" 153 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
154 OutputFile="../../../../../bin/readwritestring.exe" 154 OutputFile="../../../../../bin/readwritestring.exe"
155 LinkIncremental="1" 155 LinkIncremental="1"
156 IgnoreDefaultLibraryNames="libcmt.lib" 156 IgnoreDefaultLibraryNames="libcmt.lib"
@@ -231,7 +231,7 @@
231 /> 231 />
232 <Tool 232 <Tool
233 Name="VCLinkerTool" 233 Name="VCLinkerTool"
234 AdditionalDependencies="../../../../../bin/libscilab.lib" 234 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
235 OutputFile="../../../../../bin/readwritestring.exe" 235 OutputFile="../../../../../bin/readwritestring.exe"
236 LinkIncremental="1" 236 LinkIncremental="1"
237 IgnoreDefaultLibraryNames="" 237 IgnoreDefaultLibraryNames=""
@@ -315,7 +315,7 @@
315 /> 315 />
316 <Tool 316 <Tool
317 Name="VCLinkerTool" 317 Name="VCLinkerTool"
318 AdditionalDependencies="../../../../../bin/libscilab.lib" 318 AdditionalDependencies="../../../../../bin/libscilab.lib ../../../../../bin/call_scilab.lib"
319 OutputFile="../../../../../bin/readwritestring.exe" 319 OutputFile="../../../../../bin/readwritestring.exe"
320 LinkIncremental="1" 320 LinkIncremental="1"
321 IgnoreDefaultLibraryNames="" 321 IgnoreDefaultLibraryNames=""
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c/common/makefile.mak b/scilab/modules/call_scilab/examples/call_scilab/c/common/makefile.mak
index 785a348..35f0966 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c/common/makefile.mak
+++ b/scilab/modules/call_scilab/examples/call_scilab/c/common/makefile.mak
@@ -9,7 +9,7 @@ SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
9CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines" 9CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"
10CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines" 10CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"
11 11
12!include $(SCIDIR)/Makefile.incl.mak 12!include $(SCIDIR)/modules/dynamic_link/src/scripts/Makefile.incl.mak
13 13
14 14
15OBJSC= myprog.obj 15OBJSC= myprog.obj
@@ -30,5 +30,5 @@ RESOURCES= $(SCIDIR)/routines/wsci/Rscilab.res
30$(SCIDIR)/bin/prog.exe : $(OBJSC) 30$(SCIDIR)/bin/prog.exe : $(OBJSC)
31 @echo "Linking" 31 @echo "Linking"
32 $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \ 32 $(LINKER) $(LINKER_FLAGS) -OUT:"$*.exe" \
33 $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(XLIBSBIN) 33 $(OBJSC) $(SCIDIR)/bin/LibScilab.lib $(SCILAB_LIBS)
34 @echo "done " $(SCIDIR)/bin/prog.exe 34 @echo "done " $(SCIDIR)/bin/prog.exe
diff --git a/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj b/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
index be469ab..9e0b791 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
+++ b/scilab/modules/call_scilab/examples/call_scilab/c/visual_studio/CallSciVC.vcproj
@@ -49,7 +49,7 @@
49 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" 49 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
50 MinimalRebuild="true" 50 MinimalRebuild="true"
51 BasicRuntimeChecks="3" 51 BasicRuntimeChecks="3"
52 RuntimeLibrary="1" 52 RuntimeLibrary="3"
53 UsePrecompiledHeader="0" 53 UsePrecompiledHeader="0"
54 WarningLevel="3" 54 WarningLevel="3"
55 Detect64BitPortabilityProblems="false" 55 Detect64BitPortabilityProblems="false"
@@ -98,9 +98,9 @@
98 /> 98 />
99 </Configuration> 99 </Configuration>
100 <Configuration 100 <Configuration
101 Name="Release|Win32" 101 Name="Debug|x64"
102 OutputDirectory="Release" 102 OutputDirectory="$(PlatformName)\$(ConfigurationName)"
103 IntermediateDirectory="Release" 103 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
104 ConfigurationType="1" 104 ConfigurationType="1"
105 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 105 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
106 CharacterSet="2" 106 CharacterSet="2"
@@ -119,12 +119,16 @@
119 /> 119 />
120 <Tool 120 <Tool
121 Name="VCMIDLTool" 121 Name="VCMIDLTool"
122 TargetEnvironment="3"
122 /> 123 />
123 <Tool 124 <Tool
124 Name="VCCLCompilerTool" 125 Name="VCCLCompilerTool"
126 Optimization="0"
125 AdditionalIncludeDirectories="../../../../../core/includes" 127 AdditionalIncludeDirectories="../../../../../core/includes"
126 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" 128 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
127 RuntimeLibrary="0" 129 MinimalRebuild="true"
130 BasicRuntimeChecks="3"
131 RuntimeLibrary="3"
128 UsePrecompiledHeader="0" 132 UsePrecompiledHeader="0"
129 WarningLevel="3" 133 WarningLevel="3"
130 Detect64BitPortabilityProblems="false" 134 Detect64BitPortabilityProblems="false"
@@ -142,14 +146,13 @@
142 <Tool 146 <Tool
143 Name="VCLinkerTool" 147 Name="VCLinkerTool"
144 OutputFile="../../../../../../bin/CallSciVC.exe" 148 OutputFile="../../../../../../bin/CallSciVC.exe"
145 LinkIncremental="1" 149 LinkIncremental="2"
146 GenerateDebugInformation="true" 150 GenerateDebugInformation="true"
151 ProgramDatabaseFile="$(OutDir)/CallSciVC.pdb"
147 SubSystem="1" 152 SubSystem="1"
148 OptimizeReferences="2"
149 EnableCOMDATFolding="2"
150 RandomizedBaseAddress="1" 153 RandomizedBaseAddress="1"
151 DataExecutionPrevention="0" 154 DataExecutionPrevention="0"
152 TargetMachine="1" 155 TargetMachine="17"
153 /> 156 />
154 <Tool 157 <Tool
155 Name="VCALinkTool" 158 Name="VCALinkTool"
@@ -174,9 +177,9 @@
174 /> 177 />
175 </Configuration> 178 </Configuration>
176 <Configuration 179 <Configuration
177 Name="Debug|x64" 180 Name="Release|Win32"
178 OutputDirectory="$(PlatformName)\$(ConfigurationName)" 181 OutputDirectory="Release"
179 IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" 182 IntermediateDirectory="Release"
180 ConfigurationType="1" 183 ConfigurationType="1"
181 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" 184 InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
182 CharacterSet="2" 185 CharacterSet="2"
@@ -195,16 +198,12 @@
195 /> 198 />
196 <Tool 199 <Tool
197 Name="VCMIDLTool" 200 Name="VCMIDLTool"
198 TargetEnvironment="3"
199 /> 201 />
200 <Tool 202 <Tool
201 Name="VCCLCompilerTool" 203 Name="VCCLCompilerTool"
202 Optimization="0"
203 AdditionalIncludeDirectories="../../../../../core/includes" 204 AdditionalIncludeDirectories="../../../../../core/includes"
204 PreprocessorDefinitions="_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" 205 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
205 MinimalRebuild="true" 206 RuntimeLibrary="2"
206 BasicRuntimeChecks="3"
207 RuntimeLibrary="1"
208 UsePrecompiledHeader="0" 207 UsePrecompiledHeader="0"
209 WarningLevel="3" 208 WarningLevel="3"
210 Detect64BitPortabilityProblems="false" 209 Detect64BitPortabilityProblems="false"
@@ -222,13 +221,14 @@
222 <Tool 221 <Tool
223 Name="VCLinkerTool" 222 Name="VCLinkerTool"
224 OutputFile="../../../../../../bin/CallSciVC.exe" 223 OutputFile="../../../../../../bin/CallSciVC.exe"
225 LinkIncremental="2" 224 LinkIncremental="1"
226 GenerateDebugInformation="true" 225 GenerateDebugInformation="true"
227 ProgramDatabaseFile="$(OutDir)/CallSciVC.pdb"
228 SubSystem="1" 226 SubSystem="1"
227 OptimizeReferences="2"
228 EnableCOMDATFolding="2"
229 RandomizedBaseAddress="1" 229 RandomizedBaseAddress="1"
230 DataExecutionPrevention="0" 230 DataExecutionPrevention="0"
231 TargetMachine="17" 231 TargetMachine="1"
232 /> 232 />
233 <Tool 233 <Tool
234 Name="VCALinkTool" 234 Name="VCALinkTool"
@@ -280,7 +280,7 @@
280 Name="VCCLCompilerTool" 280 Name="VCCLCompilerTool"
281 AdditionalIncludeDirectories="../../../../../core/includes" 281 AdditionalIncludeDirectories="../../../../../core/includes"
282 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" 282 PreprocessorDefinitions="NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
283 RuntimeLibrary="0" 283 RuntimeLibrary="2"
284 UsePrecompiledHeader="0" 284 UsePrecompiledHeader="0"
285 WarningLevel="3" 285 WarningLevel="3"
286 Detect64BitPortabilityProblems="false" 286 Detect64BitPortabilityProblems="false"
diff --git a/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak b/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak
index 9b55345..00cd205 100644
--- a/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak
+++ b/scilab/modules/call_scilab/examples/call_scilab/cpp/common/Makefile.mak
@@ -9,7 +9,7 @@ SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
9CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc 9CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc
10CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc 10CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc
11 11
12!include $(SCIDIR)/Makefile.incl.mak 12!include $(SCIDIR)/modules/dynamic_link/src/scripts/Makefile.incl.mak
13 13
14OBJSC = myprog.obj ccmatrix1.obj 14OBJSC = myprog.obj ccmatrix1.obj
15 15
diff --git a/scilab/modules/call_scilab/src/c/CallScilab.c b/scilab/modules/call_scilab/src/c/CallScilab.c
index 053bc3d..04944ab 100644
--- a/scilab/modules/call_scilab/src/c/CallScilab.c
+++ b/scilab/modules/call_scilab/src/c/CallScilab.c
@@ -12,28 +12,28 @@
12#include <stdio.h> 12#include <stdio.h>
13#include "CallScilab.h" 13#include "CallScilab.h"
14#include "MALLOC.h" 14#include "MALLOC.h"
15#include "../../../graphics/includes/WindowList.h" 15#include "scilabmode.h"
16#include "../../../graphics/includes/GetProperty.h"
17#include "../../../io/includes/setenvc.h"
18#include "../../../fileio/includes/isdir.h"
19#include "setgetSCIpath.h"
20#include "fromc.h" 16#include "fromc.h"
21#include "sciquit.h" /* ExitScilab */ 17#include "LaunchScilabSignal.h"
18#include "localization.h"
19#include "isdir.h"
20#include "isdir.h"
21#include "setgetSCIpath.h"
22#include "scilabDefaults.h"
22#include "tmpdir.h" 23#include "tmpdir.h"
23#include "fromc.h"
24#include "inisci-c.h" 24#include "inisci-c.h"
25#include "scirun.h" 25#include "scirun.h"
26#include "scilabmode.h" 26#include "scilabmode.h"
27#include "sciquit.h"
27#include "dynamic_menus.h" 28#include "dynamic_menus.h"
28#include "scilabDefaults.h" 29#include "WindowList.h"
29#include "TerminateCore.h" 30#include "../../core/src/c/TerminateCore.h"
31
30#ifdef _MSC_VER 32#ifdef _MSC_VER
31#include "../../../windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.h" 33#include "SetScilabEnvironmentVariables.h"
32#include "../../../windows_tools/src/c/scilab_windows/getScilabDirectory.h" 34#include "getScilabDirectory.h"
33#include "strdup_windows.h" 35#include "strdup_windows.h"
34#endif 36#endif
35#include "LaunchScilabSignal.h"
36#include "localization.h"
37 37
38#ifdef _MSC_VER 38#ifdef _MSC_VER
39#define putenv _putenv 39#define putenv _putenv
@@ -50,7 +50,7 @@ static void SetSciEnv(void)
50 50
51 if (ScilabDirectory == NULL) 51 if (ScilabDirectory == NULL)
52 { 52 {
53 MessageBox (NULL, "getScilabDirectory()", gettext("Error") , MB_ICONSTOP | MB_OK); 53 MessageBox (NULL, "getScilabDirectory()", "Error" , MB_ICONSTOP | MB_OK);
54 exit(1); 54 exit(1);