rewrite size function, add getscilabmode function and configvariable mechanism 45/1245/3
antoine ELIAS [Tue, 6 Jul 2010 09:41:29 +0000 (11:41 +0200)]
Change-Id: Ief98c6101c7e8f1526493f6a592617b0e4163832

150 files changed:
scilab/Scilab.sln
scilab/modules/call_scilab/LibScilab_Import.def
scilab/modules/call_scilab/src/c/call_scilab.c
scilab/modules/console/src/c/InitializeConsole.c
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/core_yasp.vcproj
scilab/modules/core/includes/core_gw.hxx
scilab/modules/core/includes/gw_core.h
scilab/modules/core/includes/scilabmode.h [deleted file]
scilab/modules/core/includes/tmpdir.h [deleted file]
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/sci_gateway/c/sci_havewindow.c
scilab/modules/core/sci_gateway/cpp/sci_getscilabmode.cpp [moved from scilab/modules/core/sci_gateway/c/sci_getscilabmode.c with 50% similarity]
scilab/modules/core/src/c/InitScilab.c
scilab/modules/core/src/c/TerminateCore.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/dynamic_tclsci.c
scilab/modules/core/src/c/getversion.c
scilab/modules/core/src/c/inisci-c.c
scilab/modules/core/src/c/parse.c
scilab/modules/core/src/c/realmain.c
scilab/modules/core/src/c/run.c
scilab/modules/core/src/c/scilabmode.c [deleted file]
scilab/modules/core/src/c/sciquit.c
scilab/modules/core/src/c/tmpdir.c [deleted file]
scilab/modules/core/src/c/version.c
scilab/modules/core/src/c/xscion.c
scilab/modules/core/src/cpp/core_gw.cpp
scilab/modules/core/src/cpp/core_gw.vcproj
scilab/modules/core/src/cpp/scilab.cpp
scilab/modules/elementary_functions/Makefile.am
scilab/modules/elementary_functions/Makefile.in
scilab/modules/elementary_functions/includes/elem_func_gw.hxx
scilab/modules/elementary_functions/includes/gw_elementary_functions.h
scilab/modules/elementary_functions/sci_gateway/cpp/elem_func_gw/elem_func_gw.vcproj
scilab/modules/elementary_functions/sci_gateway/cpp/sci_size.cpp [new file with mode: 0644]
scilab/modules/elementary_functions/src/c/elementary_functions.vcproj
scilab/modules/fileio/LibScilab_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/System_env_Import.def [new file with mode: 0644]
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/sci_gateway/c/sci_mfprintf.c
scilab/modules/graphic_export/LibScilab_Import.def
scilab/modules/graphic_export/Makefile.am
scilab/modules/graphic_export/Makefile.in
scilab/modules/graphic_export/graphic_export.vcproj
scilab/modules/graphic_export/sci_gateway/c/gw_graphic_export.c
scilab/modules/graphics/LibScilab_Import.def
scilab/modules/graphics/Makefile.am
scilab/modules/graphics/Makefile.in
scilab/modules/graphics/graphics.vcproj
scilab/modules/graphics/sci_gateway/c/gw_graphics.c
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/c/gw_gui.c
scilab/modules/gui/sci_gateway/c/sci_ClipBoard.c
scilab/modules/gui/sci_gateway/c/sci_delmenu.c
scilab/modules/gui/sci_gateway/c/sci_setmenu.c
scilab/modules/gui/sci_gateway/c/sci_unsetmenu.c
scilab/modules/gui/sci_gateway/cpp/sci_printfigure.cpp
scilab/modules/gui/src/c/InitializeGUI.c
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/TerminateGui.c
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/src/c/LibScilab_Import.def
scilab/modules/hdf5/src/c/hdf5.vcproj
scilab/modules/hdf5/src/cpp/forceJHDF5load.cpp
scilab/modules/helptools/sci_gateway/c/gw_helptools.c
scilab/modules/helptools/src/c/LibScilab_Import.def
scilab/modules/io/src/c/LibScilab_Import.def
scilab/modules/io/src/c/System_env_Import.def [new file with mode: 0644]
scilab/modules/io/src/c/io.vcproj
scilab/modules/io/src/c/systemc.c
scilab/modules/javasci/includes/javasci_globals.h
scilab/modules/javasci/src/c/javasci_globals.c
scilab/modules/jvm/LibScilab_Import.def
scilab/modules/jvm/sci_gateway/c/gw_jvm.c
scilab/modules/jvm/src/c/createMainScilabObject.c
scilab/modules/jvm/src/c/loadClasspath.c
scilab/modules/localization/src/LibScilab_Import.def
scilab/modules/output_stream/src/c/LibScilab_Import.def
scilab/modules/output_stream/src/c/System_env_Import.def [new file with mode: 0644]
scilab/modules/output_stream/src/c/do_xxprintf.c
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/output_stream/src/c/sciprint.c
scilab/modules/output_stream/src/c/set_xxprintf.c
scilab/modules/shell/Makefile.am
scilab/modules/shell/Makefile.in
scilab/modules/shell/sci_gateway/c/sci_iswaitingforinput.c
scilab/modules/shell/src/c/GetCommandLine.c
scilab/modules/shell/src/c/LibScilab_Import.def
scilab/modules/shell/src/c/System_env_Import.def [new file with mode: 0644]
scilab/modules/shell/src/c/clc.c
scilab/modules/shell/src/c/more.c
scilab/modules/shell/src/c/others/zzledt.c
scilab/modules/shell/src/c/scilines.c
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/shell/src/c/tohome.c
scilab/modules/spreadsheet/LibScilab_Import.def
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/sci_gateway/c/sci_xls_open.c
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/system_env/Makefile.am
scilab/modules/system_env/Makefile.in
scilab/modules/system_env/includes/configvariable.hxx
scilab/modules/system_env/includes/sci_mode.h [new file with mode: 0644]
scilab/modules/system_env/includes/sci_tmpdir.h
scilab/modules/system_env/src/cpp/configvariable.cpp
scilab/modules/system_env/src/cpp/sci_mode.cpp [new file with mode: 0644]
scilab/modules/system_env/src/cpp/sci_tmpdir.cpp
scilab/modules/system_env/system_env.vcproj
scilab/modules/tclsci/LibScilab_Import.def
scilab/modules/tclsci/System_env_Import.def
scilab/modules/tclsci/sci_gateway/c/gw_tclsci.c
scilab/modules/tclsci/src/c/EnvTclTk.c
scilab/modules/tclsci/src/c/InitTclTk.c
scilab/modules/tclsci/src/c/InitializeTclTk.c
scilab/modules/types/includes/container.hxx
scilab/modules/windows_tools/sci_gateway/c/sci_chartooem.c
scilab/modules/windows_tools/sci_gateway/c/sci_consolebox.c
scilab/modules/windows_tools/sci_gateway/c/sci_dos.c
scilab/modules/windows_tools/sci_gateway/c/sci_oemtochar.c
scilab/modules/windows_tools/src/c/LibScilab_Import.def
scilab/modules/windows_tools/src/c/System_env_Import.def [new file with mode: 0644]
scilab/modules/windows_tools/src/c/TerminateWindows_tools.c
scilab/modules/windows_tools/src/c/WinConsole.c
scilab/modules/windows_tools/src/c/scilab_windows/FocusOnConsole.c
scilab/modules/windows_tools/src/c/scilab_windows/LibScilab_Import.def
scilab/modules/windows_tools/src/c/scilab_windows/System_env_Import.def
scilab/modules/windows_tools/src/c/scilab_windows/console_main.c
scilab/modules/windows_tools/src/c/scilab_windows/scilab_main.c
scilab/modules/windows_tools/src/c/scilab_windows/windows_main.c
scilab/modules/windows_tools/src/c/spawncommand.c
scilab/modules/windows_tools/src/c/windows_tools.vcproj
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in
scilab/modules/xcos/sci_gateway/c/gw_xcos.c
scilab/modules/xcos/src/c/LibScilab_Import.def
scilab/modules/xcos/src/c/xcos.vcproj
scilab/modules/xpad/Makefile.am
scilab/modules/xpad/Makefile.in
scilab/modules/xpad/sci_gateway/c/gw_xpad.c
scilab/modules/xpad/src/c/LibScilab_Import.def
scilab/modules/xpad/src/c/xpad.vcproj

index be7ab41..9a5cac3 100644 (file)
@@ -151,6 +151,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "modules\graphic
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {8A654CC5-22C1-4972-A8CF-1B89F78B5383} = {8A654CC5-22C1-4972-A8CF-1B89F78B5383}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "integer", "modules\integer\src\c\integer.vcproj", "{C7865CAA-EC7C-41EB-8324-2B81C384CA20}"
@@ -205,6 +206,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "modules\gui\src\c\gu
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
                {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization", "modules\optimization\src\c\optimization.vcproj", "{425B887B-9FC5-4CD2-B632-DBFC000E3E25}"
@@ -858,6 +860,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spreadsheet", "modules\spre
                {8028F371-6A94-4A26-8804-6E7F05F1D1AA} = {8028F371-6A94-4A26-8804-6E7F05F1D1AA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nospreadsheet", "modules\spreadsheet\src\nospreadsheet\nospreadsheet.vcproj", "{AC43B2A6-601A-4E15-97DF-2B296FFAD4F9}"
@@ -904,6 +907,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphic_export", "modules\g
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nographic_export", "modules\graphic_export\src\nographic_export\nographic_export.vcproj", "{3411652C-2879-48D0-B5C1-18D546E0A683}"
@@ -985,6 +989,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helptools", "modules\helpto
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helptools-Ant", "modules\helptools\src\java\helptools-JAVA.vcproj", "{899DECF1-D4DC-4C84-BB3C-3A343401A5B4}"
@@ -1058,6 +1063,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
@@ -1167,6 +1173,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "system_env", "modules\syste
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
                {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
+               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF} = {64E090DA-DCB5-4F4D-93D7-E88DDEC9C2EF}
@@ -1245,6 +1252,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos", "modules\xcos\src\c\
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xcos-Ant", "modules\xcos\src\java\xcos-JAVA.vcproj", "{F6DA4FFA-E405-4DCF-883B-A3C1713F8C5D}"
@@ -1264,6 +1272,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad", "modules\xpad\src\c\
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xpad-Ant", "modules\xpad\src\java\xpad-JAVA.vcproj", "{43B095CB-B86C-44CB-BCE8-87FE8E7D2A0E}"
index c967082..a22b8a8 100644 (file)
@@ -2,7 +2,6 @@ LIBRARY    LibScilab.dll
 
 
 EXPORTS
-setScilabMode
 scirun_
 inisci_
 settmpdir_
@@ -17,7 +16,6 @@ freeArrayOfString
 cwritechain_
 cmatptr_
 creadmat_
-getScilabMode
 ExitScilab
 TerminateCorePart2
 InitializeLaunchScilabSignal
index 9e06f52..c9c341f 100644 (file)
 #include <stdio.h>
 #include "call_scilab.h"
 #include "MALLOC.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "fromc.h"
 #include "LaunchScilabSignal.h"
 #include "localization.h"
 #include "isdir.h"
 #include "sci_path.h"
 #include "scilabDefaults.h"
-#include "tmpdir.h"
+#include "sci_tmpdir.h"
 #include "inisci-c.h"
 #include "scirun.h"
-#include "scilabmode.h"
 #include "sciquit.h"
 #include "storeCommand.h"
 #include "WindowList.h"
@@ -123,7 +122,7 @@ BOOL StartScilab(char *SCIpath,char *ScilabStartup,int *Stacksize)
        }
 
        /* creates TMPDIR */
-       C2F(settmpdir)();
+       defineTMPDIR();
 
        /* Scilab Initialization */
        C2F(inisci)(&iflag,&StacksizeUsed,&ierr);
index 9fe92ed..589d924 100644 (file)
@@ -13,7 +13,7 @@
 
 /*--------------------------------------------------------------------------*/
 #include "InitializeConsole.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "ScilabLinesUpdate.h"
 /*--------------------------------------------------------------------------*/
 BOOL InitializeConsole(void)
index ec1b9b6..c3aa19a 100644 (file)
@@ -11,7 +11,6 @@
 CORE_C_SOURCES = \
 src/c/inffic.c \
 src/c/cs2st.c \
-src/c/tmpdir.c \
 src/c/intmacr2tree.c \
 src/c/run.c \
 src/c/InitScilab.c \
@@ -50,7 +49,6 @@ src/c/TerminateCore.c \
 src/c/coretable.c \
 src/c/returnProperty.c \
 src/c/returnPropertyList.c \
-src/c/scilabmode.c \
 src/c/GetXmlFileEncoding.c \
 src/c/islittleendian.c \
 src/c/terme.c \
@@ -239,7 +237,6 @@ sci_gateway/c/gw_user2.c \
 sci_gateway/c/sci_error.c \
 sci_gateway/c/sci_with_module.c \
 sci_gateway/c/sci_islittleendian.c \
-sci_gateway/c/sci_getscilabmode.c \
 sci_gateway/c/sci_getvariablesonstack.c \
 sci_gateway/c/sci_readgateway.c \
 sci_gateway/c/sci_comp.c
@@ -260,17 +257,19 @@ sci_gateway/fortran/sci_iserror.f \
 sci_gateway/fortran/sci_debug.f \
 sci_gateway/fortran/sci_comp.f 
 
-GATEWAY_CPP_SOURCES =  sci_gateway/cpp/sci_getmodules.cpp \
-                                               sci_gateway/cpp/sci_clear.cpp \
-                                               sci_gateway/cpp/sci_banner.cpp \
-                                               sci_gateway/cpp/sci_quit.cpp \
-                                               sci_gateway/cpp/sci_exit.cpp \
-                                               sci_gateway/cpp/sci_argn.cpp \
-                                               sci_gateway/cpp/sci_clearglobal.cpp \
-                                               sci_gateway/cpp/sci_global.cpp \
-                                               sci_gateway/cpp/sci_isglobal.cpp \
-                                               sci_gateway/cpp/sci_getos.cpp \
-                                               sci_gateway/cpp/sci_exists.cpp
+GATEWAY_CPP_SOURCES =  \
+       sci_gateway/cpp/sci_getmodules.cpp \
+       sci_gateway/cpp/sci_clear.cpp \
+       sci_gateway/cpp/sci_banner.cpp \
+       sci_gateway/cpp/sci_quit.cpp \
+       sci_gateway/cpp/sci_exit.cpp \
+       sci_gateway/cpp/sci_argn.cpp \
+       sci_gateway/cpp/sci_clearglobal.cpp \
+       sci_gateway/cpp/sci_global.cpp \
+       sci_gateway/cpp/sci_isglobal.cpp \
+       sci_gateway/cpp/sci_getscilabmode.cpp \
+       sci_gateway/cpp/sci_getos.cpp \
+       sci_gateway/cpp/sci_exists.cpp
 
 libscicore_la_CFLAGS = -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
@@ -364,7 +363,6 @@ includes/machine.h \
 includes/mode_exec.h \
 includes/PATH_MAX.h \
 includes/scilabDefaults.h \
-includes/scilabmode.h \
 includes/scisparse.h \
 includes/sciquit.h \
 includes/stack-c.h \
index f7fdcc8..ee0531b 100644 (file)
@@ -123,10 +123,10 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" \
 LTLIBRARIES = $(pkglib_LTLIBRARIES)
 libscicore_la_LIBADD =
 am__libscicore_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
-       src/c/tmpdir.c src/c/intmacr2tree.c src/c/run.c \
-       src/c/InitScilab.c src/c/getval.c src/c/md5.c src/c/inisci-c.c \
-       src/c/IsAScalar.c src/c/texmacs.c src/c/sciquit.c \
-       src/c/stack1.c src/c/realmain.c src/c/stack3.c src/c/str2sci.c \
+       src/c/intmacr2tree.c src/c/run.c src/c/InitScilab.c \
+       src/c/getval.c src/c/md5.c src/c/inisci-c.c src/c/IsAScalar.c \
+       src/c/texmacs.c src/c/sciquit.c src/c/stack1.c \
+       src/c/realmain.c src/c/stack3.c src/c/str2sci.c \
        src/c/getmodules.c src/c/getmemory.c src/c/Funtab.c \
        src/c/csignal.c src/c/callinterf.c src/c/scimem.c \
        src/c/isanan.c src/c/parse.c src/c/timer.c src/c/stack2.c \
@@ -135,10 +135,9 @@ am__libscicore_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        src/c/loadversion.c src/c/version.c src/c/stackinfo.c \
        src/c/scirun.c src/c/warningmode.c src/c/InitializeCore.c \
        src/c/TerminateCore.c src/c/coretable.c src/c/returnProperty.c \
-       src/c/returnPropertyList.c src/c/scilabmode.c \
-       src/c/GetXmlFileEncoding.c src/c/islittleendian.c \
-       src/c/terme.c src/c/ifexpr.c src/c/expr.c \
-       src/c/getcommandlineargs.c src/c/syncexec.c \
+       src/c/returnPropertyList.c src/c/GetXmlFileEncoding.c \
+       src/c/islittleendian.c src/c/terme.c src/c/ifexpr.c \
+       src/c/expr.c src/c/getcommandlineargs.c src/c/syncexec.c \
        src/c/callFunctionFromGateway.c src/c/getvariablesname.c \
        src/c/commandwords.c src/c/freeArrayOfString.c \
        src/c/getstaticdebuginfo.c src/c/getdynamicdebuginfo.c \
@@ -213,7 +212,6 @@ am__libscicore_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        sci_gateway/c/gw_user2.c sci_gateway/c/sci_error.c \
        sci_gateway/c/sci_with_module.c \
        sci_gateway/c/sci_islittleendian.c \
-       sci_gateway/c/sci_getscilabmode.c \
        sci_gateway/c/sci_getvariablesonstack.c \
        sci_gateway/c/sci_readgateway.c sci_gateway/c/sci_comp.c \
        sci_gateway/fortran/sci_errclear.f \
@@ -235,23 +233,24 @@ am__libscicore_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.c \
        sci_gateway/cpp/sci_argn.cpp \
        sci_gateway/cpp/sci_clearglobal.cpp \
        sci_gateway/cpp/sci_global.cpp \
-       sci_gateway/cpp/sci_isglobal.cpp sci_gateway/cpp/sci_getos.cpp \
-       sci_gateway/cpp/sci_exists.cpp
+       sci_gateway/cpp/sci_isglobal.cpp \
+       sci_gateway/cpp/sci_getscilabmode.cpp \
+       sci_gateway/cpp/sci_getos.cpp sci_gateway/cpp/sci_exists.cpp
 @USE_DYNAMIC_STACK_TRUE@am__objects_1 = libscicore_la-scimem64.lo
 am__objects_2 = libscicore_la-inffic.lo libscicore_la-cs2st.lo \
-       libscicore_la-tmpdir.lo libscicore_la-intmacr2tree.lo \
-       libscicore_la-run.lo libscicore_la-InitScilab.lo \
-       libscicore_la-getval.lo libscicore_la-md5.lo \
-       libscicore_la-inisci-c.lo libscicore_la-IsAScalar.lo \
-       libscicore_la-texmacs.lo libscicore_la-sciquit.lo \
-       libscicore_la-stack1.lo libscicore_la-realmain.lo \
-       libscicore_la-stack3.lo libscicore_la-str2sci.lo \
-       libscicore_la-getmodules.lo libscicore_la-getmemory.lo \
-       libscicore_la-Funtab.lo libscicore_la-csignal.lo \
-       libscicore_la-callinterf.lo libscicore_la-scimem.lo \
-       libscicore_la-isanan.lo libscicore_la-parse.lo \
-       libscicore_la-timer.lo libscicore_la-stack2.lo \
-       libscicore_la-xscion.lo libscicore_la-SetScilabEnvironment.lo \
+       libscicore_la-intmacr2tree.lo libscicore_la-run.lo \
+       libscicore_la-InitScilab.lo libscicore_la-getval.lo \
+       libscicore_la-md5.lo libscicore_la-inisci-c.lo \
+       libscicore_la-IsAScalar.lo libscicore_la-texmacs.lo \
+       libscicore_la-sciquit.lo libscicore_la-stack1.lo \
+       libscicore_la-realmain.lo libscicore_la-stack3.lo \
+       libscicore_la-str2sci.lo libscicore_la-getmodules.lo \
+       libscicore_la-getmemory.lo libscicore_la-Funtab.lo \
+       libscicore_la-csignal.lo libscicore_la-callinterf.lo \
+       libscicore_la-scimem.lo libscicore_la-isanan.lo \
+       libscicore_la-parse.lo libscicore_la-timer.lo \
+       libscicore_la-stack2.lo libscicore_la-xscion.lo \
+       libscicore_la-SetScilabEnvironment.lo \
        libscicore_la-returnanan.lo libscicore_la-LoadFunctionsTab.lo \
        libscicore_la-with_module.lo libscicore_la-loadversion.lo \
        libscicore_la-version.lo libscicore_la-stackinfo.lo \
@@ -259,7 +258,6 @@ am__objects_2 = libscicore_la-inffic.lo libscicore_la-cs2st.lo \
        libscicore_la-InitializeCore.lo libscicore_la-TerminateCore.lo \
        libscicore_la-coretable.lo libscicore_la-returnProperty.lo \
        libscicore_la-returnPropertyList.lo \
-       libscicore_la-scilabmode.lo \
        libscicore_la-GetXmlFileEncoding.lo \
        libscicore_la-islittleendian.lo libscicore_la-terme.lo \
        libscicore_la-ifexpr.lo libscicore_la-expr.lo \
@@ -328,7 +326,6 @@ am__objects_6 = libscicore_la-sci_stacksize.lo \
        libscicore_la-gw_user2.lo libscicore_la-sci_error.lo \
        libscicore_la-sci_with_module.lo \
        libscicore_la-sci_islittleendian.lo \
-       libscicore_la-sci_getscilabmode.lo \
        libscicore_la-sci_getvariablesonstack.lo \
        libscicore_la-sci_readgateway.lo libscicore_la-sci_comp.lo
 am__objects_7 = sci_errclear.lo sci_mtlb_mode.lo sci_resume.lo \
@@ -340,7 +337,8 @@ am__objects_8 = libscicore_la-sci_getmodules.lo \
        libscicore_la-sci_quit.lo libscicore_la-sci_exit.lo \
        libscicore_la-sci_argn.lo libscicore_la-sci_clearglobal.lo \
        libscicore_la-sci_global.lo libscicore_la-sci_isglobal.lo \
-       libscicore_la-sci_getos.lo libscicore_la-sci_exists.lo
+       libscicore_la-sci_getscilabmode.lo libscicore_la-sci_getos.lo \
+       libscicore_la-sci_exists.lo
 am_libscicore_la_OBJECTS = $(am__objects_2) $(am__objects_4) \
        $(am__objects_5) $(am__objects_6) $(am__objects_7) \
        $(am__objects_8)
@@ -631,20 +629,19 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
-CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/tmpdir.c \
-       src/c/intmacr2tree.c src/c/run.c src/c/InitScilab.c \
-       src/c/getval.c src/c/md5.c src/c/inisci-c.c src/c/IsAScalar.c \
-       src/c/texmacs.c src/c/sciquit.c src/c/stack1.c \
-       src/c/realmain.c src/c/stack3.c src/c/str2sci.c \
-       src/c/getmodules.c src/c/getmemory.c src/c/Funtab.c \
-       src/c/csignal.c src/c/callinterf.c src/c/scimem.c \
-       src/c/isanan.c src/c/parse.c src/c/timer.c src/c/stack2.c \
-       src/c/xscion.c src/c/SetScilabEnvironment.c src/c/returnanan.c \
-       src/c/LoadFunctionsTab.c src/c/with_module.c \
-       src/c/loadversion.c src/c/version.c src/c/stackinfo.c \
-       src/c/scirun.c src/c/warningmode.c src/c/InitializeCore.c \
-       src/c/TerminateCore.c src/c/coretable.c src/c/returnProperty.c \
-       src/c/returnPropertyList.c src/c/scilabmode.c \
+CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/intmacr2tree.c \
+       src/c/run.c src/c/InitScilab.c src/c/getval.c src/c/md5.c \
+       src/c/inisci-c.c src/c/IsAScalar.c src/c/texmacs.c \
+       src/c/sciquit.c src/c/stack1.c src/c/realmain.c src/c/stack3.c \
+       src/c/str2sci.c src/c/getmodules.c src/c/getmemory.c \
+       src/c/Funtab.c src/c/csignal.c src/c/callinterf.c \
+       src/c/scimem.c src/c/isanan.c src/c/parse.c src/c/timer.c \
+       src/c/stack2.c src/c/xscion.c src/c/SetScilabEnvironment.c \
+       src/c/returnanan.c src/c/LoadFunctionsTab.c \
+       src/c/with_module.c src/c/loadversion.c src/c/version.c \
+       src/c/stackinfo.c src/c/scirun.c src/c/warningmode.c \
+       src/c/InitializeCore.c src/c/TerminateCore.c src/c/coretable.c \
+       src/c/returnProperty.c src/c/returnPropertyList.c \
        src/c/GetXmlFileEncoding.c src/c/islittleendian.c \
        src/c/terme.c src/c/ifexpr.c src/c/expr.c \
        src/c/getcommandlineargs.c src/c/syncexec.c \
@@ -748,7 +745,6 @@ sci_gateway/c/gw_user2.c \
 sci_gateway/c/sci_error.c \
 sci_gateway/c/sci_with_module.c \
 sci_gateway/c/sci_islittleendian.c \
-sci_gateway/c/sci_getscilabmode.c \
 sci_gateway/c/sci_getvariablesonstack.c \
 sci_gateway/c/sci_readgateway.c \
 sci_gateway/c/sci_comp.c
@@ -769,17 +765,19 @@ sci_gateway/fortran/sci_iserror.f \
 sci_gateway/fortran/sci_debug.f \
 sci_gateway/fortran/sci_comp.f 
 
-GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_getmodules.cpp \
-                                               sci_gateway/cpp/sci_clear.cpp \
-                                               sci_gateway/cpp/sci_banner.cpp \
-                                               sci_gateway/cpp/sci_quit.cpp \
-                                               sci_gateway/cpp/sci_exit.cpp \
-                                               sci_gateway/cpp/sci_argn.cpp \
-                                               sci_gateway/cpp/sci_clearglobal.cpp \
-                                               sci_gateway/cpp/sci_global.cpp \
-                                               sci_gateway/cpp/sci_isglobal.cpp \
-                                               sci_gateway/cpp/sci_getos.cpp \
-                                               sci_gateway/cpp/sci_exists.cpp
+GATEWAY_CPP_SOURCES = \
+       sci_gateway/cpp/sci_getmodules.cpp \
+       sci_gateway/cpp/sci_clear.cpp \
+       sci_gateway/cpp/sci_banner.cpp \
+       sci_gateway/cpp/sci_quit.cpp \
+       sci_gateway/cpp/sci_exit.cpp \
+       sci_gateway/cpp/sci_argn.cpp \
+       sci_gateway/cpp/sci_clearglobal.cpp \
+       sci_gateway/cpp/sci_global.cpp \
+       sci_gateway/cpp/sci_isglobal.cpp \
+       sci_gateway/cpp/sci_getscilabmode.cpp \
+       sci_gateway/cpp/sci_getos.cpp \
+       sci_gateway/cpp/sci_exists.cpp
 
 libscicore_la_CFLAGS = -I$(srcdir)/includes/ -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
@@ -862,7 +860,6 @@ includes/machine.h \
 includes/mode_exec.h \
 includes/PATH_MAX.h \
 includes/scilabDefaults.h \
-includes/scilabmode.h \
 includes/scisparse.h \
 includes/sciquit.h \
 includes/stack-c.h \
@@ -1128,7 +1125,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_where.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_who.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sci_with_module.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-scilabmode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-scimem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-scimem64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-sciquit.Plo@am__quote@
@@ -1145,7 +1141,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-terme.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-texmacs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-tmpdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-transposeMatrix.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-typename.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-version.Plo@am__quote@
@@ -1188,13 +1183,6 @@ libscicore_la-cs2st.lo: src/c/cs2st.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-cs2st.lo `test -f 'src/c/cs2st.c' || echo '$(srcdir)/'`src/c/cs2st.c
 
-libscicore_la-tmpdir.lo: src/c/tmpdir.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-tmpdir.lo -MD -MP -MF $(DEPDIR)/libscicore_la-tmpdir.Tpo -c -o libscicore_la-tmpdir.lo `test -f 'src/c/tmpdir.c' || echo '$(srcdir)/'`src/c/tmpdir.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-tmpdir.Tpo $(DEPDIR)/libscicore_la-tmpdir.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/tmpdir.c' object='libscicore_la-tmpdir.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-tmpdir.lo `test -f 'src/c/tmpdir.c' || echo '$(srcdir)/'`src/c/tmpdir.c
-
 libscicore_la-intmacr2tree.lo: src/c/intmacr2tree.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-intmacr2tree.lo -MD -MP -MF $(DEPDIR)/libscicore_la-intmacr2tree.Tpo -c -o libscicore_la-intmacr2tree.lo `test -f 'src/c/intmacr2tree.c' || echo '$(srcdir)/'`src/c/intmacr2tree.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-intmacr2tree.Tpo $(DEPDIR)/libscicore_la-intmacr2tree.Plo
@@ -1461,13 +1449,6 @@ libscicore_la-returnPropertyList.lo: src/c/returnPropertyList.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-returnPropertyList.lo `test -f 'src/c/returnPropertyList.c' || echo '$(srcdir)/'`src/c/returnPropertyList.c
 
-libscicore_la-scilabmode.lo: src/c/scilabmode.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-scilabmode.lo -MD -MP -MF $(DEPDIR)/libscicore_la-scilabmode.Tpo -c -o libscicore_la-scilabmode.lo `test -f 'src/c/scilabmode.c' || echo '$(srcdir)/'`src/c/scilabmode.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-scilabmode.Tpo $(DEPDIR)/libscicore_la-scilabmode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/scilabmode.c' object='libscicore_la-scilabmode.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-scilabmode.lo `test -f 'src/c/scilabmode.c' || echo '$(srcdir)/'`src/c/scilabmode.c
-
 libscicore_la-GetXmlFileEncoding.lo: src/c/GetXmlFileEncoding.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-GetXmlFileEncoding.lo -MD -MP -MF $(DEPDIR)/libscicore_la-GetXmlFileEncoding.Tpo -c -o libscicore_la-GetXmlFileEncoding.lo `test -f 'src/c/GetXmlFileEncoding.c' || echo '$(srcdir)/'`src/c/GetXmlFileEncoding.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-GetXmlFileEncoding.Tpo $(DEPDIR)/libscicore_la-GetXmlFileEncoding.Plo
@@ -1986,13 +1967,6 @@ libscicore_la-sci_islittleendian.lo: sci_gateway/c/sci_islittleendian.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_islittleendian.lo `test -f 'sci_gateway/c/sci_islittleendian.c' || echo '$(srcdir)/'`sci_gateway/c/sci_islittleendian.c
 
-libscicore_la-sci_getscilabmode.lo: sci_gateway/c/sci_getscilabmode.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_getscilabmode.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getscilabmode.Tpo -c -o libscicore_la-sci_getscilabmode.lo `test -f 'sci_gateway/c/sci_getscilabmode.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getscilabmode.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-sci_getscilabmode.Tpo $(DEPDIR)/libscicore_la-sci_getscilabmode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_getscilabmode.c' object='libscicore_la-sci_getscilabmode.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -c -o libscicore_la-sci_getscilabmode.lo `test -f 'sci_gateway/c/sci_getscilabmode.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getscilabmode.c
-
 libscicore_la-sci_getvariablesonstack.lo: sci_gateway/c/sci_getvariablesonstack.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(libscicore_la_CFLAGS) $(CFLAGS) -MT libscicore_la-sci_getvariablesonstack.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Tpo -c -o libscicore_la-sci_getvariablesonstack.lo `test -f 'sci_gateway/c/sci_getvariablesonstack.c' || echo '$(srcdir)/'`sci_gateway/c/sci_getvariablesonstack.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Tpo $(DEPDIR)/libscicore_la-sci_getvariablesonstack.Plo
@@ -2147,6 +2121,13 @@ libscicore_la-sci_isglobal.lo: sci_gateway/cpp/sci_isglobal.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscicore_la-sci_isglobal.lo `test -f 'sci_gateway/cpp/sci_isglobal.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_isglobal.cpp
 
+libscicore_la-sci_getscilabmode.lo: sci_gateway/cpp/sci_getscilabmode.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscicore_la-sci_getscilabmode.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getscilabmode.Tpo -c -o libscicore_la-sci_getscilabmode.lo `test -f 'sci_gateway/cpp/sci_getscilabmode.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_getscilabmode.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_getscilabmode.Tpo $(DEPDIR)/libscicore_la-sci_getscilabmode.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_getscilabmode.cpp' object='libscicore_la-sci_getscilabmode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscicore_la-sci_getscilabmode.lo `test -f 'sci_gateway/cpp/sci_getscilabmode.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_getscilabmode.cpp
+
 libscicore_la-sci_getos.lo: sci_gateway/cpp/sci_getos.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscicore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscicore_la-sci_getos.lo -MD -MP -MF $(DEPDIR)/libscicore_la-sci_getos.Tpo -c -o libscicore_la-sci_getos.lo `test -f 'sci_gateway/cpp/sci_getos.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_getos.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscicore_la-sci_getos.Tpo $(DEPDIR)/libscicore_la-sci_getos.Plo
index 6d37309..112e049 100644 (file)
                        RelativePath="..\..\bin\lapack.lib"
                        >
                </File>
+               <File
+                       RelativePath="..\..\bin\libintl.lib"
+                       >
+               </File>
        </Files>
        <Globals>
        </Globals>
index 8898e71..49411f5 100644 (file)
@@ -38,6 +38,6 @@ CPP_GATEWAY_PROTOTYPE(sci_argn);
 CPP_GATEWAY_PROTOTYPE(sci_global);
 CPP_GATEWAY_PROTOTYPE(sci_clearglobal);
 CPP_GATEWAY_PROTOTYPE(sci_isglobal);
-CPP_GATEWAY_PROTOTYPE(sci_getos);
+CPP_GATEWAY_PROTOTYPE(sci_getscilabmode);
 
 #endif /* __CORE_GW_HXX__ */
index b987d08..c8d2a6a 100644 (file)
@@ -55,7 +55,6 @@ int C2F(sci_fromc)(char *fname,unsigned long fname_len);
 int C2F(sci_getmd5)(char *fname,unsigned long fname_len);
 int C2F(sci_with_module)(char *fname,unsigned long fname_len);
 int C2F(sci_islittleendian)(char *fname,unsigned long fname_len);
-int C2F(sci_getscilabmode)(char *fname,unsigned long fname_len);
 int C2F(sci_librarieslist)(char *fname,unsigned long fname_len);
 int C2F(sci_libraryinfo)(char *fname,unsigned long fname_len);
 int C2F(sci_getvariablesonstack)(char *fname,unsigned long fname_len);
diff --git a/scilab/modules/core/includes/scilabmode.h b/scilab/modules/core/includes/scilabmode.h
deleted file mode 100644 (file)
index 3148915..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-#ifndef __SCILABMODE_H__
-#define __SCILABMODE_H__
-
-#include "machine.h" /* C2F */
-#include "BOOL.h"
-
-typedef enum {
-       SCILAB_API=1, /* Scilab is launch as an API */
-       SCILAB_STD, /* The standard Scilab (gui, plot ...) */
-       SCILAB_NW, /* Scilab in command line with the plots */
-       SCILAB_NWNI /* Scilab in command line without any graphics. What not mandataroy here */
-} scilabMode;
-
-/* by default mode is API */
-
-/**
- * Set Scilab execution mode. 
- * Note that this should be done at Scilab startup only. 
- *
- * @param new scilab mode
- * @return TRUE is newmode is OK
-*/
-BOOL setScilabMode(scilabMode newmode);
-
-/**
-* Get Scilab execution mode
-* @return current scilab mode
-*/
-scilabMode getScilabMode(void);
-
-/**
-* Get Scilab execution mode as a string
-* @return current scilab mode
-*/
-char * getScilabModeString(void);
-
-
-/**
- * Gives the mode of scilab
- * @param[out] the mode of scilab
- * @return always 1
- */
-int C2F(getscilabmode)(scilabMode *mode);
-
-
-#endif /* __SCILABMODE_H__ */
-/*--------------------------------------------------------------------------*/ 
diff --git a/scilab/modules/core/includes/tmpdir.h b/scilab/modules/core/includes/tmpdir.h
deleted file mode 100644 (file)
index fbd1e10..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Sylvestre LEDRU
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-#ifndef __TMPDIR_H__
-#define __TMPDIR_H__
-
-#include <wchar.h>
-
-#include "machine.h"
-
-/**
- * @TODO add comment
- *
- * @param void  
- */
-void C2F(settmpdir)(void);
-
-/**
- * @TODO add comment
- *
- * @param void  
- */
-void C2F(tmpdirc)(void);
-
-/**
- * returns TMPDIR directory value
- * @param void  
- * @return <ReturnValue>
- */
-char *getTMPDIR(void);
-
-
-/**
-* returns TMPDIR directory value (wide string)
-* @param void  
-* @return <ReturnValue>
-*/
-wchar_t *getTMPDIRW(void);
-
-#endif /* __TMPDIR_H__ */
-/*--------------------------------------------------------------------------*/ 
-
index 8b0cd7e..b277856 100644 (file)
@@ -24,7 +24,7 @@ static gw_generic_table Tab[]=
 {NULL, ""}, //argn
 {C2F(sci_getvariablesonstack),"getvariablesonstack"},
 {C2F(sci_comp),"comp"},
-{C2F(sci_getscilabmode),"getscilabmode"},
+{NULL, ""}, //getscilabmode
 {C2F(sci_mode),"mode"},
 {NULL ,""}, //type
 {C2F(sci_error),"error"},
index 4a1f9e0..44a568f 100644 (file)
@@ -12,7 +12,7 @@
 #include "gw_core.h"
 #include "stack-c.h"
 #include "MALLOC.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 int C2F(sci_havewindow)(char *fname,unsigned long fname_len)
 {
@@ -9,46 +9,35 @@
  * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
  *
  */
-#include <string.h>
-#include "gw_core.h"
-#include "stack-c.h"
-#include "MALLOC.h"
-#include "scilabmode.h"
+#include "funcmanager.hxx"
+#include "context.hxx"
+#include "core_gw.hxx"
+
+extern "C"
+{
+#include "sci_mode.h"
+#include "Scierror.h"
+#include "localization.h"
+#include "sci_mode.h"
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
+}
 /*--------------------------------------------------------------------------*/
-int C2F(sci_getscilabmode)(char *fname,unsigned long fname_len)
+Function::ReturnValue sci_getscilabmode(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
        int n1 = 0, m1 = 0;
        char *output = NULL ;
 
-       Rhs=Max(Rhs,0);
-       CheckRhs(0,0) ;
-       CheckLhs(1,1) ;
-
-       switch (getScilabMode())
-       {
-               case SCILAB_API: default :
-                       output = strdup("API");
-               break;
-               case SCILAB_STD:
-                       output = strdup("STD");
-               break;
-               case SCILAB_NW:
-                       output = strdup("NW");
-               break;
-               case SCILAB_NWNI:
-                       output = strdup("NWNI");
-               break;
-       }
+    if(in.size() != 0)
+    {
+        Scierror(999, _("%s: Wrong number of input argument(s): %d expected.\n"), "getscilabmode", 0);
+        return Function::Error;
+    }
 
-       n1=1;
-       CreateVarFromPtr(Rhs+1,STRING_DATATYPE,(m1=(int)strlen(output), &m1),&n1,&output);
-       if (output) {FREE(output);output=NULL;}
+    String* pS = new String(getScilabModeString());
+    out.push_back(pS);
 
-       LhsVar(1) = Rhs+1;
-       C2F(putlhsvar)();
-       return 0;
+    return Function::OK;
 }
 /*--------------------------------------------------------------------------*/
index 98b4472..b516e2d 100644 (file)
@@ -22,7 +22,7 @@
 #endif
 #include "../../../gui/includes/InitializeGUI.h"
 #include "../../../string/includes/InitializeString.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "SetScilabEnvironment.h"
 #include "../../../jvm/includes/loadBackGroundClassPath.h"
 /*--------------------------------------------------------------------------*/
index 5a69f43..64d696a 100644 (file)
 #include "scirun.h" /* scirun */
 #include "getmodules.h"
 #include "scimem.h" /* freegmem */
-#include "tmpdir.h" /* tmpdirc */
+#include "sci_tmpdir.h" /* tmpdirc */
 #include "hashtable_core.h" /* destroy_hashtable_scilab_functions */
 #include "filesmanagement.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/ 
 BOOL TerminateCorePart1(void)
 {
@@ -61,7 +61,7 @@ BOOL TerminateCorePart2(void)
        xmlCleanupParser();
 
        /** clean tmpfiles **/
-       C2F(tmpdirc)();
+       clearTMPDIR();
 
        return TRUE;
 }
index 169be01..0a17781 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_getscilabmode.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\c\sci_getvariablesonstack.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\scilabmode.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\scimem.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\tmpdir.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\transposeMatrix.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\scilabmode.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\includes\scimem.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\tmpdir.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\includes\transposeMatrix.h"
                                >
                        </File>
index e1c61d1..63d9fe9 100644 (file)
@@ -13,7 +13,7 @@
 #include "dynamic_tclsci.h"
 #include "callDynamicGateway.h"
 #include "gw_dynamic_generic.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "with_module.h"
 #include "MALLOC.h"
 /*--------------------------------------------------------------------------*/
index e85c24c..12c59da 100644 (file)
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "getversion.h"
 #include "version.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "scilabDefaults.h"
 #ifdef _MSC_VER
 #include "strdup_windows.h"
index f50f98f..9edcece 100644 (file)
@@ -27,7 +27,7 @@
 #include "sci_home.h"
 #include "MALLOC.h"
 #include "inisci-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "PATH_MAX.h"
 #include "scilabDefaults.h"
 /*--------------------------------------------------------------------------*/
index d899f49..3c80a87 100644 (file)
@@ -23,7 +23,7 @@
 #include "core_math.h"
 #include "cvstr.h"
 #include "msgs.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "stack-def.h" /* C2F(basbrk) */
 #include "Scierror.h"
 #include "do_error_number.h"
index 3d27205..d1727e1 100644 (file)
@@ -17,7 +17,7 @@
 #include "scirun.h"
 #include "realmain.h" /* enum InitScriptType */
 #include "sciquit.h"
-#include "tmpdir.h"
+#include "sci_tmpdir.h"
 #include "inisci-c.h"
 #include "PATH_MAX.h"
 /*--------------------------------------------------------------------------*/
@@ -43,7 +43,7 @@ int realmain(int no_startup_flag_l, char *initial_script, InitScriptType initial
     Set_no_startup_flag(no_startup_flag_l);
 
     /* create temp directory */
-    C2F(settmpdir)();
+    defineTMPDIR();
 
     /* signals */
 #ifdef _MSC_VER
index 2240927..7f29407 100644 (file)
@@ -31,7 +31,7 @@
 #include "parse.h"
 #include "localization.h"
 #include "core_math.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "stack-def.h" /* C2F(basbrk) */
 #include "storeCommand.h"
 #include "do_error_number.h"
diff --git a/scilab/modules/core/src/c/scilabmode.c b/scilab/modules/core/src/c/scilabmode.c
deleted file mode 100644 (file)
index 547f1db..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA - Allan CORNET
- * 
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at    
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-#include "scilabmode.h"
-/*--------------------------------------------------------------------------*/ 
-/* default mode is API */
-static scilabMode CurrentScilabMode = SCILAB_API;
-/*--------------------------------------------------------------------------*/ 
-scilabMode getScilabMode(void)
-{
-       return CurrentScilabMode;
-}
-/*--------------------------------------------------------------------------*/ 
-char * getScilabModeString(void)
-{
-       switch (CurrentScilabMode){
-               case SCILAB_API:
-                       return "API";
-                       break;
-               case SCILAB_STD:
-                       return "STD";
-                       break;
-               case SCILAB_NW:
-                       return "NW";
-                       break;
-               case SCILAB_NWNI:
-                       return "NWNI";
-                       break;
-               default:
-                       return "STD";
-                       break;
-       }
-}
-/*--------------------------------------------------------------------------*/ 
-BOOL setScilabMode(scilabMode newmode)
-{
-       if ( (newmode == SCILAB_API) || (newmode == SCILAB_STD) || (newmode == SCILAB_NW) || (newmode == SCILAB_NWNI) )
-       {
-               CurrentScilabMode = (scilabMode)newmode;
-               return TRUE;
-       }
-       return FALSE;
-}
-/*--------------------------------------------------------------------------*/ 
-int C2F(getscilabmode)(scilabMode *mode)
-{
-       *mode=getScilabMode();
-       return 0;
-}
-/*--------------------------------------------------------------------------*/ 
index bd394d2..6eba636 100644 (file)
@@ -28,7 +28,7 @@
 #include "../../../windows_tools/src/c/scilab_windows/killScilabProcess.h"
 #endif
 #include "../../../gui/includes/TerminateGui.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/ 
 int ExitScilab(void)
 {
diff --git a/scilab/modules/core/src/c/tmpdir.c b/scilab/modules/core/src/c/tmpdir.c
deleted file mode 100644 (file)
index babb4e3..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) INRIA
- * Copyright (C) DIGITEO - 2009 - Allan CORNET
- * Copyright (C) DIGITEO - 2010 - Sylvestre LEDRU
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
-#include <stdio.h>
-#include <string.h>
-
-#ifdef _MSC_VER
-#include <windows.h>
-#include <process.h>
-#endif
-
-#if defined(__STDC__) || defined(_MSC_VER)
-#include <stdlib.h>
-#ifndef _MSC_VER
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-#else 
-extern  char  *getenv();
-#endif
-
-#include <errno.h>
-
-#ifdef _MSC_VER
-#include <process.h>
-#include "strdup_windows.h"
-#endif
-#include "MALLOC.h" /* MALLOC */
-#include "tmpdir.h"
-#include "localization.h"
-#include "charEncoding.h"
-#include "MALLOC.h"
-#include "PATH_MAX.h"
-#include "removedir.h"
-#include "createdirectory.h"
-/*--------------------------------------------------------------------------*/
-static char tmp_dir[PATH_MAX+FILENAME_MAX+1];
-static int alreadyCreated = 0;
-/*--------------------------------------------------------------------------*/
-#ifdef _MSC_VER
-void createScilabTMPDIR(void)
-{
-    wchar_t wcTmpDirDefault[PATH_MAX];
-    if (!GetTempPathW(PATH_MAX,wcTmpDirDefault))
-    {
-        MessageBox(NULL,_("Cannot find Windows temporary directory (1)."),_("Error"),MB_ICONERROR);
-        exit(1);
-    }
-    else
-    {
-        wchar_t wctmp_dir[PATH_MAX+FILENAME_MAX+1];
-        static wchar_t bufenv[PATH_MAX + 16];
-        char *TmpDir = NULL;
-        swprintf(wctmp_dir,PATH_MAX+FILENAME_MAX+1,L"%sSCI_TMP_%d_",wcTmpDirDefault,(int) _getpid());
-        if ( CreateDirectoryW(wctmp_dir,NULL) == FALSE)
-        {
-            DWORD attribs = GetFileAttributesW (wctmp_dir);
-            if (attribs & FILE_ATTRIBUTE_DIRECTORY)
-            {
-                /* Repertoire existant */
-            }
-            else
-            {
-                #ifdef _DEBUG
-                {
-                    char MsgErr[1024];
-                    wsprintf(MsgErr,_("Impossible to create : %s"),tmp_dir);
-                    MessageBox(NULL,MsgErr,_("Error"),MB_ICONERROR);
-                    exit(1);
-                }
-                #else
-                {
-                    GetTempPathW(PATH_MAX,wcTmpDirDefault);
-                    wcscpy(wctmp_dir,wcTmpDirDefault);
-                    wctmp_dir[wcslen(wctmp_dir)-1]='\0'; /* Remove last \ */
-                }
-                #endif
-            }
-        }
-
-        swprintf(bufenv,PATH_MAX + 16,L"TMPDIR=%s",wctmp_dir);
-        _wputenv(bufenv);
-
-        TmpDir = wide_string_to_UTF8(wctmp_dir);
-        if (TmpDir)
-        {
-            strcpy(tmp_dir, TmpDir);
-            FREE(TmpDir);
-        }
-        else
-        {
-            strcpy(tmp_dir, "");
-        }
-    }
-}
-#else
-
-void createScilabTMPDIR(void)
-{
-    char *tmpdir;
-
-    if ( alreadyCreated == 0 )
-    {
-        static char bufenv[PATH_MAX + 16];
-        alreadyCreated++;
-        /* If the env variable TMPDIR is set, honor this preference */
-        if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX))
-        {
-            strcpy(tmp_dir, tmpdir);
-        }
-        else
-        {
-            strcpy(tmp_dir, "/tmp");
-        }
-
-        /* XXXXXX will be randomized by mkdtemp */
-        sprintf(tmp_dir, "%s/SCI_TMP_%d_XXXXXX", tmp_dir, (int) getpid());
-
-        if(mkdtemp(tmp_dir) < 0)
-        {
-                fprintf(stderr,_("Error: Could not create %s: %s\n"), tmp_dir, strerror(errno));
-        }
-
-        sprintf(bufenv, "TMPDIR=%s", tmp_dir);
-        putenv(bufenv);
-    }
-}
-#endif
-/*--------------------------------------------------------------------------*/
-/**
-* creates a tmp dir for a scilab session
-* and fixes the TMPDIR env variable
-*/
-void C2F(settmpdir)(void)
-{
-    createScilabTMPDIR();
-}
-/*--------------------------------------------------------------------------*/
-char *getTMPDIR(void)
-{
-    return strdup(tmp_dir);
-}
-/*--------------------------------------------------------------------------*/
-/**
-* remove TMPDIR directory
-*/
-void C2F(tmpdirc)(void)
-{
-    removedir(tmp_dir);
-}
-/*--------------------------------------------------------------------------*/
-wchar_t *getTMPDIRW(void)
-{
-    return to_wide_string(tmp_dir);
-}
-/*--------------------------------------------------------------------------*/
index be5977f..bc2a146 100644 (file)
@@ -14,7 +14,7 @@
 #endif
 #include <stdio.h>
 #include "version.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 /*--------------------------------------------------------------------------*/ 
 void disp_scilab_version(void)
index 8344ff6..4820d68 100644 (file)
@@ -10,7 +10,7 @@
  *
  */
 #include "xscion.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/ 
 int C2F(xscion) (int *i)
 {
index 7ad3f4f..bb56684 100644 (file)
@@ -36,7 +36,7 @@ bool CoreModule::Load()
     symbol::Context::getInstance()->AddFunction(Function::createFunction("global", &sci_global, "core"));
     symbol::Context::getInstance()->AddFunction(Function::createFunction("clearglobal", &sci_clearglobal, "core"));
     symbol::Context::getInstance()->AddFunction(Function::createFunction("isglobal", &sci_isglobal, "core"));
-    symbol::Context::getInstance()->AddFunction(Function::createFunction("getos", &sci_getos, "core"));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction("getscilabmode", &sci_getscilabmode, "core"));
     return true;
 }
 
index 0fda201..3b575a7 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../abstractSyntaxTree/includes;../../../elementary_functions/includes;../../../operations/includes;../../../api_scilab/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../system_env/includes;../../../../libs/MALLOC/includes;../../../windows_tools/includes"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CORE_GW_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\cpp\sci_getos.cpp"
+                               RelativePath="..\..\sci_gateway\cpp\sci_getscilabmode.cpp"
                                >
                        </File>
                        <File
index cd3fd9c..f330e08 100644 (file)
@@ -28,7 +28,7 @@ extern "C"
 #include "MALLOC.h"
 #include "sci_path.h"
 #include "inisci-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #ifdef _MSC_VER
 #include "../src/c/scilab_windows/getScilabDirectory.h"
 #endif
@@ -47,7 +47,6 @@ extern "C"
 #endif
 #include "../../../gui/includes/InitializeGUI.h"
 #include "../../../string/includes/InitializeString.h"
-#include "scilabmode.h"
 #include "../../../jvm/includes/loadBackGroundClassPath.h"
 
 #include "../../../history_manager/includes/HistoryManager.h"
@@ -223,7 +222,6 @@ extern "C"
 #ifndef _MSC_VER
 #include <unistd.h>
 #endif
-#include "scilabmode.h"
     extern char *TermReadAndProcess(void);
     extern void ConsolePrintf(char*);
 }
index bc6c089..267d097 100644 (file)
@@ -293,7 +293,6 @@ GATEWAY_C_SOURCES = \
 sci_gateway/c/sci_matrix.c \
 sci_gateway/c/sci_prod.c \
 sci_gateway/c/sci_expm.c \
-sci_gateway/c/sci_size.c \
 sci_gateway/c/sci_tril.c \
 sci_gateway/c/sci_ceil.c \
 sci_gateway/c/sci_imag.c \
@@ -384,8 +383,9 @@ sci_gateway/fortran/sci_f_chinesehat.f \
 sci_gateway/fortran/sci_f_exp.f
 
 GATEWAY_CPP_SOURCES =  \
-sci_gateway/cpp/sci_isequal.cpp \
-sci_gateway/cpp/elem_func_gw.cpp
+       sci_gateway/cpp/sci_isequal.cpp \
+       sci_gateway/cpp/elem_func_gw.cpp \
+       sci_gateway/cpp/sci_size.cpp
 
 
 EISPACK_SOURCES = src/fortran/eispack/balbak.f
index 60d6233..abf740a 100644 (file)
@@ -406,7 +406,6 @@ am__objects_5 = libscielementary_functions_la-psi.lo \
 am__objects_6 = libscielementary_functions_la-sci_matrix.lo \
        libscielementary_functions_la-sci_prod.lo \
        libscielementary_functions_la-sci_expm.lo \
-       libscielementary_functions_la-sci_size.lo \
        libscielementary_functions_la-sci_tril.lo \
        libscielementary_functions_la-sci_ceil.lo \
        libscielementary_functions_la-sci_imag.lo \
@@ -452,7 +451,8 @@ am__objects_6 = libscielementary_functions_la-sci_matrix.lo \
        libscielementary_functions_la-sci_chinesehat.lo \
        libscielementary_functions_la-sci_isequalbitwise.lo
 am__objects_7 = libscielementary_functions_la-sci_isequal.lo \
-       libscielementary_functions_la-elem_func_gw.lo
+       libscielementary_functions_la-elem_func_gw.lo \
+       libscielementary_functions_la-sci_size.lo
 am__objects_8 = libscielementary_functions_la-sci_f_isequal.lo \
        libscielementary_functions_la-sci_f_maxi.lo \
        libscielementary_functions_la-sci_f_testmatrix.lo \
@@ -1080,7 +1080,6 @@ GATEWAY_C_SOURCES = \
 sci_gateway/c/sci_matrix.c \
 sci_gateway/c/sci_prod.c \
 sci_gateway/c/sci_expm.c \
-sci_gateway/c/sci_size.c \
 sci_gateway/c/sci_tril.c \
 sci_gateway/c/sci_ceil.c \
 sci_gateway/c/sci_imag.c \
@@ -1171,8 +1170,9 @@ sci_gateway/fortran/sci_f_chinesehat.f \
 sci_gateway/fortran/sci_f_exp.f
 
 GATEWAY_CPP_SOURCES = \
-sci_gateway/cpp/sci_isequal.cpp \
-sci_gateway/cpp/elem_func_gw.cpp
+       sci_gateway/cpp/sci_isequal.cpp \
+       sci_gateway/cpp/elem_func_gw.cpp \
+       sci_gateway/cpp/sci_size.cpp
 
 EISPACK_SOURCES = src/fortran/eispack/balbak.f
 
@@ -1864,13 +1864,6 @@ libscielementary_functions_la-sci_expm.lo: sci_gateway/c/sci_expm.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_expm.lo `test -f 'sci_gateway/c/sci_expm.c' || echo '$(srcdir)/'`sci_gateway/c/sci_expm.c
 
-libscielementary_functions_la-sci_size.lo: sci_gateway/c/sci_size.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_size.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_size.Tpo -c -o libscielementary_functions_la-sci_size.lo `test -f 'sci_gateway/c/sci_size.c' || echo '$(srcdir)/'`sci_gateway/c/sci_size.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_size.Tpo $(DEPDIR)/libscielementary_functions_la-sci_size.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_size.c' object='libscielementary_functions_la-sci_size.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -c -o libscielementary_functions_la-sci_size.lo `test -f 'sci_gateway/c/sci_size.c' || echo '$(srcdir)/'`sci_gateway/c/sci_size.c
-
 libscielementary_functions_la-sci_tril.lo: sci_gateway/c/sci_tril.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(libscielementary_functions_la_CFLAGS) $(CFLAGS) -MT libscielementary_functions_la-sci_tril.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_tril.Tpo -c -o libscielementary_functions_la-sci_tril.lo `test -f 'sci_gateway/c/sci_tril.c' || echo '$(srcdir)/'`sci_gateway/c/sci_tril.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_tril.Tpo $(DEPDIR)/libscielementary_functions_la-sci_tril.Plo
@@ -2214,6 +2207,13 @@ libscielementary_functions_la-elem_func_gw.lo: sci_gateway/cpp/elem_func_gw.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscielementary_functions_la-elem_func_gw.lo `test -f 'sci_gateway/cpp/elem_func_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/elem_func_gw.cpp
 
+libscielementary_functions_la-sci_size.lo: sci_gateway/cpp/sci_size.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscielementary_functions_la-sci_size.lo -MD -MP -MF $(DEPDIR)/libscielementary_functions_la-sci_size.Tpo -c -o libscielementary_functions_la-sci_size.lo `test -f 'sci_gateway/cpp/sci_size.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_size.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscielementary_functions_la-sci_size.Tpo $(DEPDIR)/libscielementary_functions_la-sci_size.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_size.cpp' object='libscielementary_functions_la-sci_size.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscielementary_functions_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscielementary_functions_la-sci_size.lo `test -f 'sci_gateway/cpp/sci_size.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_size.cpp
+
 .f.o:
        $(F77COMPILE) -c -o $@ $<
 
index 65422c6..88babf6 100644 (file)
@@ -36,8 +36,7 @@ public :
 };
 
 
-//Function::ReturnValue sci_cos(types::typed_list &in, int* _piRetCount, types::typed_list &out);
-//Function::ReturnValue sci_sin(types::typed_list &in, int* _piRetCount, types::typed_list &out);
 Function::ReturnValue sci_isequal(types::typed_list &in, int _iRetCount, types::typed_list &out);
+Function::ReturnValue sci_size(types::typed_list &in, int _iRetCount, types::typed_list &out);
 
 #endif /* __ELEM_FUNC_H__ */
index 124dc6c..dd3953e 100644 (file)
@@ -60,7 +60,6 @@ int sci_real(char *fname, int* _piKey);
 int sci_round(char *fname, int* _piKey);
 int sci_sign(char *fname, int* _piKey);
 int sci_sin(char *fname, int* _piKey);
-int sci_size(char *fnam, int* _piKey);
 int sci_sqrt(char *fname, int* _piKey);
 int sci_sum(char *fname, int* _piKey);
 int sci_tan(char *fname, int* _piKey);
index 9ba851a..67a9a10 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="..\..\..\includes;..\..\..\..\functions_manager\includes;..\..\..\..\symbol\includes;..\..\..\..\types\includes;..\..\..\..\operations\includes;..\..\..\..\core\includes;../../../../abstractSyntaxTree/includes;../../../../api_scilab/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl/"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ELEM_FUNC_GW_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                RelativePath="..\..\..\sci_gateway\cpp\sci_isequal.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath="..\sci_size.cpp"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Header Files"
diff --git a/scilab/modules/elementary_functions/sci_gateway/cpp/sci_size.cpp b/scilab/modules/elementary_functions/sci_gateway/cpp/sci_size.cpp
new file mode 100644 (file)
index 0000000..8eb686e
--- /dev/null
@@ -0,0 +1,202 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2006 - INRIA - Antoine ELIAS
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#include "elem_func_gw.hxx"
+#include "elem_func_gw.hxx"
+#include "funcmanager.hxx"
+#include "context.hxx"
+#include "types.hxx"
+
+extern "C"
+{
+#include "Scierror.h"
+#include "localization.h"
+}
+
+int getProcessMode(types::typed_list &in, int _iProcess, int _iRef);
+
+/*--------------------------------------------------------------------------*/
+using namespace types;
+
+Function::ReturnValue sci_size(types::typed_list &in, int _iRetCount, types::typed_list &out)
+{
+    if(in.size() < 1)
+    {
+        Scierror(999,_("%s: Wrong number of input arguments: At least %d expected.\n"), "size", 1);        
+        return Function::Error;
+    }
+
+    switch(in[0]->getType())
+    {
+    case InternalType::RealBool:
+    case InternalType::RealCell:
+    case InternalType::RealDouble:
+    case InternalType::RealFloat:
+    case InternalType::RealInt:
+    case InternalType::RealPoly:
+    case InternalType::RealString:
+        {
+            int iMode = -1;
+
+            if(in.size() > 2)
+            {
+                Scierror(77,_("%s: Wrong number of input argument(s): %d to %d expected.\n"), "size", 1, 2);
+                return Function::Error;
+            }
+
+            if(in.size() == 2)
+            {
+                iMode = getProcessMode(in, 1, 0);
+            }
+
+            if(iMode == -2)
+            {
+                return Function::Error;
+            }
+
+            int iRows = in[0]->getAsGenericType()->rows_get();
+            int iCols = in[0]->getAsGenericType()->cols_get();
+
+            if(_iRetCount == 1)
+            {
+                int iRowsOut = 1;
+                int iColsOut = 0;
+                double pdblReal[2] = {0,0};
+
+                switch(iMode)
+                {
+                case -1 : //lhs == 1
+                    iColsOut = 2;
+                    pdblReal[0] = iRows;
+                    pdblReal[1] = iCols;
+                    break;
+                case 0 : //"*"
+                    iColsOut = 1;
+                    pdblReal[0] = iRows * iCols;
+                    break;
+                case 1 : //"r"
+                    iColsOut = 1;
+                    pdblReal[0] = iRows;
+                    break;
+                case 2 : //"c"
+                    iColsOut = 1;
+                    pdblReal[0] = iCols;
+                    break;
+                }
+                Double* pD = new Double(iRowsOut, iColsOut);
+                pD->real_get()[0] = pdblReal[0];
+                if(iColsOut == 2)
+                {
+                    pD->real_get()[1] = pdblReal[1];
+                }
+                out.push_back(pD);
+            }
+            else
+            {
+                Double* pD1 = new Double(iRows);
+                Double* pD2 = new Double(iCols);
+                out.push_back(pD1);
+                out.push_back(pD2);
+            }
+            break;
+        }
+
+    case InternalType::RealList:
+    case InternalType::RealMList:
+    case InternalType::RealStruct:
+    case InternalType::RealTList:
+        {
+            if(in.size() > 1)
+            {
+                Scierror(999, _("%s: Wrong number of input argument(s): %d expected.\n"), "size", 1);
+                return Function::Error;
+            }
+
+            Double* pD = new Double(in[0]->getAsContainer()->size_get());
+            out.push_back(pD);
+            break;
+        }
+    }
+    return Function::OK;
+}
+
+/*return process mode, "r", "c", "*", 0, 1, 2*/
+int getProcessMode(types::typed_list &in, int _iProcess, int _iRef)
+{
+    int iMode = 0;
+    if(in[_iProcess]->getType() == InternalType::RealString)
+    {
+        String* pS = in[_iProcess]->getAsString();
+        if(pS->size_get() != 1)
+        {
+            Scierror(999, _("%s: Wrong size for argument %d: (%d,%d) expected.\n"), "size", _iProcess + 1, 1, 1);
+        }
+
+        switch(pS->string_get(0)[0])
+        {
+        case 'r' :
+            iMode = 1;
+            break;
+        case 'c' :
+            iMode = 2;
+            break;
+        case '*' :
+            iMode = 0;
+            break;
+        case 'm' :
+            iMode = -1;
+            break;
+        default :
+            Scierror(999,_("%s: Wrong value for input argument #%d: '%s', '%s', '%s' or '%s' expected.\n"), "size", _iProcess + 1, "m" , "*" , "r", "c");
+            iMode = -2;
+            break;
+        }
+    }
+    else if(in[1]->getType() == InternalType::RealDouble && in[1]->getAsDouble()->isComplex() == false)
+    {
+        Double* pD = in[_iProcess]->getAsDouble();
+        if(pD->size_get() != 1)
+        {
+            Scierror(999, _("%s: Wrong size for argument %d: (%d,%d) expected.\n"), "size", _iProcess + 1, 1, 1);
+            iMode = -2;
+        }
+
+        iMode = pD->real_get()[0];
+        if(iMode != -1 && iMode != 0 && iMode != 1 && iMode != 2)
+        {
+            Scierror(999,_("%s: Wrong value for input argument #%d: '%s', '%s', '%s' or '%s' expected.\n"), "size", _iProcess + 1, "-1" , "0" , "1", "2");
+            iMode = -2;
+        }
+    }
+    else
+    {
+        Scierror(999, _("%s: Wrong type for input argument #%d: A string or a scalar expected.\n"), "size", 2);
+        iMode = -2;
+    }
+
+    //special case for -1
+    if(iMode == -1)
+    {
+        iMode = 0;
+        if(in[_iRef]->getAsGenericType()->rows_get() > 1)
+        {
+            iMode = 1;
+        }
+        else if(in[_iRef]->getAsGenericType()->cols_get() > 1)
+        {
+            iMode = 2;
+        }
+    }
+
+    return iMode;
+}
+/*--------------------------------------------------------------------------*/
index 577236c..ccadec4 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_size.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\c\sci_spones.c"
                                >
                        </File>
index 94abee9..2d407ca 100644 (file)
@@ -26,8 +26,5 @@ getwsmat_
 mkmlistfromvars_
 freeArrayOfString
 transposeMatrixDouble
-getScilabMode
 GetData
 freeArrayOfWideString
-getTMPDIRW
-getSCIpathW
\ No newline at end of file
index 83e5791..5c06596 100644 (file)
@@ -124,6 +124,7 @@ libscifileio_la_CFLAGS=             -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/io/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/string/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/localization/includes \
                                -I$(top_srcdir)/modules/operations/includes \
                                $(HDF5_CFLAGS)
index b2f25f2..acbff6a 100644 (file)
@@ -576,6 +576,7 @@ libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/io/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/string/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/localization/includes \
                                -I$(top_srcdir)/modules/operations/includes \
                                $(HDF5_CFLAGS)
diff --git a/scilab/modules/fileio/System_env_Import.def b/scilab/modules/fileio/System_env_Import.def
new file mode 100644 (file)
index 0000000..a6ad55a
--- /dev/null
@@ -0,0 +1,5 @@
+LIBRARY    system_env.dll
+
+
+EXPORTS
+getScilabMode
\ No newline at end of file
index d77adf2..e4e4753 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib system_env.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib system_env.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib system_env.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib system_env.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                        RelativePath=".\Scilab_windows_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\System_env_Import.def"
+                                       >
+                               </File>
                        </Filter>
                </Filter>
                <File
index 607ee61..0482a58 100644 (file)
@@ -17,7 +17,7 @@
 #include "filesmanagement.h"
 #include "localization.h"
 #include "BOOL.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/ 
 #ifdef _MSC_VER
 static BOOL forceSTDERRredirect = TRUE;
index 12eaab7..b07a400 100644 (file)
@@ -14,7 +14,6 @@ getrhsvar_
 stack_
 intersci_
 com_
-getScilabMode
 callFunctionFromGateway
 putlhsvar_
 freeArrayOfString
index 9f0b228..7dd37e3 100644 (file)
@@ -63,6 +63,7 @@ libscigraphic_export_la_CPPFLAGS =    $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/doublylinkedlist/includes
 
index ef42dd7..3cf62c6 100644 (file)
@@ -485,6 +485,7 @@ libscigraphic_export_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/libs/doublylinkedlist/includes
 
index c58397d..c195920 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../fileio/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl;../renderer/includes;src/c;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHIC_EXPORT_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 9d241a0..2eb5636 100644 (file)
@@ -15,7 +15,7 @@
 #include <string.h>
 #include "gw_graphic_export.h"
 #include "stack-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "callFunctionFromGateway.h"
 #include "localization.h"
 #include "Scierror.h"
index 5df3841..d43fbba 100644 (file)
@@ -28,7 +28,6 @@ checkrhs_
 checklhs_
 convert2sci_
 scistring_
-getScilabMode
 callFunctionFromGateway
 putlhsvar_
 getlistrhsvar_
index 334d189..8396b3a 100644 (file)
@@ -36,6 +36,7 @@ libscigraphics_la_CFLAGS = -I$(top_srcdir)/libs/doublylinkedlist/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
        -I$(top_srcdir)/modules/operations/includes/
 
 
@@ -432,7 +433,8 @@ libscigraphics_la_CPPFLAGS =        -Iincludes/ \
                                -Isrc/c/ $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/graphic_export/includes/
+                               -I$(top_srcdir)/modules/graphic_export/includes/ \
+                               -I$(top_srcdir)/modules/system_env/includes/
 
 libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHICS_CPP_SOURCES)
 
index d1d57ce..b2a9e4e 100644 (file)
@@ -793,6 +793,7 @@ libscigraphics_la_CFLAGS =  \
        -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
        -I$(top_srcdir)/modules/operations/includes/ \
        $(JAVA_JNI_INCLUDE) -Isrc/cpp $(TCL_INC_PATH) $(TK_INC_PATH) \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
@@ -1184,7 +1185,8 @@ libscigraphics_la_CPPFLAGS = -Iincludes/ \
                                -Isrc/c/ $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/graphic_export/includes/
+                               -I$(top_srcdir)/modules/graphic_export/includes/ \
+                               -I$(top_srcdir)/modules/system_env/includes/
 
 libscigraphics_la_SOURCES = $(GRAPHICS_C_SOURCES) $(GATEWAY_C_SOURCES) $(GRAPHICS_CPP_SOURCES)
 
index 6b7c0a6..6c00517 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                AdditionalOptions=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/doublylinkedlist/includes;../../libs/hashtable;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index c94df1d..f09769a 100644 (file)
@@ -14,7 +14,7 @@
 /*--------------------------------------------------------------------------*/ 
 #include "gw_graphics.h"
 #include "stack-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "BOOL.h"
index dd9a18b..a5bcef4 100644 (file)
@@ -219,12 +219,14 @@ libscigui_la_CFLAGS=      -I$(srcdir)/src/c/ \
                        -I$(top_srcdir)/modules/dynamic_link/includes \
                        -I$(srcdir)/src/cpp/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/system_env/includes \
                        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/
 
 libscigui_la_CFLAGS += $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/jvm/includes/ \
                        -I$(top_srcdir)/modules/renderer/includes/ \
                        -I$(top_srcdir)/modules/string/includes/ \
+                       -I$(top_srcdir)/modules/system_env/includes/ \
                        -I$(top_srcdir)/modules/operations/includes/
 
 libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
@@ -249,6 +251,7 @@ libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/operations/includes/ \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+                       -I$(top_srcdir)/modules/system_env/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/
 
 # Without the GUI module
index c678c52..66caf20 100644 (file)
@@ -778,10 +778,12 @@ libscigui_la_CFLAGS = -I$(srcdir)/src/c/ -I$(srcdir)/src/c/xsci/ \
        -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(srcdir)/src/cpp/ \
        -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
        -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
        $(JAVA_JNI_INCLUDE) -I$(top_srcdir)/modules/jvm/includes/ \
        -I$(top_srcdir)/modules/renderer/includes/ \
        -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
        -I$(top_srcdir)/modules/operations/includes/
 libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(srcdir)/includes/ \
@@ -805,6 +807,7 @@ libscigui_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/operations/includes/ \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/abstractSyntaxTree/includes/ \
+                       -I$(top_srcdir)/modules/system_env/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/
 
 
index 96cdcc0..169550a 100644 (file)
@@ -14,7 +14,7 @@
 #include <string.h>
 #include "gw_gui.h"
 #include "stack-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "callFunctionFromGateway.h"
 #include "localization.h"
 #include "Scierror.h"
index 01c8cca..7a4e3b2 100644 (file)
@@ -19,7 +19,7 @@
 #include "Scierror.h"
 #include "MALLOC.h"
 #include "sciprint.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "IsAScalar.h"
 #include "freeArrayOfString.h"
index 7caa278..805df6c 100644 (file)
@@ -16,7 +16,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "InitUIMenu.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 int sci_delmenu(char *fname,unsigned long fname_len)
 {
index cdb36e3..d012088 100644 (file)
@@ -16,7 +16,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "InitUIMenu.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 int sci_setmenu(char *fname,unsigned long fname_len)
 {
index 5739e6a..67062d5 100644 (file)
@@ -16,7 +16,7 @@
 #include "localization.h"
 #include "Scierror.h"
 #include "InitUIMenu.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 int sci_unsetmenu(char *fname,unsigned long fname_len)
 {
index 74a4bd2..0dd675e 100644 (file)
@@ -15,7 +15,7 @@ extern "C"
 {
 #include "stack-c.h"
 #include "Scierror.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "IsAScalar.h"
 #include "gw_gui.h"
index c753757..2909ae0 100644 (file)
@@ -12,7 +12,7 @@
  
 #include <stdlib.h>
 #include "InitializeGUI.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "setMainWindowTitle.h"
 #include "MALLOC.h"
 #include "buildMainWindowTitle.h"
index 199e596..d52145f 100644 (file)
@@ -19,7 +19,6 @@ putlhsvar_
 createvar_
 freeArrayOfString
 com_
-getScilabMode
 callFunctionFromGateway
 sciReturnInt
 sciReturnStringMatrix
index 9aa96c5..222db52 100644 (file)
@@ -12,7 +12,7 @@
 /*--------------------------------------------------------------------------*/ 
 #include "TerminateGui.h"
 #include "CallMainWindow.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/ 
 BOOL TerminateGUI(void)
 {
index 48c5272..4d0447a 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../renderer/includes;../cpp;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 2c830c4..424f5c6 100644 (file)
@@ -78,6 +78,7 @@ libscihdf5_la_CPPFLAGS=       -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/operations/includes \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                $(JAVA_JNI_INCLUDE) \
                                $(HDF5_CFLAGS)
 
@@ -88,6 +89,7 @@ libscihdf5_la_CFLAGS=         -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/localization/includes \
                                -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                $(HDF5_CFLAGS)
 
index f93e89f..523a2e9 100644 (file)
@@ -497,6 +497,7 @@ libscihdf5_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/operations/includes \
                                -I$(top_srcdir)/modules/jvm/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                $(JAVA_JNI_INCLUDE) \
                                $(HDF5_CFLAGS)
 
@@ -507,6 +508,7 @@ libscihdf5_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/localization/includes \
                                -I$(top_srcdir)/modules/operations/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                $(HDF5_CFLAGS)
 
index 38d606e..acef8aa 100644 (file)
@@ -27,7 +27,7 @@ extern "C"
 #ifdef _MSC_VER
 #include "strdup_windows.h"
 #endif
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "splitpath.h"
 #include "scicurdir.h"
 }
index 96ba144..e7b312a 100644 (file)
@@ -12,4 +12,3 @@ checklhs_
 freeArrayOfString
 callFunctionFromGateway
 checkrhs_
-getScilabMode
index 4b90de2..b725adc 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../operations/includes;../../../fileio/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;_HDF5USEDLL_;WIN32"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 7e00068..b4ff83a 100644 (file)
@@ -15,7 +15,7 @@ extern "C"
 #include "BOOL.h"
 #include "getScilabJavaVM.h"
 #include "loadOnUseClassPath.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 
 }
 #include "jhdf5load.hxx"
index d067d0c..a681b88 100644 (file)
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "gw_helptools.h"
 #include "stack-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "callFunctionFromGateway.h"
 #include "localization.h"
 #include "Scierror.h"
index b8ca606..7fa767b 100644 (file)
@@ -13,5 +13,4 @@ stack_
 intersci_
 putlhsvar_
 com_
-getScilabMode
 callFunctionFromGateway
\ No newline at end of file
index 061a757..f84f1cd 100644 (file)
@@ -16,7 +16,6 @@ checklhs_
 checkrhs_
 gettype_
 vstk_
-getTMPDIR
 IsAScalar
 vartype_
 createvar_
diff --git a/scilab/modules/io/src/c/System_env_Import.def b/scilab/modules/io/src/c/System_env_Import.def
new file mode 100644 (file)
index 0000000..2dbce3a
--- /dev/null
@@ -0,0 +1,5 @@
+       LIBRARY    system_env.dll
+
+
+EXPORTS
+getTMPDIR
index 29b5a6a..bbc5492 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;IO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib"
+                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;IO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib"
+                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;IO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib"
+                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;IO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib"
+                               AdditionalDependencies="LibScilab.lib io_f.lib scilab_windows.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                                        RelativePath=".\LibScilab_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\System_env_Import.def"
+                                       >
+                               </File>
                        </Filter>
                </Filter>
                <Filter
index b42046d..769a827 100644 (file)
@@ -21,7 +21,7 @@
 #include "MALLOC.h" /* MALLOC */
 #include "PATH_MAX.h"
 #include "systemc.h"
-#include "tmpdir.h"
+#include "sci_tmpdir.h"
 #include "charEncoding.h"
 /*--------------------------------------------------------------------------*/
 #ifdef _MSC_VER
index cd8d69c..531596e 100644 (file)
@@ -17,7 +17,6 @@
 #include <string.h>
 #include "jni.h"
 #include "stack-c.h"
-#include "tmpdir.h"
 #include "scirun.h"
 #include "sciquit.h"
 #include "call_scilab.h"
index fba501f..1cc2290 100644 (file)
@@ -21,7 +21,7 @@
 #include "javasci_globals.h"
 #include "inisci-c.h"
 #include "sci_path.h"
-#include "tmpdir.h"
+#include "sci_tmpdir.h"
 #include "PATH_MAX.h"
 #include "getcommandlineargs.h"
 #ifdef _MSC_VER
index e6be908..4c412ad 100644 (file)
@@ -14,9 +14,7 @@ freeArrayOfString
 vstk_
 gettype_
 getrhsvar_
-getScilabModeString
 com_
 callFunctionFromGateway
 GetXmlFileEncoding
-getScilabMode
 ;
index cc19e5a..875963b 100644 (file)
@@ -14,7 +14,7 @@
 #include <string.h>
 #include "gw_jvm.h"
 #include "stack-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "Scierror.h"
 #include "callFunctionFromGateway.h"
 #include "localization.h"
index 9ebad0e..6634e75 100644 (file)
@@ -16,7 +16,7 @@
 #include "getScilabJNIEnv.h"
 #include "getScilabJavaVM.h"
 #include "catchIfJavaException.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 /*--------------------------------------------------------------------------*/ 
 static jobject ScilabObject;
index ee1eaea..ce71a81 100644 (file)
@@ -23,7 +23,7 @@
 #include "sci_path.h"
 #include "MALLOC.h"
 #include "localization.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "stricmp.h"
 #ifdef _MSC_VER
        #include "strdup_windows.h"
index 0509c73..2ed723e 100644 (file)
@@ -21,7 +21,6 @@ EXPORTS
  getmodules
  GetXmlFileEncoding
  callFunctionFromGateway
- getScilabMode
  
  
  
index ac3d520..208f040 100644 (file)
@@ -24,7 +24,6 @@ checklhs_
 intersci_
 createvar_
 getwsmat_
-getScilabMode
 cvname_
 getIntermediateMemoryNeeded
 getstackinfo_
diff --git a/scilab/modules/output_stream/src/c/System_env_Import.def b/scilab/modules/output_stream/src/c/System_env_Import.def
new file mode 100644 (file)
index 0000000..429ecdb
--- /dev/null
@@ -0,0 +1,5 @@
+       LIBRARY    system_env.dll
+
+
+EXPORTS
+getScilabMode
\ No newline at end of file
index 398d26d..ce0a517 100644 (file)
@@ -20,7 +20,7 @@
 #include "do_xxprintf.h"
 #include "Scierror.h"
 #include "Scierror.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "set_xxprintf.h"
 #include "scistrtostr.h"
index 86da90d..8a3768b 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib"
+                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/output_stream.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="output_stream_export.def"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib"
+                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/output_stream.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="output_stream_export.def"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib"
+                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/output_stream.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="output_stream_export.def"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../cpp;../../../../libs/MALLOC/includes;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../shell/src/c/windows;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Console_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Shell_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libshell.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_Windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)Output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)api_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)api_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib"
+                               AdditionalDependencies="LibScilab.lib fileio.lib sciconsole.lib libshell.lib string.lib scilocalization.lib scilab_windows.lib output_stream_f.lib api_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/output_stream.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="output_stream_export.def"
                                        RelativePath=".\String_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\System_env_Import.def"
+                                       >
+                               </File>
                        </Filter>
                        <Filter
                                Name="Export"
index f5c8986..4b3e60d 100644 (file)
@@ -14,7 +14,7 @@
 #include "sciprint.h"
 #include "diary.h"
 #include "stack-def.h" /* bsiz */
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "../../console/includes/ConsolePrintf.h"
 #ifdef _MSC_VER
 #include "TermPrintf.h"
index b25edf9..f8fda32 100644 (file)
@@ -13,7 +13,7 @@
 /*--------------------------------------------------------------------------*/
 #include "set_xxprintf.h"
 #include "sciprint.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 /* local function used to flush with sprintf */
 static int voidflush(FILE *fp);
index a776512..0a56a9a 100644 (file)
@@ -51,6 +51,7 @@ libscishell_la_CFLAGS=        $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/fileio/src/c/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes \
+                       -I$(top_srcdir)/modules/system_env/includes \
                        -I$(top_srcdir)/modules/operations/includes/
 
 if IS_MACOSX
index dbaec22..87318d9 100644 (file)
@@ -446,6 +446,7 @@ libscishell_la_CFLAGS = $(JAVA_JNI_INCLUDE) -Iincludes/ -Isrc/c/ \
        -I$(top_srcdir)/modules/fileio/src/c/ \
        -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
        -I$(top_srcdir)/modules/operations/includes/ $(am__append_2)
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
index 696ab81..a928451 100644 (file)
@@ -15,7 +15,7 @@
 #include "gw_shell.h"
 #include "stack-c.h"
 #include "ConsoleIsWaitingForInput.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "sciprint.h"
index b61afcf..b7d3c60 100644 (file)
@@ -20,7 +20,7 @@
 #include "BOOL.h"
 #include "ConsoleRead.h"
 #include "SetConsolePrompt.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "MALLOC.h"
 #include "prompt.h"
 #include "HistoryManager.h"
index bbb4e91..4abc66e 100644 (file)
@@ -6,7 +6,6 @@ EXPORTS
   LaunchScilab
   LaunchScilabLock
 ;
-getScilabMode
 callFunctionFromGateway
 com_
 iop_
diff --git a/scilab/modules/shell/src/c/System_env_Import.def b/scilab/modules/shell/src/c/System_env_Import.def
new file mode 100644 (file)
index 0000000..065839f
--- /dev/null
@@ -0,0 +1,4 @@
+       LIBRARY    system_env.dll
+
+EXPORTS 
+getScilabMode
\ No newline at end of file
index 93a3610..572dab8 100644 (file)
@@ -12,7 +12,7 @@
 /*--------------------------------------------------------------------------*/
 #include <stdlib.h>
 #include "clc.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "ClearConsole.h"
 #include "ClearConsolePart.h"
 #ifdef _MSC_VER
index eb52aac..c1638b7 100644 (file)
@@ -16,7 +16,7 @@
 #endif
 #include <stdio.h>
 #include "more.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "sciprint.h"
 #include "../../../console/includes/GetCharWithoutOutput.h"
index aaef12b..39b542b 100644 (file)
@@ -46,7 +46,7 @@
 #include "completion.h"
 #include "getPartLine.h"
 #include "localization.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "sciprint.h"
 #include "HistoryManager.h"
 #include "ConsoleRead.h"
index 23b0228..2a2fe42 100644 (file)
@@ -45,7 +45,7 @@
 #include "stack-def.h"
 #ifdef _MSC_VER
 #include "../../../windows_tools/src/c/scilab_windows/console.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #endif
 /*--------------------------------------------------------------------------*/
 #define DEFAULT_NUMBERS_LINES 28
index 47e1639..aa99c31 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCISHELL_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib system_env.lib"
                                OutputFile="../../../../bin/libshell.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="shell_export.def"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCISHELL_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib system_env.lib"
                                OutputFile="../../../../bin/libshell.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="shell_export.def"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCISHELL_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib system_env.lib"
                                OutputFile="../../../../bin/libshell.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="shell_export.def"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;windows;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../windows_tools/includes;../../../core/includes;../../../completion/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes;../../../fileio/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCISHELL_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)libjvm_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)libjvm.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)sciconsole_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)sciconsole.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scicompletion_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicompletion.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib libjvm.lib sciconsole.lib scilab_windows.lib scicompletion.lib fileio.lib scilocalization.lib system_env.lib"
                                OutputFile="../../../../bin/libshell.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="shell_export.def"
                                        RelativePath=".\Scilab_windows_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\System_env_Import.def"
+                                       >
+                               </File>
                        </Filter>
                        <Filter
                                Name="Export"
index 6216ac0..5bd6552 100644 (file)
@@ -12,7 +12,7 @@
 /*--------------------------------------------------------------------------*/
 #include <stdlib.h>
 #include "tohome.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "PromptToHome.h"
 #ifndef _MSC_VER
 #include "others/clrscr_nw.h"
index 6d9d5e3..1102d7e 100644 (file)
@@ -13,7 +13,6 @@ EXPORTS
  createvarfromptr_
  callFunctionFromGateway
  returnanan_
- getTMPDIR
  vartype_
  freeArrayOfString
  ;
index 80129ad..ccdafd3 100644 (file)
@@ -25,6 +25,7 @@ libscispreadsheet_la_CFLAGS=          -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/io/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
index ec935ec..54210b0 100644 (file)
@@ -414,6 +414,7 @@ libscispreadsheet_la_CFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/io/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                -I$(top_srcdir)/modules/fileio/includes \
                                -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/operations/includes
index 920902e..2054fea 100644 (file)
@@ -26,7 +26,7 @@
 #include "../../../fileio/includes/mopen.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "tmpdir.h"
+#include "sci_tmpdir.h"
 #include "Scierror.h"
 #include "localization.h"
 #include "freeArrayOfString.h"
index 9bb67c7..132c8d1 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes;../operations/includes;../system_env/includes"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 82c8166..af87391 100644 (file)
 ##
 ##
 
-SYSTEM_ENV_CPP_SOURCES                 =       \
-            src/cpp/setenvvar.cpp \
-            src/cpp/sci_path.cpp \
-            src/cpp/sci_home.cpp \
-            src/cpp/sci_tmpdir.cpp \
-            src/cpp/configvariable.cpp
+SYSTEM_ENV_CPP_SOURCES         = \
+       src/cpp/setenvvar.cpp \
+       src/cpp/sci_path.cpp \
+       src/cpp/sci_home.cpp \
+       src/cpp/sci_tmpdir.cpp \
+       src/cpp/sci_mode.cpp \
+       src/cpp/configvariable.cpp
 
-pkglib_LTLIBRARIES             = libscisystem_env.la
+pkglib_LTLIBRARIES = libscisystem_env.la
 
-libscisystem_env_la_SOURCES    = $(SYSTEM_ENV_CPP_SOURCES)
+libscisystem_env_la_SOURCES = $(SYSTEM_ENV_CPP_SOURCES)
 
-libscisystem_env_la_CPPFLAGS   =       -I includes/ \
-                                                                       -I src/cpp \
-                                                                       -I $(top_srcdir)/modules/symbol/includes \
-                                                                       -I $(top_srcdir)/modules/types/includes \
-                                                                       -I $(top_srcdir)/modules/io/includes \
-                                                                       -I $(top_srcdir)/modules/abstractSyntaxTree/includes
+libscisystem_env_la_CPPFLAGS = \
+       -I includes/ \
+       -I src/cpp \
+       -I $(top_srcdir)/modules/symbol/includes \
+       -I $(top_srcdir)/modules/types/includes \
+       -I $(top_srcdir)/modules/io/includes \
+       -I $(top_srcdir)/modules/fileio/includes \
+       -I $(top_srcdir)/modules/abstractSyntaxTree/includes
 
 
 libscisystem_env_la_includedir=$(pkgincludedir)/system_env
index 4565df1..abd8441 100644 (file)
@@ -88,6 +88,7 @@ am__objects_1 = libscisystem_env_la-setenvvar.lo \
        libscisystem_env_la-sci_path.lo \
        libscisystem_env_la-sci_home.lo \
        libscisystem_env_la-sci_tmpdir.lo \
+       libscisystem_env_la-sci_mode.lo \
        libscisystem_env_la-configvariable.lo
 am_libscisystem_env_la_OBJECTS = $(am__objects_1)
 libscisystem_env_la_OBJECTS = $(am_libscisystem_env_la_OBJECTS)
@@ -357,20 +358,23 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 yacc_present = @yacc_present@
 SYSTEM_ENV_CPP_SOURCES = \
-            src/cpp/setenvvar.cpp \
-            src/cpp/sci_path.cpp \
-            src/cpp/sci_home.cpp \
-            src/cpp/sci_tmpdir.cpp \
-            src/cpp/configvariable.cpp
+       src/cpp/setenvvar.cpp \
+       src/cpp/sci_path.cpp \
+       src/cpp/sci_home.cpp \
+       src/cpp/sci_tmpdir.cpp \
+       src/cpp/sci_mode.cpp \
+       src/cpp/configvariable.cpp
 
 pkglib_LTLIBRARIES = libscisystem_env.la
 libscisystem_env_la_SOURCES = $(SYSTEM_ENV_CPP_SOURCES)
-libscisystem_env_la_CPPFLAGS = -I includes/ \
-                                                                       -I src/cpp \
-                                                                       -I $(top_srcdir)/modules/symbol/includes \
-                                                                       -I $(top_srcdir)/modules/types/includes \
-                                                                       -I $(top_srcdir)/modules/io/includes \
-                                                                       -I $(top_srcdir)/modules/abstractSyntaxTree/includes
+libscisystem_env_la_CPPFLAGS = \
+       -I includes/ \
+       -I src/cpp \
+       -I $(top_srcdir)/modules/symbol/includes \
+       -I $(top_srcdir)/modules/types/includes \
+       -I $(top_srcdir)/modules/io/includes \
+       -I $(top_srcdir)/modules/fileio/includes \
+       -I $(top_srcdir)/modules/abstractSyntaxTree/includes
 
 libscisystem_env_la_includedir = $(pkgincludedir)/system_env
 libscisystem_env_la_include_HEADERS = includes/setenvvar.hxx
@@ -450,6 +454,7 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-configvariable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-sci_home.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-sci_mode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-sci_path.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-sci_tmpdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-setenvvar.Plo@am__quote@
@@ -503,6 +508,13 @@ libscisystem_env_la-sci_tmpdir.lo: src/cpp/sci_tmpdir.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscisystem_env_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscisystem_env_la-sci_tmpdir.lo `test -f 'src/cpp/sci_tmpdir.cpp' || echo '$(srcdir)/'`src/cpp/sci_tmpdir.cpp
 
+libscisystem_env_la-sci_mode.lo: src/cpp/sci_mode.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscisystem_env_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscisystem_env_la-sci_mode.lo -MD -MP -MF $(DEPDIR)/libscisystem_env_la-sci_mode.Tpo -c -o libscisystem_env_la-sci_mode.lo `test -f 'src/cpp/sci_mode.cpp' || echo '$(srcdir)/'`src/cpp/sci_mode.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscisystem_env_la-sci_mode.Tpo $(DEPDIR)/libscisystem_env_la-sci_mode.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/sci_mode.cpp' object='libscisystem_env_la-sci_mode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscisystem_env_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscisystem_env_la-sci_mode.lo `test -f 'src/cpp/sci_mode.cpp' || echo '$(srcdir)/'`src/cpp/sci_mode.cpp
+
 libscisystem_env_la-configvariable.lo: src/cpp/configvariable.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscisystem_env_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscisystem_env_la-configvariable.lo -MD -MP -MF $(DEPDIR)/libscisystem_env_la-configvariable.Tpo -c -o libscisystem_env_la-configvariable.lo `test -f 'src/cpp/configvariable.cpp' || echo '$(srcdir)/'`src/cpp/configvariable.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscisystem_env_la-configvariable.Tpo $(DEPDIR)/libscisystem_env_la-configvariable.Plo
index d9e1c93..5e70a00 100644 (file)
@@ -84,6 +84,14 @@ private :
 public : 
     static void setConsoleWidth(int _iConsoleWidth);
     static int getConsoleWidth(void);
+
+    // Scilab mode
+private :
+    static int m_iScilabMode;
+
+public : 
+    static void setScilabMode(int _iScilabMode);
+    static int getScilabMode(void);
 };
 
 #endif /* __CONFIGVARIABLE_HXX__ */
diff --git a/scilab/modules/system_env/includes/sci_mode.h b/scilab/modules/system_env/includes/sci_mode.h
new file mode 100644 (file)
index 0000000..6cfc835
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+*  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+*
+*  This file must be used under the terms of the CeCILL.
+*  This source file is licensed as described in the file COPYING, which
+*  you should have received as part of this distribution.  The terms
+*  are also available at
+*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#ifndef __SCI_MODE_H__
+#define __SCI_MODE_H__
+
+#include "dynlib_system_env.h"
+
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    typedef enum {
+        SCILAB_API=1, /* Scilab is launch as an API */
+        SCILAB_STD, /* The standard Scilab (gui, plot ...) */
+        SCILAB_NW, /* Scilab in command line with the plots */
+        SCILAB_NWNI /* Scilab in command line without any graphics. What not mandataroy here */
+    } scilabMode;
+
+    EXTERN_SYSTEM_ENV scilabMode getScilabMode(void);
+
+    EXTERN_SYSTEM_ENV void setScilabMode(scilabMode newmode);
+
+    EXTERN_SYSTEM_ENV char * getScilabModeString(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ! __SCI_MODE_H__ */
\ No newline at end of file
index 5fd43f4..d3e44eb 100644 (file)
@@ -34,6 +34,8 @@ EXTERN_SYSTEM_ENV void putenvTMPDIR(const char* _sci_tmpdir);
 
 EXTERN_SYSTEM_ENV void defineTMPDIR();
 
+EXTERN_SYSTEM_ENV void clearTMPDIR();
+
 #ifdef __cplusplus
 }
 #endif
index 13a8a45..b7f573a 100644 (file)
@@ -176,3 +176,23 @@ int ConfigVariable::getConsoleWidth(void)
 /*
 ** \}
 */
+
+/*
+** Scilab mode
+** \{
+*/
+
+int ConfigVariable::m_iScilabMode = 0;
+
+void ConfigVariable::setScilabMode(int _iScilabMode)
+{
+    m_iScilabMode = _iScilabMode;
+}
+
+int ConfigVariable::getScilabMode(void)
+{
+    return m_iScilabMode;
+}
+/*
+** \}
+*/
diff --git a/scilab/modules/system_env/src/cpp/sci_mode.cpp b/scilab/modules/system_env/src/cpp/sci_mode.cpp
new file mode 100644 (file)
index 0000000..fb55e06
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+*  Copyright (C) 2010 - DIGITEO - Antoine ELIAS
+*
+*  This file must be used under the terms of the CeCILL.
+*  This source file is licensed as described in the file COPYING, which
+*  you should have received as part of this distribution.  The terms
+*  are also available at
+*  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+
+#include "sci_mode.h"
+
+#include "configvariable.hxx"
+
+scilabMode getScilabMode(void)
+{
+    return static_cast<scilabMode>(ConfigVariable::getScilabMode());
+}
+
+void setScilabMode(scilabMode newmode)
+{
+    ConfigVariable::setScilabMode(static_cast<int>(newmode));
+}
+
+char * getScilabModeString(void)
+{
+    scilabMode smMode = getScilabMode();
+    switch(smMode)
+    {
+               case SCILAB_API:
+                       return "API";
+                       break;
+               case SCILAB_STD:
+                       return "STD";
+                       break;
+               case SCILAB_NW:
+                       return "NW";
+                       break;
+               case SCILAB_NWNI:
+                       return "NWNI";
+                       break;
+               default:
+                       return "STD";
+                       break;
+       }
+}
index 9f82678..abc6da0 100644 (file)
@@ -32,6 +32,7 @@ extern "C"
 #include "getenvc.h"
 #include "localization.h"
 #include <errno.h>
+#include "removedir.h"
 }
 
 char *getTMPDIR(void)
@@ -203,3 +204,7 @@ void defineTMPDIR()
     FREE(sci_tmpdir);
 }
 
+void clearTMPDIR()
+{
+    removedir(getTMPDIR());
+}
\ No newline at end of file
index 038dc48..7a87f0f 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl;../fileio/includes"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl;../fileio/includes"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl;../fileio/includes"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;..\core\includes;../symbol/includes;../types/includes;../abstractSyntaxTree/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/MALLOC/includes;../../libs/intl;../fileio/includes"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                >
                        </File>
                        <File
+                               RelativePath=".\src\cpp\sci_mode.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\cpp\sci_path.cpp"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\sci_mode.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\includes\sci_path.h"
                                >
                        </File>
index fb87379..1b3aa31 100644 (file)
@@ -2,7 +2,6 @@ LIBRARY    LibScilab.dll
 
 
 EXPORTS
- getScilabMode
  gettype_
  vstk_
  IsAScalar
index 780a310..44d86a4 100644 (file)
@@ -2,4 +2,5 @@ LIBRARY    system_env.dll
 
 
 EXPORTS
- getSCI
\ No newline at end of file
+getSCI
+getScilabMode
\ No newline at end of file
index 5683e19..9d2d3b7 100644 (file)
@@ -19,7 +19,7 @@
 #include "gw_tclsci.h"
 #include "stack-c.h"
 #include "inisci-c.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "callFunctionFromGateway.h"
 #include "InitTclTk.h" /* isTkStarted */
 #include "InitializeTclTk.h"
index 1a7c1ff..a738394 100644 (file)
@@ -22,7 +22,7 @@
 #include "GlobalTclInterp.h"
 #include "localization.h"
 #include "ConvertSlash.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 extern void    TclSetLibraryPath(Tcl_Obj * pathPtr);
 /*--------------------------------------------------------------------------*/
index d6884df..bed1d8f 100644 (file)
@@ -25,7 +25,7 @@
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "ScilabEval.h"
 #include "TCL_Command.h"
 #include "GlobalTclInterp.h"
index 599ac9c..98f614c 100644 (file)
@@ -12,7 +12,7 @@
 
 #include "InitializeTclTk.h"
 #include "InitTclTk.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 BOOL InitializeTclTk(void)
 {
index 31f5687..305bb37 100644 (file)
@@ -28,6 +28,8 @@ namespace types
 
         virtual int         size_get() = 0 ;
 
+        virtual Container*  getAsContainer(void) { return this; }
+
         virtual bool        isAssignable(void) { return true; }
 
         virtual RealType    getType(void) { return RealContainer; }
index 7bd4521..2b4748e 100644 (file)
@@ -14,7 +14,7 @@
 #include "gw_windows_tools.h"
 #include "stack-c.h"
 #include "MALLOC.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "Scierror.h"
 /*--------------------------------------------------------------------------*/
index 00b3ac2..c9a3325 100644 (file)
@@ -13,7 +13,7 @@
 /*--------------------------------------------------------------------------*/
 #include <string.h>
 #include "gw_windows_tools.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "MALLOC.h" /* MALLOC */
 #include "stack-c.h"
 #include "sciprint.h"
index 9bb90ca..47d289b 100644 (file)
@@ -18,7 +18,7 @@
 #include "MALLOC.h" /* MALLOC */
 #include "spawncommand.h"
 #include "sciprint.h"
-#include "tmpdir.h"
+#include "sci_tmpdir.h"
 #include "FileExist.h"
 #include "localization.h"
 #include "Scierror.h"
index d659e2a..4a036f0 100644 (file)
@@ -14,7 +14,7 @@
 #include "gw_windows_tools.h"
 #include "stack-c.h"
 #include "MALLOC.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "Scierror.h"
 /*--------------------------------------------------------------------------*/
index 5f31ae5..65e9725 100644 (file)
@@ -16,18 +16,14 @@ intersci_
 createvar_
 gettype_
 vstk_
-getTMPDIR
-getScilabMode
 ExitScilab
 disp_scilab_version
 settexmacs
 setCommandLineArgs
-setScilabMode
 realmain
 sciquit_
 IsAScalar
 freeArrayOfString
-getSCIHOME
 getWarningMode
 ;
 
diff --git a/scilab/modules/windows_tools/src/c/System_env_Import.def b/scilab/modules/windows_tools/src/c/System_env_Import.def
new file mode 100644 (file)
index 0000000..e93468a
--- /dev/null
@@ -0,0 +1,6 @@
+LIBRARY    system_env.dll
+
+
+EXPORTS
+getScilabMode
+getTMPDIR
\ No newline at end of file
index df8d01a..40c37fb 100644 (file)
@@ -12,7 +12,7 @@
 
 /*--------------------------------------------------------------------------*/ 
 #include "TerminateWindows_tools.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "console.h"
 #include "InnosetupMutex.h"
 /*--------------------------------------------------------------------------*/ 
index ea4d00c..0d0248d 100644 (file)
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include "WinConsole.h"
 #include "version.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "MALLOC.h"
 #include "scilab_windows/console.h"
 /*--------------------------------------------------------------------------*/
index 4d27903..12ad77d 100644 (file)
@@ -13,7 +13,7 @@
 /*--------------------------------------------------------------------------*/
 #include <windows.h>
 #include "dynlib_scilab_windows.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 /*--------------------------------------------------------------------------*/
 SCILAB_WINDOWS_IMPEXP void setFocusOnConsole(void)
 {
index ad4d20b..a80c793 100644 (file)
@@ -16,7 +16,7 @@
 #include "console_main.h"
 #include "core_math.h"
 #include "getcommandlineargs.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "forbiddenToUseScilab.h"
 #include "realmain.h"
 #include "version.h"
index 13dd75f..73bfe4c 100644 (file)
@@ -17,7 +17,7 @@
 #include <signal.h>
 
 #include "scilab_main.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "realmain.h"
 #include "sciprint.h"
 #include "sciquit.h"
index 54dde67..87a901e 100644 (file)
@@ -16,7 +16,7 @@
 #include "windows_main.h"
 #include "core_math.h"
 #include "getcommandlineargs.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "forbiddenToUseScilab.h"
 #include "realmain.h"
 #include "version.h"
index 516f5dc..6e26f0c 100644 (file)
@@ -14,9 +14,9 @@
 #include <stdio.h>
 #include "PATH_MAX.h"
 #include "MALLOC.h"
-#include "tmpdir.h" /* getTMPDIR */
+#include "sci_tmpdir.h" /* getTMPDIR */
 #include "FileExist.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "spawncommand.h"
 #include "strdup_windows.h"
 #include "charEncoding.h"
index c5c8a80..1921a86 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
        Version="9,00"
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Call_scilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)call_scilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)System_env_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)system_env.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib call_scilab.lib system_env.lib"
                                OutputFile="../../../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile=""
                                        RelativePath=".\scilab_windows_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\System_env_Import.def"
+                                       >
+                               </File>
                        </Filter>
                </Filter>
                <File
index 383aa2e..4b9aa13 100644 (file)
@@ -64,6 +64,7 @@ libscixcos_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/fileio/includes \
                        -I$(top_srcdir)/modules/localization/includes \
                        -I$(top_srcdir)/modules/operations/includes \
+                       -I$(top_srcdir)/modules/system_env/includes \
                        -I$(top_srcdir)/modules/api_scilab/includes     
 
 libscixcos_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
index 3a2a083..b4bce0b 100644 (file)
@@ -470,6 +470,7 @@ libscixcos_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/fileio/includes \
                        -I$(top_srcdir)/modules/localization/includes \
                        -I$(top_srcdir)/modules/operations/includes \
+                       -I$(top_srcdir)/modules/system_env/includes \
                        -I$(top_srcdir)/modules/api_scilab/includes     
 
 libscixcos_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
index 7b15160..900f032 100644 (file)
@@ -14,7 +14,7 @@
 #include "stack-c.h"
 #include "callFunctionFromGateway.h"
 #include "BOOL.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "BOOL.h"
index 39fb8ea..1f748af 100644 (file)
@@ -6,7 +6,6 @@ EXPORTS
 callFunctionFromGateway
 putlhsvar_
 intersci_
-getScilabMode
 com_
 freeArrayOfString
 checklhs_
index 7a6654e..b971bc6 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;XCOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;XCOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;XCOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../fileio/includes;../../../output_stream/includes;../cpp;../jni;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;XCOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 342c678..bcd366e 100644 (file)
@@ -57,6 +57,7 @@ libscixpad_la_CFLAGS= $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/fileio/includes \
                        -I$(top_srcdir)/modules/core/includes \
                        -I$(top_srcdir)/modules/operations/includes \
+                       -I$(top_srcdir)/modules/system_env/includes \
                        -I$(top_srcdir)/modules/functions/includes
 
 libscixpad_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
index bed554b..37ee485 100644 (file)
@@ -515,6 +515,7 @@ libscixpad_la_CFLAGS = $(JAVA_JNI_INCLUDE) \
                        -I$(top_srcdir)/modules/fileio/includes \
                        -I$(top_srcdir)/modules/core/includes \
                        -I$(top_srcdir)/modules/operations/includes \
+                       -I$(top_srcdir)/modules/system_env/includes \
                        -I$(top_srcdir)/modules/functions/includes
 
 libscixpad_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
index b101a8a..010174b 100644 (file)
@@ -14,7 +14,7 @@
 #include "stack-c.h"
 #include "callFunctionFromGateway.h"
 #include "BOOL.h"
-#include "scilabmode.h"
+#include "sci_mode.h"
 #include "localization.h"
 #include "Scierror.h"
 #include "BOOL.h"
index d3cd1a9..f05c141 100644 (file)
@@ -6,7 +6,6 @@ EXPORTS
 callFunctionFromGateway
 putlhsvar_
 intersci_
-getScilabMode
 com_
 stack_
 getrhsvar_
index 928c11e..cf185c9 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;XPAD_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;XPAD_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;XPAD_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../includes;../../../../libs/MALLOC/includes;../../../api_scilab/includes;../../../core/includes;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../cpp;../../../functions/includes;../../../fileio/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;XPAD_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"