mopen, mclose and file management 93/1393/2
antoine ELIAS [Wed, 21 Jul 2010 14:29:40 +0000 (16:29 +0200)]
Change-Id: I053e51e2676a54bbb34b009d669797dc23680124

101 files changed:
scilab/Scilab.sln
scilab/modules/abstractSyntaxTree/includes/run_CallExp.hxx
scilab/modules/abstractSyntaxTree/includes/runvisitor.hxx
scilab/modules/core/Makefile.am
scilab/modules/core/Makefile.in
scilab/modules/core/includes/warningmode.h [deleted file]
scilab/modules/core/sci_gateway/c/sci_warning.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/warningmode.c [deleted file]
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/src/c/LibScilab_Import.def
scilab/modules/dynamic_link/src/c/addinter.c
scilab/modules/dynamic_link/src/c/dynamic_link.c
scilab/modules/dynamic_link/src/c/dynamic_link.vcproj
scilab/modules/fileio/LibScilab_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/Makefile.in
scilab/modules/fileio/System_env_Import.def
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/includes/fileio_gw.hxx
scilab/modules/fileio/includes/filemanager.hxx [new file with mode: 0644]
scilab/modules/fileio/includes/mclose.h
scilab/modules/fileio/includes/mopen.h
scilab/modules/fileio/includes/os_wfopen.h [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_createdir.c
scilab/modules/fileio/sci_gateway/c/sci_mclose.c [deleted file]
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.cpp
scilab/modules/fileio/sci_gateway/cpp/fileio_gw.vcproj
scilab/modules/fileio/sci_gateway/cpp/sci_mclose.cpp [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/cpp/sci_mopen.cpp [new file with mode: 0644]
scilab/modules/fileio/src/c/addfile.c
scilab/modules/fileio/src/c/mopen.c [deleted file]
scilab/modules/fileio/src/c/mput.c
scilab/modules/fileio/src/c/os_wfopen.c [new file with mode: 0644]
scilab/modules/fileio/src/c/scicurdir.c
scilab/modules/fileio/src/cpp/filemanager.cpp [new file with mode: 0644]
scilab/modules/fileio/src/cpp/mclose.cpp [moved from scilab/modules/fileio/src/c/mclose.c with 67% similarity]
scilab/modules/fileio/src/cpp/mopen.cpp [new file with mode: 0644]
scilab/modules/functions/sci_gateway/cpp/sci_exec.cpp
scilab/modules/functions/sci_gateway/cpp/sci_execstr.cpp
scilab/modules/functions/sci_gateway/cpp/sci_functionlist.cpp
scilab/modules/functions/src/c/LibScilab_Import.def
scilab/modules/io/sci_gateway/cpp/sci_genlib.cpp
scilab/modules/localization/sci_gateway/c/sci_setdefaultlanguage.c
scilab/modules/localization/sci_gateway/c/sci_setlanguage.c
scilab/modules/localization/src/LibScilab_Import.def
scilab/modules/localization/src/System_env_Import.def
scilab/modules/localization/tests/unit_tests/UTF-8_Identifiers.tst
scilab/modules/optimization/Makefile.am
scilab/modules/optimization/Makefile.in
scilab/modules/optimization/src/c/LibScilab_Import.def
scilab/modules/optimization/src/c/optimization.vcproj
scilab/modules/optimization/src/c/sp.c
scilab/modules/output_stream/src/c/LibScilab_Import.def
scilab/modules/output_stream/src/c/Scierror.c
scilab/modules/output_stream/src/c/System_env_Import.def
scilab/modules/output_stream/src/c/msgs.c
scilab/modules/parse/src/cpp/parser.cpp
scilab/modules/parse/src/cpp/printerror.cpp
scilab/modules/shell/src/c/LibScilab_Import.def
scilab/modules/shell/src/c/System_env_Import.def
scilab/modules/shell/src/c/prompt.c
scilab/modules/special_functions/Makefile.am
scilab/modules/special_functions/Makefile.in
scilab/modules/special_functions/sci_gateway/c/sci_oldbesseli.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbesselj.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbesselk.c
scilab/modules/special_functions/sci_gateway/c/sci_oldbessely.c
scilab/modules/special_functions/src/c/LibScilab_Import.def
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/string/Makefile.am
scilab/modules/string/Makefile.in
scilab/modules/string/sci_gateway/c/sci_ascii.c
scilab/modules/string/src/c/LibScilab_Import.def
scilab/modules/string/src/c/System_env_Import.def [new file with mode: 0644]
scilab/modules/string/src/c/pcre_private.c
scilab/modules/string/src/c/string.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_warning.h [new file with mode: 0644]
scilab/modules/system_env/src/cpp/configvariable.cpp
scilab/modules/system_env/src/cpp/sci_warning.cpp [new file with mode: 0644]
scilab/modules/system_env/system_env.vcproj
scilab/modules/types/Makefile.am
scilab/modules/types/Makefile.in
scilab/modules/types/includes/alltypes.hxx
scilab/modules/types/includes/anytype.hxx
scilab/modules/types/includes/file.hxx [new file with mode: 0644]
scilab/modules/types/includes/internal.hxx
scilab/modules/types/src/cpp/file.cpp [new file with mode: 0644]
scilab/modules/types/src/cpp/macro.cpp
scilab/modules/types/types.vcproj
scilab/modules/umfpack/Makefile.am
scilab/modules/umfpack/Makefile.in
scilab/modules/umfpack/sci_gateway/c/sci_umf_lufact.c
scilab/modules/umfpack/src/c/LibScilab_Import.def
scilab/modules/umfpack/src/c/umfpack.vcproj
scilab/modules/windows_tools/src/c/LibScilab_Import.def

index 9ad5455..3b7a56c 100644 (file)
@@ -231,6 +231,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optimization", "modules\opt
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {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("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "optimization_f", "modules\optimization\src\fortran\optimization_f.vfproj", "{1D219098-007C-4F76-9AE6-271ABBB7D393}"
@@ -620,6 +621,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "special_functions", "module
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
                {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0} = {18F043DA-1DB5-464F-B67D-CF1C23BE7EA0}
+               {7CA60AEF-9AFA-4D06-AF28-613C0AA27640} = {7CA60AEF-9AFA-4D06-AF28-613C0AA27640}
        EndProjectSection
 EndProject
 Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "special_functions_f", "modules\special_functions\src\fortran\special_functions_f.vfproj", "{E3A01BE7-815F-4A06-9F0A-C95E80873966}"
@@ -985,6 +987,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dynamic_link", "modules\dyn
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {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}") = "graphic_export", "modules\graphic_export\graphic_export.vcproj", "{5AD5654B-B2EE-4B84-81FC-F6A4C1073D96}"
@@ -1061,6 +1064,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "umfpack", "modules\umfpack\
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {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}") = "matio", "modules\matio\matio.vcproj", "{7757B22F-9512-4380-9E40-EFD50575028D}"
@@ -1451,11 +1455,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parameters", "modules\param
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio_gw", "modules\fileio\sci_gateway\cpp\fileio_gw.vcproj", "{6D9647CE-9CB9-4B16-B34D-8542484EFBB0}"
        ProjectSection(ProjectDependencies) = postProject
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F} = {2C60033B-0DBD-4CA4-80D3-176C9BE9CE2F}
                {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {0D3FA25B-8116-44EC-A45E-260789DAA3D9} = {0D3FA25B-8116-44EC-A45E-260789DAA3D9}
                {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
+               {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}
                {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74} = {1BB396F7-CE61-4CFC-9C22-266B2CFB2E74}
        EndProjectSection
 EndProject
index e64b4f9..f18dac7 100644 (file)
@@ -94,7 +94,7 @@ void visitprivate(const CallExp &e)
 #ifdef _MSC_VER
             swprintf_s(szError, bsiz, _W("Function \"%s\" failed\n"), pCall->getName().c_str());
 #else
-            swprintf(szError, bsiz, _W("Function \"%S\" failed\n"), pCall->getName().c_str());
+            swprintf(szError, bsiz, _W("Function \"%ls\" failed\n"), pCall->getName().c_str());
 #endif
             throw wstring(szError);
         }
index a4ea507..c5a8e80 100644 (file)
@@ -526,7 +526,7 @@ namespace ast
 #ifdef _MSC_VER
                 swprintf_s(szError, bsiz, _W("Undefined variable: %s\n"), e.name_get().c_str());
 #else
-                swprintf(szError, bsiz, _W("Undefined variable: %S\n"), e.name_get().c_str());
+                swprintf(szError, bsiz, _W("Undefined variable: %ls\n"), e.name_get().c_str());
 #endif
                 throw wstring(szError);
                 //Err, SimpleVar doesn't exist in Scilab scopes.
@@ -610,7 +610,7 @@ namespace ast
 #ifdef _MSC_VER
                         swprintf_s(szError, bsiz, _W("Unknown field : %s.\n"), psvRightMember->name_get().c_str());
 #else
-                        swprintf(szError, bsiz, _W("Unknown field : %S.\n"), psvRightMember->name_get().c_str());
+                        swprintf(szError, bsiz, _W("Unknown field : %ls.\n"), psvRightMember->name_get().c_str());
 #endif
                         throw wstring(szError);
                     }
@@ -643,7 +643,7 @@ namespace ast
 #ifdef _MSC_VER
                         swprintf_s(szError, bsiz, _W("Unknown field : %s.\n"), psvRightMember->name_get().c_str());
 #else
-                        swprintf(szError, bsiz, _W("Unknown field : %S.\n"), psvRightMember->name_get().c_str());
+                        swprintf(szError, bsiz, _W("Unknown field : %ls.\n"), psvRightMember->name_get().c_str());
 #endif
                         throw wstring(szError);
                     }
@@ -1081,7 +1081,7 @@ namespace ast
 #ifdef _MSC_VER
                             swprintf_s(szError, bsiz, _W("Function \"%s\" failed\n"), pCall->getName().c_str());
 #else
-                            swprintf(szError, bsiz, _W("Function \"%S\" failed\n"), pCall->getName().c_str());
+                            swprintf(szError, bsiz, _W("Function \"%ls\" failed\n"), pCall->getName().c_str());
 #endif
                             throw wstring(szError);
                         }
index 76a0842..38c0860 100644 (file)
@@ -43,7 +43,6 @@ 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 \
@@ -376,7 +375,6 @@ includes/stackinfo.h \
 includes/stackTypeVariable.h \
 includes/version.h \
 includes/getversion.h \
-includes/warningmode.h \
 includes/Thread_Wrapper.h
 
 include $(top_srcdir)/Makefile.incl.am
index b638251..a17945a 100644 (file)
@@ -136,8 +136,8 @@ am__libscicore_la_SOURCES_DIST = src/c/inffic.c src/c/cs2st.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/scirun.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 \
@@ -257,9 +257,9 @@ am__objects_2 = libscicore_la-inffic.lo libscicore_la-cs2st.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 \
-       libscicore_la-scirun.lo libscicore_la-warningmode.lo \
-       libscicore_la-InitializeCore.lo libscicore_la-TerminateCore.lo \
-       libscicore_la-coretable.lo libscicore_la-returnProperty.lo \
+       libscicore_la-scirun.lo libscicore_la-InitializeCore.lo \
+       libscicore_la-TerminateCore.lo libscicore_la-coretable.lo \
+       libscicore_la-returnProperty.lo \
        libscicore_la-returnPropertyList.lo \
        libscicore_la-GetXmlFileEncoding.lo \
        libscicore_la-islittleendian.lo libscicore_la-terme.lo \
@@ -646,12 +646,11 @@ CORE_C_SOURCES = src/c/inffic.c src/c/cs2st.c src/c/intmacr2tree.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 \
+       src/c/stackinfo.c src/c/scirun.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 \
        src/c/callFunctionFromGateway.c src/c/getvariablesname.c \
        src/c/commandwords.c src/c/freeArrayOfString.c \
        src/c/getstaticdebuginfo.c src/c/getdynamicdebuginfo.c \
@@ -881,7 +880,6 @@ includes/stackinfo.h \
 includes/stackTypeVariable.h \
 includes/version.h \
 includes/getversion.h \
-includes/warningmode.h \
 includes/Thread_Wrapper.h
 
 
@@ -1154,7 +1152,6 @@ distclean-compile:
 @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@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-warningmode.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-with_module.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscicore_la-xscion.Plo@am__quote@
 
@@ -1417,13 +1414,6 @@ libscicore_la-scirun.lo: src/c/scirun.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-scirun.lo `test -f 'src/c/scirun.c' || echo '$(srcdir)/'`src/c/scirun.c
 
-libscicore_la-warningmode.lo: src/c/warningmode.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-warningmode.lo -MD -MP -MF $(DEPDIR)/libscicore_la-warningmode.Tpo -c -o libscicore_la-warningmode.lo `test -f 'src/c/warningmode.c' || echo '$(srcdir)/'`src/c/warningmode.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-warningmode.Tpo $(DEPDIR)/libscicore_la-warningmode.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/warningmode.c' object='libscicore_la-warningmode.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-warningmode.lo `test -f 'src/c/warningmode.c' || echo '$(srcdir)/'`src/c/warningmode.c
-
 libscicore_la-InitializeCore.lo: src/c/InitializeCore.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-InitializeCore.lo -MD -MP -MF $(DEPDIR)/libscicore_la-InitializeCore.Tpo -c -o libscicore_la-InitializeCore.lo `test -f 'src/c/InitializeCore.c' || echo '$(srcdir)/'`src/c/InitializeCore.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscicore_la-InitializeCore.Tpo $(DEPDIR)/libscicore_la-InitializeCore.Plo
diff --git a/scilab/modules/core/includes/warningmode.h b/scilab/modules/core/includes/warningmode.h
deleted file mode 100644 (file)
index ef6c315..0000000
+++ /dev/null
@@ -1,43 +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 __WARNINGMODE_H__
-#define __WARNINGMODE_H__
-
-#include "BOOL.h"
-#include "machine.h" /* C2F */
-
-/**
- * @TODO add comment
- *
- * @param ON    
- * @return <ReturnValue>
- */
-BOOL setWarningMode(BOOL ON);
-
-/**
- * @TODO add comment
- *
- * @param void  
- * @return <ReturnValue>
- */
-BOOL getWarningMode(void);
-
-/**
- * fortran version of getWarningMode 
- *
- * @param rep   
- * @return <ReturnValue>
- */
-int C2F(iswarningon)(int *rep);
-
-#endif /*  __WARNINGMODE_H__ */
-/*--------------------------------------------------------------------------*/
index 0534fc3..fc11e34 100644 (file)
@@ -14,7 +14,7 @@
 #include "stack-c.h"
 #include "sciprint.h"
 #include "Scierror.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "MALLOC.h"
 #include "Scierror.h"
 #include "localization.h"
index 8591c58..5a92970 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath=".\warningmode.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\with_module.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\warningmode.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\with_module.h"
                                >
                        </File>
diff --git a/scilab/modules/core/src/c/warningmode.c b/scilab/modules/core/src/c/warningmode.c
deleted file mode 100644 (file)
index 07584a4..0000000
+++ /dev/null
@@ -1,33 +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 "warningmode.h"
-/*--------------------------------------------------------------------------*/
-static BOOL WARNINGMODEON=TRUE;
-/*--------------------------------------------------------------------------*/
-BOOL setWarningMode(BOOL ON)
-{
-       WARNINGMODEON = ON;
-       return WARNINGMODEON;
-}
-/*--------------------------------------------------------------------------*/
-BOOL getWarningMode(void)
-{
-       return WARNINGMODEON;
-}
-/*--------------------------------------------------------------------------*/
-int C2F(iswarningon)(int *rep)
-{
-       if (WARNINGMODEON) *rep=1;
-       else *rep=0;
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index b593dad..56506aa 100644 (file)
@@ -32,6 +32,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
 -I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/system_env/includes \
 -I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidynamic_link.la
index 9c50c76..c64e5eb 100644 (file)
@@ -447,6 +447,7 @@ libscidynamic_link_la_CFLAGS = \
 -I$(top_srcdir)/libs/dynamiclibrary/includes \
 -I$(srcdir)/src/c/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
+-I$(top_srcdir)/modules/system_env/includes \
 -I$(srcdir)/includes/
 
 pkglib_LTLIBRARIES = libscidynamic_link.la
index 0f0979a..5d0583b 100644 (file)
@@ -3,7 +3,7 @@
 
 EXPORTS
 ;core
-;
+
 vstk_
 gettype_
 freeArrayOfString
@@ -19,7 +19,6 @@ putlhsvar_
 com_
 iop_
 callFunctionFromGateway
-getWarningMode
 cvname_
 funtab_
 ExceptionMessage
index c117893..4731b10 100644 (file)
@@ -26,7 +26,7 @@
 #include "MALLOC.h" /* MALLOC */
 #include "sciprint.h"
 #include "Funtab.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "GetenvB.h"
 #include "localization.h"
 #include "Scierror.h"
index 419aae6..4571713 100644 (file)
@@ -18,7 +18,7 @@
 #include "dynamiclibrary.h"
 #include "men_Sutils.h"
 #include "MALLOC.h" /* MALLOC */
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "sciprint.h"
 #include "stack-c.h"
 #include "addinter.h"
index c0bc4cf..43d9f12 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;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes;../../../../libs/hashtable;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 2d407ca..a78292f 100644 (file)
@@ -9,7 +9,6 @@ stack_
 intersci_
 returnanan_
 callFunctionFromGateway
-getWarningMode
 islittleendian
 createvarfromptr_
 putlhsvar_
index 033dfa2..f0628a1 100644 (file)
@@ -16,14 +16,12 @@ src/c/getfiledesc.c \
 src/c/getfileinfo.c \
 src/c/getfiletype.c \
 src/c/mclearerr.c \
-src/c/mclose.c \
 src/c/meof.c \
 src/c/merror.c \
 src/c/mget.c \
 src/c/mgetl.c \
 src/c/mgeti.c \
 src/c/mgetstr.c \
-src/c/mopen.c \
 src/c/mput.c \
 src/c/mputi.c \
 src/c/mputstr.c \
@@ -50,7 +48,8 @@ src/c/movefile.c \
 src/c/basename.c \
 src/c/pathconvert.c \
 src/c/copyfile_others.c \
-src/c/getFullFilename.c
+src/c/getFullFilename.c \
+src/c/os_wfopen.c
 
 GATEWAY_C_SOURCES = \
 sci_gateway/c/gw_fileio.c \
@@ -76,13 +75,11 @@ sci_gateway/c/sci_createdir.c \
 sci_gateway/c/sci_chdir.c \
 sci_gateway/c/sci_pwd.c \
 sci_gateway/c/sci_mclearerr.c \
-sci_gateway/c/sci_mclose.c \
 sci_gateway/c/sci_merror.c \
 sci_gateway/c/sci_mget.c \
 sci_gateway/c/sci_mgetl.c \
 sci_gateway/c/sci_mgetstr.c \
 sci_gateway/c/sci_moef.c \
-sci_gateway/c/sci_mopen.c \
 sci_gateway/c/sci_mput.c \
 sci_gateway/c/sci_mputstr.c \
 sci_gateway/c/sci_mseek.c \
@@ -99,10 +96,15 @@ sci_gateway/c/sci_pathconvert.c \
 sci_gateway/c/sci_isfile.c
 
 GATEWAY_CPP_SOURCES = \
-sci_gateway/cpp/fileio_gw.cpp
+       sci_gateway/cpp/fileio_gw.cpp \
+       sci_gateway/cpp/sci_mopen.cpp \
+       sci_gateway/cpp/sci_mclose.cpp
 
 FILEIO_CPP_SOURCES = \
-src/cpp/expandPathVariable.cpp
+       src/cpp/expandPathVariable.cpp \
+       src/cpp/mopen.cpp \
+       src/cpp/mclose.cpp \
+       src/cpp/filemanager.cpp
 
 
 libscifileio_la_CPPFLAGS=      -I$(srcdir)/includes/ \
@@ -116,6 +118,7 @@ libscifileio_la_CPPFLAGS=   -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
                                -I$(top_srcdir)/modules/symbol/includes \
                                -I$(top_srcdir)/modules/string/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                $(HDF5_CFLAGS)
 
 libscifileio_la_CFLAGS=                -I$(srcdir)/includes/ \
index e6deca2..3523e27 100644 (file)
@@ -124,10 +124,9 @@ am__objects_1 = libscifileio_la-FileExist.lo \
        libscifileio_la-delfile.lo libscifileio_la-filesmanagement.lo \
        libscifileio_la-getfiledesc.lo libscifileio_la-getfileinfo.lo \
        libscifileio_la-getfiletype.lo libscifileio_la-mclearerr.lo \
-       libscifileio_la-mclose.lo libscifileio_la-meof.lo \
-       libscifileio_la-merror.lo libscifileio_la-mget.lo \
-       libscifileio_la-mgetl.lo libscifileio_la-mgeti.lo \
-       libscifileio_la-mgetstr.lo libscifileio_la-mopen.lo \
+       libscifileio_la-meof.lo libscifileio_la-merror.lo \
+       libscifileio_la-mget.lo libscifileio_la-mgetl.lo \
+       libscifileio_la-mgeti.lo libscifileio_la-mgetstr.lo \
        libscifileio_la-mput.lo libscifileio_la-mputi.lo \
        libscifileio_la-mputstr.lo libscifileio_la-mseek.lo \
        libscifileio_la-mtell.lo libscifileio_la-readline.lo \
@@ -144,8 +143,11 @@ am__objects_1 = libscifileio_la-FileExist.lo \
        libscifileio_la-splitpath.lo libscifileio_la-movefile.lo \
        libscifileio_la-basename.lo libscifileio_la-pathconvert.lo \
        libscifileio_la-copyfile_others.lo \
-       libscifileio_la-getFullFilename.lo
-am__objects_2 = libscifileio_la-expandPathVariable.lo
+       libscifileio_la-getFullFilename.lo \
+       libscifileio_la-os_wfopen.lo
+am__objects_2 = libscifileio_la-expandPathVariable.lo \
+       libscifileio_la-mopen.lo libscifileio_la-mclose.lo \
+       libscifileio_la-filemanager.lo
 am__objects_3 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_mfprintf.lo libscifileio_la-sci_mscanf.lo \
        libscifileio_la-sci_msscanf.lo libscifileio_la-sci_mfscanf.lo \
@@ -163,10 +165,9 @@ am__objects_3 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_removedir.lo \
        libscifileio_la-sci_createdir.lo libscifileio_la-sci_chdir.lo \
        libscifileio_la-sci_pwd.lo libscifileio_la-sci_mclearerr.lo \
-       libscifileio_la-sci_mclose.lo libscifileio_la-sci_merror.lo \
-       libscifileio_la-sci_mget.lo libscifileio_la-sci_mgetl.lo \
-       libscifileio_la-sci_mgetstr.lo libscifileio_la-sci_moef.lo \
-       libscifileio_la-sci_mopen.lo libscifileio_la-sci_mput.lo \
+       libscifileio_la-sci_merror.lo libscifileio_la-sci_mget.lo \
+       libscifileio_la-sci_mgetl.lo libscifileio_la-sci_mgetstr.lo \
+       libscifileio_la-sci_moef.lo libscifileio_la-sci_mput.lo \
        libscifileio_la-sci_mputstr.lo libscifileio_la-sci_mseek.lo \
        libscifileio_la-sci_mtell.lo libscifileio_la-sci_fileinfo.lo \
        libscifileio_la-sci_newest.lo \
@@ -178,7 +179,8 @@ am__objects_3 = libscifileio_la-gw_fileio.lo \
        libscifileio_la-sci_basename.lo \
        libscifileio_la-sci_pathconvert.lo \
        libscifileio_la-sci_isfile.lo
-am__objects_4 = libscifileio_la-fileio_gw.lo
+am__objects_4 = libscifileio_la-fileio_gw.lo \
+       libscifileio_la-sci_mopen.lo libscifileio_la-sci_mclose.lo
 am_libscifileio_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
        $(am__objects_3) $(am__objects_4)
 libscifileio_la_OBJECTS = $(am_libscifileio_la_OBJECTS)
@@ -476,14 +478,12 @@ src/c/getfiledesc.c \
 src/c/getfileinfo.c \
 src/c/getfiletype.c \
 src/c/mclearerr.c \
-src/c/mclose.c \
 src/c/meof.c \
 src/c/merror.c \
 src/c/mget.c \
 src/c/mgetl.c \
 src/c/mgeti.c \
 src/c/mgetstr.c \
-src/c/mopen.c \
 src/c/mput.c \
 src/c/mputi.c \
 src/c/mputstr.c \
@@ -510,7 +510,8 @@ src/c/movefile.c \
 src/c/basename.c \
 src/c/pathconvert.c \
 src/c/copyfile_others.c \
-src/c/getFullFilename.c
+src/c/getFullFilename.c \
+src/c/os_wfopen.c
 
 GATEWAY_C_SOURCES = \
 sci_gateway/c/gw_fileio.c \
@@ -536,13 +537,11 @@ sci_gateway/c/sci_createdir.c \
 sci_gateway/c/sci_chdir.c \
 sci_gateway/c/sci_pwd.c \
 sci_gateway/c/sci_mclearerr.c \
-sci_gateway/c/sci_mclose.c \
 sci_gateway/c/sci_merror.c \
 sci_gateway/c/sci_mget.c \
 sci_gateway/c/sci_mgetl.c \
 sci_gateway/c/sci_mgetstr.c \
 sci_gateway/c/sci_moef.c \
-sci_gateway/c/sci_mopen.c \
 sci_gateway/c/sci_mput.c \
 sci_gateway/c/sci_mputstr.c \
 sci_gateway/c/sci_mseek.c \
@@ -559,10 +558,15 @@ sci_gateway/c/sci_pathconvert.c \
 sci_gateway/c/sci_isfile.c
 
 GATEWAY_CPP_SOURCES = \
-sci_gateway/cpp/fileio_gw.cpp
+       sci_gateway/cpp/fileio_gw.cpp \
+       sci_gateway/cpp/sci_mopen.cpp \
+       sci_gateway/cpp/sci_mclose.cpp
 
 FILEIO_CPP_SOURCES = \
-src/cpp/expandPathVariable.cpp
+       src/cpp/expandPathVariable.cpp \
+       src/cpp/mopen.cpp \
+       src/cpp/mclose.cpp \
+       src/cpp/filemanager.cpp
 
 libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
@@ -575,6 +579,7 @@ libscifileio_la_CPPFLAGS = -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/modules/abstractSyntaxTree/includes \
                                -I$(top_srcdir)/modules/symbol/includes \
                                -I$(top_srcdir)/modules/string/includes \
+                               -I$(top_srcdir)/modules/system_env/includes \
                                $(HDF5_CFLAGS)
 
 libscifileio_la_CFLAGS = -I$(srcdir)/includes/ \
@@ -771,6 +776,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-expandPathVariable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-fileinfo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-fileio_gw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-filemanager.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-filesmanagement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-findfiles.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-fullpath.Plo@am__quote@
@@ -800,6 +806,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-mputstr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-mseek.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-mtell.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-os_wfopen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-pathconvert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-readline.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscifileio_la-removedir.Plo@am__quote@
@@ -955,13 +962,6 @@ libscifileio_la-mclearerr.lo: src/c/mclearerr.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-mclearerr.lo `test -f 'src/c/mclearerr.c' || echo '$(srcdir)/'`src/c/mclearerr.c
 
-libscifileio_la-mclose.lo: src/c/mclose.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-mclose.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-mclose.Tpo -c -o libscifileio_la-mclose.lo `test -f 'src/c/mclose.c' || echo '$(srcdir)/'`src/c/mclose.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-mclose.Tpo $(DEPDIR)/libscifileio_la-mclose.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mclose.c' object='libscifileio_la-mclose.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-mclose.lo `test -f 'src/c/mclose.c' || echo '$(srcdir)/'`src/c/mclose.c
-
 libscifileio_la-meof.lo: src/c/meof.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-meof.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-meof.Tpo -c -o libscifileio_la-meof.lo `test -f 'src/c/meof.c' || echo '$(srcdir)/'`src/c/meof.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-meof.Tpo $(DEPDIR)/libscifileio_la-meof.Plo
@@ -1004,13 +1004,6 @@ libscifileio_la-mgetstr.lo: src/c/mgetstr.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-mgetstr.lo `test -f 'src/c/mgetstr.c' || echo '$(srcdir)/'`src/c/mgetstr.c
 
-libscifileio_la-mopen.lo: src/c/mopen.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-mopen.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-mopen.Tpo -c -o libscifileio_la-mopen.lo `test -f 'src/c/mopen.c' || echo '$(srcdir)/'`src/c/mopen.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-mopen.Tpo $(DEPDIR)/libscifileio_la-mopen.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/mopen.c' object='libscifileio_la-mopen.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-mopen.lo `test -f 'src/c/mopen.c' || echo '$(srcdir)/'`src/c/mopen.c
-
 libscifileio_la-mput.lo: src/c/mput.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-mput.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-mput.Tpo -c -o libscifileio_la-mput.lo `test -f 'src/c/mput.c' || echo '$(srcdir)/'`src/c/mput.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-mput.Tpo $(DEPDIR)/libscifileio_la-mput.Plo
@@ -1200,6 +1193,13 @@ libscifileio_la-getFullFilename.lo: src/c/getFullFilename.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-getFullFilename.lo `test -f 'src/c/getFullFilename.c' || echo '$(srcdir)/'`src/c/getFullFilename.c
 
+libscifileio_la-os_wfopen.lo: src/c/os_wfopen.c
+@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-os_wfopen.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-os_wfopen.Tpo -c -o libscifileio_la-os_wfopen.lo `test -f 'src/c/os_wfopen.c' || echo '$(srcdir)/'`src/c/os_wfopen.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-os_wfopen.Tpo $(DEPDIR)/libscifileio_la-os_wfopen.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/c/os_wfopen.c' object='libscifileio_la-os_wfopen.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-os_wfopen.lo `test -f 'src/c/os_wfopen.c' || echo '$(srcdir)/'`src/c/os_wfopen.c
+
 libscifileio_la-gw_fileio.lo: sci_gateway/c/gw_fileio.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-gw_fileio.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-gw_fileio.Tpo -c -o libscifileio_la-gw_fileio.lo `test -f 'sci_gateway/c/gw_fileio.c' || echo '$(srcdir)/'`sci_gateway/c/gw_fileio.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-gw_fileio.Tpo $(DEPDIR)/libscifileio_la-gw_fileio.Plo
@@ -1361,13 +1361,6 @@ libscifileio_la-sci_mclearerr.lo: sci_gateway/c/sci_mclearerr.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_mclearerr.lo `test -f 'sci_gateway/c/sci_mclearerr.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mclearerr.c
 
-libscifileio_la-sci_mclose.lo: sci_gateway/c/sci_mclose.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mclose.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mclose.Tpo -c -o libscifileio_la-sci_mclose.lo `test -f 'sci_gateway/c/sci_mclose.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mclose.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_mclose.Tpo $(DEPDIR)/libscifileio_la-sci_mclose.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mclose.c' object='libscifileio_la-sci_mclose.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_mclose.lo `test -f 'sci_gateway/c/sci_mclose.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mclose.c
-
 libscifileio_la-sci_merror.lo: sci_gateway/c/sci_merror.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_merror.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_merror.Tpo -c -o libscifileio_la-sci_merror.lo `test -f 'sci_gateway/c/sci_merror.c' || echo '$(srcdir)/'`sci_gateway/c/sci_merror.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_merror.Tpo $(DEPDIR)/libscifileio_la-sci_merror.Plo
@@ -1403,13 +1396,6 @@ libscifileio_la-sci_moef.lo: sci_gateway/c/sci_moef.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_moef.lo `test -f 'sci_gateway/c/sci_moef.c' || echo '$(srcdir)/'`sci_gateway/c/sci_moef.c
 
-libscifileio_la-sci_mopen.lo: sci_gateway/c/sci_mopen.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mopen.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mopen.Tpo -c -o libscifileio_la-sci_mopen.lo `test -f 'sci_gateway/c/sci_mopen.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mopen.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_mopen.Tpo $(DEPDIR)/libscifileio_la-sci_mopen.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='sci_gateway/c/sci_mopen.c' object='libscifileio_la-sci_mopen.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -c -o libscifileio_la-sci_mopen.lo `test -f 'sci_gateway/c/sci_mopen.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mopen.c
-
 libscifileio_la-sci_mput.lo: sci_gateway/c/sci_mput.c
 @am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(libscifileio_la_CFLAGS) $(CFLAGS) -MT libscifileio_la-sci_mput.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mput.Tpo -c -o libscifileio_la-sci_mput.lo `test -f 'sci_gateway/c/sci_mput.c' || echo '$(srcdir)/'`sci_gateway/c/sci_mput.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/libscifileio_la-sci_mput.Tpo $(DEPDIR)/libscifileio_la-sci_mput.Plo
@@ -1536,6 +1522,27 @@ libscifileio_la-expandPathVariable.lo: src/cpp/expandPathVariable.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-expandPathVariable.lo `test -f 'src/cpp/expandPathVariable.cpp' || echo '$(srcdir)/'`src/cpp/expandPathVariable.cpp
 
+libscifileio_la-mopen.lo: src/cpp/mopen.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-mopen.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-mopen.Tpo -c -o libscifileio_la-mopen.lo `test -f 'src/cpp/mopen.cpp' || echo '$(srcdir)/'`src/cpp/mopen.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-mopen.Tpo $(DEPDIR)/libscifileio_la-mopen.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/mopen.cpp' object='libscifileio_la-mopen.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-mopen.lo `test -f 'src/cpp/mopen.cpp' || echo '$(srcdir)/'`src/cpp/mopen.cpp
+
+libscifileio_la-mclose.lo: src/cpp/mclose.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-mclose.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-mclose.Tpo -c -o libscifileio_la-mclose.lo `test -f 'src/cpp/mclose.cpp' || echo '$(srcdir)/'`src/cpp/mclose.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-mclose.Tpo $(DEPDIR)/libscifileio_la-mclose.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/mclose.cpp' object='libscifileio_la-mclose.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-mclose.lo `test -f 'src/cpp/mclose.cpp' || echo '$(srcdir)/'`src/cpp/mclose.cpp
+
+libscifileio_la-filemanager.lo: src/cpp/filemanager.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-filemanager.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-filemanager.Tpo -c -o libscifileio_la-filemanager.lo `test -f 'src/cpp/filemanager.cpp' || echo '$(srcdir)/'`src/cpp/filemanager.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-filemanager.Tpo $(DEPDIR)/libscifileio_la-filemanager.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/filemanager.cpp' object='libscifileio_la-filemanager.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-filemanager.lo `test -f 'src/cpp/filemanager.cpp' || echo '$(srcdir)/'`src/cpp/filemanager.cpp
+
 libscifileio_la-fileio_gw.lo: sci_gateway/cpp/fileio_gw.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-fileio_gw.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-fileio_gw.Tpo -c -o libscifileio_la-fileio_gw.lo `test -f 'sci_gateway/cpp/fileio_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/fileio_gw.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-fileio_gw.Tpo $(DEPDIR)/libscifileio_la-fileio_gw.Plo
@@ -1543,6 +1550,20 @@ libscifileio_la-fileio_gw.lo: sci_gateway/cpp/fileio_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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-fileio_gw.lo `test -f 'sci_gateway/cpp/fileio_gw.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/fileio_gw.cpp
 
+libscifileio_la-sci_mopen.lo: sci_gateway/cpp/sci_mopen.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_mopen.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mopen.Tpo -c -o libscifileio_la-sci_mopen.lo `test -f 'sci_gateway/cpp/sci_mopen.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mopen.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-sci_mopen.Tpo $(DEPDIR)/libscifileio_la-sci_mopen.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_mopen.cpp' object='libscifileio_la-sci_mopen.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_mopen.lo `test -f 'sci_gateway/cpp/sci_mopen.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mopen.cpp
+
+libscifileio_la-sci_mclose.lo: sci_gateway/cpp/sci_mclose.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscifileio_la-sci_mclose.lo -MD -MP -MF $(DEPDIR)/libscifileio_la-sci_mclose.Tpo -c -o libscifileio_la-sci_mclose.lo `test -f 'sci_gateway/cpp/sci_mclose.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mclose.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscifileio_la-sci_mclose.Tpo $(DEPDIR)/libscifileio_la-sci_mclose.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='sci_gateway/cpp/sci_mclose.cpp' object='libscifileio_la-sci_mclose.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) $(libscifileio_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscifileio_la-sci_mclose.lo `test -f 'sci_gateway/cpp/sci_mclose.cpp' || echo '$(srcdir)/'`sci_gateway/cpp/sci_mclose.cpp
+
 mostlyclean-libtool:
        -rm -f *.lo
 
index a6ad55a..feb5cd9 100644 (file)
@@ -2,4 +2,5 @@ LIBRARY    system_env.dll
 
 
 EXPORTS
-getScilabMode
\ No newline at end of file
+getScilabMode
+getWarningMode
index c5f6745..ed1d713 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"
@@ -36,6 +36,9 @@
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                >
                        </File>
                        <File
+                               RelativePath=".\src\cpp\filemanager.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\filesmanagement.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\mclose.c"
+                               RelativePath=".\src\cpp\mclose.cpp"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\mopen.c"
+                               RelativePath=".\src\cpp\mopen.cpp"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
+                               RelativePath=".\src\c\os_wfopen.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\pathconvert.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\c\sci_mclose.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_merror.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\c\sci_mopen.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_movefile.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\filemanager.hxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\includes\filesmanagement.h"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\os_wfopen.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\pathconvert.h"
                                >
                        </File>
                        </Filter>
                </Filter>
                <File
+                       RelativePath="..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
                        RelativePath=".\fileio.iss"
                        >
                </File>
index c464434..1200e68 100644 (file)
@@ -35,4 +35,8 @@ private :
 public :
        EXTERN_FILEIO_GW static bool Load();
 };
+
+CPP_GATEWAY_PROTOTYPE(sci_mopen);
+CPP_GATEWAY_PROTOTYPE(sci_mclose);
+
 #endif /* !__FILEIO_GW_HXX__ */
diff --git a/scilab/modules/fileio/includes/filemanager.hxx b/scilab/modules/fileio/includes/filemanager.hxx
new file mode 100644 (file)
index 0000000..fb8b78b
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2008-2008 - 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 __FILEMANAGER_HXX__
+#define __FILEMANAGER_HXX__
+
+#include <list>
+#include <string>
+#include "dynlib_fileio.h"
+
+#include "file.hxx"
+
+using namespace std;
+using namespace types;
+
+class FILEIO_IMPEXP FileManager
+{
+//static attributs instantiation
+public :
+    /*commom attributs and function for all File*/
+    static int                  getFileMaxID();
+    static bool                 isOpened(wstring _stFilename);
+    static int                  getFileID(wstring _stFilename);
+    static File*                getFile(int _iID);
+    static int                  getCurrentFile();
+    static int                  addFile(File* _file);
+    static void                 deleteFile(int _iID);
+
+private :
+    static std::vector<File*>   m_fileList;
+    static int                  m_iCurrentFile;     //memorize current using file
+
+};
+
+#endif /* __FILEMANAGER_HXX__ */
index 71d45ad..5b02621 100644 (file)
@@ -26,6 +26,8 @@
 * all opened file if *id = -2 
 */
 FILEIO_IMPEXP void C2F(mclose) (int *fd, double *res);
-
+FILEIO_IMPEXP int mclose(int _iID);
+FILEIO_IMPEXP int mcloseAll();
+FILEIO_IMPEXP int mcloseCurrentFile();
 #endif /* __MCLOSE_H__ */
 /*--------------------------------------------------------------------------*/
index 0350a63..06bc419 100644 (file)
@@ -36,6 +36,7 @@ typedef enum {
 } mopenError;
 
 FILEIO_IMPEXP void C2F(mopen)(int *fd, char *file, char *status, int *f_swap, double *res, int *error);
+FILEIO_IMPEXP int mopen(wchar_t* _pstFilename, wchar_t* _pstMode, int _iSwap, int* _piID);
 
 #endif  /* __MOPEN_H__ */
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/includes/os_wfopen.h b/scilab/modules/fileio/includes/os_wfopen.h
new file mode 100644 (file)
index 0000000..f9fe71e
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-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 __OS_WFOPEN_H__
+#define __OS_WFOPEN_H__
+
+#include <wchar.h>
+#include <stdio.h>
+
+// Windows
+#ifdef _MSC_VER
+#define os_wfopen       _wfopen
+#endif
+
+// Linux
+#ifdef __linux__
+#define os_wfopen       linux_fopen
+FILE* linux_fopen(const wchar_t* _pstFilename, const wchar_t* _pstMode);
+#endif
+
+// MacOS X
+#ifdef __APPLE__
+#define os_fopen        macos_fopen
+FILE* macos_fopen(const wchar_t* _pstFilename, const wchar_t* _pstMode);
+#endif
+
+#endif /* !__OS_WFOPEN_H__ */
index 7010b5d..074cd60 100644 (file)
@@ -19,9 +19,9 @@
 /*  interface function */
 /*--------------------------------------------------------------------------*/ 
 static gw_generic_table Tab[]={
-       {sci_mopen, "mopen"},
+       {NULL, ""}, //mopen
        {sci_mputstr, "mputstr"},
-       {sci_mclose, "mclose"},
+       {NULL, ""}, //mclose
        {sci_mput, "mput"},
        {sci_mget, "mget"},
        {sci_mgetstr, "mgetstr"},
index 34228fc..49daf5a 100644 (file)
@@ -18,7 +18,7 @@
 #include "createdirectory.h"
 #include "isdir.h"
 #include "expandPathVariable.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "sciprint.h"
 #include "Scierror.h"
 #include "localization.h"
diff --git a/scilab/modules/fileio/sci_gateway/c/sci_mclose.c b/scilab/modules/fileio/sci_gateway/c/sci_mclose.c
deleted file mode 100644 (file)
index 0ee59bd..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-* Copyright (C) 2006 - INRIA - Allan CORNET
-* Copyright (C) 2009 - DIGITEO - 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 <stdio.h>
-#include "gw_fileio.h"
-#include "stack-c.h"
-#include "mclose.h"
-#include "localization.h"
-#include "Scierror.h"
-#include "freeArrayOfString.h"
-#include "filesmanagement.h"
-#include "warningmode.h"
-#include "sciprint.h"
-/*--------------------------------------------------------------------------*/
-int sci_mclose(char *fname,unsigned long fname_len)
-{
-       int m1 = 0,n1 = 0,l1 =0;
-       int one = 1, l2 = 0;
-       int fd = ALL_FILES_DESCRIPTOR;
-
-       Nbvars = 0;
-       CheckRhs(0,1);
-       CheckLhs(1,1);
-
-       if (Rhs == 0)
-       {
-               fd = ALL_FILES_DESCRIPTOR;
-               CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l2);
-
-               C2F(mclose)(&fd,stk(l2));
-
-               LhsVar(1) = Rhs+1;
-               PutLhsVar();
-       }
-       else /* Rhs == 1 */
-       {
-               if (GetType(1) == sci_matrix)
-               {
-                       GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
-                       if (m1*n1 == 1)
-                       {
-                               fd = *istk(l1);
-                               CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l2);
-
-                               C2F(mclose)(&fd,stk(l2));
-
-                               LhsVar(1) = Rhs+1;
-                               PutLhsVar();
-                       }
-                       else
-                       {
-                               Scierror(999, _("%s: Wrong size for input argument #%d: A integer expected.\n"), fname,1);
-                       }
-               }
-               else if (GetType(1) == sci_strings)
-               {
-                       char **input_string = NULL;
-
-                       GetRhsVar(1 ,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&input_string);
-                       if (m1*n1 == 1)
-                       {
-                               double err = 0.0;
-
-                               if (strcmp(input_string[0],"all") == 0)
-                               {
-                                       fd = ALL_FILES_DESCRIPTOR;
-                               }
-                               else
-                               {
-                                       fd = GetIdFromFilename(input_string[0]);
-                               }
-
-                               if ( (fd == FILE_ID_NOT_DEFINED) && getWarningMode() )
-                               {
-                                       sciprint(_("%s: No such file %s.\n"),fname, input_string[0]);
-                               }
-                               else
-                               {
-                                       C2F(mclose)(&fd,&err);
-                               }
-
-                               freeArrayOfString(input_string,m1*n1);
-
-                               CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l2);
-                               *stk(l2) = err;
-
-                               LhsVar(1) = Rhs+1;
-                               PutLhsVar();
-                       }
-                       else
-                       {
-                               freeArrayOfString(input_string,m1*n1);
-                               Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname,1);
-                       }
-               }
-               else
-               {
-                       Scierror(999, _("%s: Wrong type for input argument #%d: A integer or string expected.\n"), fname,1);
-               }
-       }
-       return 0;
-}
-/*--------------------------------------------------------------------------*/
index 167193b..7bbd07d 100644 (file)
@@ -25,5 +25,7 @@ bool FileioModule::Load()
 {
     symbol::Context::getInstance()->AddFunction(Function::createFunction(L"cd", &sci_chdir, MODULE_NAME));
     symbol::Context::getInstance()->AddFunction(Function::createFunction(L"pwd", &sci_pwd, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"mopen", &sci_mopen, MODULE_NAME));
+    symbol::Context::getInstance()->AddFunction(Function::createFunction(L"mclose", &sci_mclose, MODULE_NAME));
     return true;
 }
index 69b038c..29708dc 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../functions_manager/includes;../../../types/includes;../../../core/includes;../../../abstractSyntaxTree/includes;../../../symbol/includes;../../../api_scilab/includes;../../../operations/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../system_env/includes;../../../string/includes"
                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_GW_EXPORTS"
                                RuntimeLibrary="2"
                                EnableFunctionLevelLinking="true"
                                RelativePath=".\fileio_gw.cpp"
                                >
                        </File>
+                       <File
+                               RelativePath=".\sci_mclose.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\sci_mopen.cpp"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="Header Files"
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
                        >
                </Filter>
+               <File
+                       RelativePath="..\..\..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\..\..\bin\lapack.lib"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\..\..\bin\libintl.lib"
+                       >
+               </File>
        </Files>
        <Globals>
        </Globals>
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_mclose.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_mclose.cpp
new file mode 100644 (file)
index 0000000..32bef2d
--- /dev/null
@@ -0,0 +1,171 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-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 "alltypes.hxx"
+#include "funcmanager.hxx"
+#include "filemanager.hxx"
+#include "fileio_gw.hxx"
+
+extern "C"
+{
+#include "Scierror.h"
+#include "localization.h"
+#include "mclose.h"
+#include "os_wcsicmp.h"
+}
+
+using namespace types;
+
+Function::ReturnValue sci_mclose(typed_list &in, int _iRetCount, typed_list &out)
+{
+    int iRet = 0;
+    if(in.size() == 0)
+    {//close current file
+        iRet = mcloseCurrentFile();
+    }
+    else if(in.size() == 1)
+    {
+        if(in[0]->getType() == InternalType::RealString)
+        {
+            String *pS = in[0]->getAsString();
+            if(pS->size_get() != 1)
+            {
+                ScierrorW(999,_W("%ls: Wrong type for input argument #%d: A String expected.\n"), L"mclose", 1);
+                return Function::Error;
+            }
+
+            if(os_wcsicmp(pS->string_get(0), L"all") != 0)
+            {
+                ScierrorW(999, _W("%ls: Wrong input arguments: '%ls' expected.\n"), L"mclose", L"all");
+                return Function::Error;
+            }
+
+            iRet = mcloseAll();
+        }
+        else if(in[0]->getType() == InternalType::RealDouble)
+        {
+            Double* pD = in[0]->getAsDouble();
+            if(pD->size_get() != 1 || pD->isComplex())
+            {
+                ScierrorW(999,_W("%ls: Wrong type for input argument #%d: A real expected.\n"), L"mclose", 1);
+                return Function::Error;
+            }
+
+            int iVal = static_cast<int>(pD->real_get()[0]);
+            iRet = mclose(iVal);
+        }
+        else
+        {
+            ScierrorW(999, _W("%ls: Wrong type for input argument #%d: A integer or string expected.\n"), L"mclose", 1);
+            return Function::Error;
+        }
+    }
+    else
+    {
+        ScierrorW(999, _W("%ls: Wrong number of input arguments: %d or %d expected.\n"), L"mclose", 0, 1);
+        return Function::Error;
+    }
+
+    Double* pD = new Double(static_cast<double>(iRet));
+    out.push_back(pD);
+    return Function::OK;
+}
+
+int sci_mclose(char *fname,unsigned long fname_len)
+{
+       //int m1 = 0,n1 = 0,l1 =0;
+       //int one = 1, l2 = 0;
+       //int fd = ALL_FILES_DESCRIPTOR;
+
+       //Nbvars = 0;
+       //CheckRhs(0,1);
+       //CheckLhs(1,1);
+
+       //if (Rhs == 0)
+       //{
+       //      fd = ALL_FILES_DESCRIPTOR;
+       //      CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l2);
+
+       //      C2F(mclose)(&fd,stk(l2));
+
+       //      LhsVar(1) = Rhs+1;
+       //      PutLhsVar();
+       //}
+       //else /* Rhs == 1 */
+       //{
+       //      if (GetType(1) == sci_matrix)
+       //      {
+       //              GetRhsVar(1,MATRIX_OF_INTEGER_DATATYPE,&m1,&n1,&l1);
+       //              if (m1*n1 == 1)
+       //              {
+       //                      fd = *istk(l1);
+       //                      CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l2);
+
+       //                      C2F(mclose)(&fd,stk(l2));
+
+       //                      LhsVar(1) = Rhs+1;
+       //                      PutLhsVar();
+       //              }
+       //              else
+       //              {
+       //                      Scierror(999, _("%s: Wrong size for input argument #%d: A integer expected.\n"), fname,1);
+       //              }
+       //      }
+       //      else if (GetType(1) == sci_strings)
+       //      {
+       //              char **input_string = NULL;
+
+       //              GetRhsVar(1 ,MATRIX_OF_STRING_DATATYPE,&m1,&n1,&input_string);
+       //              if (m1*n1 == 1)
+       //              {
+       //                      double err = 0.0;
+
+       //                      if (strcmp(input_string[0],"all") == 0)
+       //                      {
+       //                              fd = ALL_FILES_DESCRIPTOR;
+       //                      }
+       //                      else
+       //                      {
+       //                              fd = GetIdFromFilename(input_string[0]);
+       //                      }
+
+       //                      if ( (fd == FILE_ID_NOT_DEFINED) && getWarningMode() )
+       //                      {
+       //                              sciprint(_("%s: No such file %s.\n"),fname, input_string[0]);
+       //                      }
+       //                      else
+       //                      {
+       //                              C2F(mclose)(&fd,&err);
+       //                      }
+
+       //                      freeArrayOfString(input_string,m1*n1);
+
+       //                      CreateVar(Rhs+1,MATRIX_OF_DOUBLE_DATATYPE, &one, &one, &l2);
+       //                      *stk(l2) = err;
+
+       //                      LhsVar(1) = Rhs+1;
+       //                      PutLhsVar();
+       //              }
+       //              else
+       //              {
+       //                      freeArrayOfString(input_string,m1*n1);
+       //                      Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname,1);
+       //              }
+       //      }
+       //      else
+       //      {
+       //              Scierror(999, _("%s: Wrong type for input argument #%d: A integer or string expected.\n"), fname,1);
+       //      }
+       //}
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/sci_gateway/cpp/sci_mopen.cpp b/scilab/modules/fileio/sci_gateway/cpp/sci_mopen.cpp
new file mode 100644 (file)
index 0000000..305e4f8
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-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 "alltypes.hxx"
+#include "funcmanager.hxx"
+#include "filemanager.hxx"
+#include "fileio_gw.hxx"
+extern "C"
+{
+#include "Scierror.h"
+#include "localization.h"
+#include "expandPathVariable.h"
+#include "mopen.h"
+#include "charEncoding.h"
+#include "MALLOC.h"
+}
+
+using namespace types;
+
+Function::ReturnValue sci_mopen(typed_list &in, int _iRetCount, typed_list &out)
+{
+    int iErr                = 0;
+    int iID                 = 0;
+    wchar_t* pstFilename    = NULL;
+    wchar_t* pstMode        = L"wb";
+    int iSwap               = 1;
+
+    //check input parameters
+    if(in.size() >= 1)
+    {//filename
+        if(in[0]->getType() != InternalType::RealString)
+        {
+            Scierror(999, _("%s: Wrong type for input argument #%d: A string expected.\n"), "mopen", 1);
+            return Function::Error;
+        }
+
+        String* pS1 = in[0]->getAsString();
+        if(pS1->size_get() != 1)
+        {
+            Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), "mopen" , 1);
+            return Function::Error;
+        }
+
+        pstFilename = expandPathVariableW(pS1->string_get(0));
+
+        if(in.size() >= 2)
+        {//mode
+            if(in[1]->getType() != InternalType::RealString)
+            {
+                Scierror(999, _("%s: Wrong type for input argument #%d: A string expected.\n"), "mopen", 2);
+                return Function::Error;
+            }
+
+            String* pS2 = in[1]->getAsString();
+            if(pS2->size_get() != 1)
+            {
+                Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), "mopen" , 2);
+                return Function::Error;
+            }
+
+            pstMode = pS2->string_get(0);
+
+            if(in.size() >= 3)
+            {//swap
+                if(in[2]->getType() != InternalType::RealDouble)
+                {
+                    Scierror(999, _("%s: Wrong type for input argument #%d: An integer expected.\n"), "mopen" , 3);
+                    return Function::Error;
+                }
+
+                Double* pD3 = in[2]->getAsDouble();
+                if(pD3->size_get() != 1 || pD3->isComplex())
+                {
+                    Scierror(999, _("%s: Wrong size for input argument #%d: An integer expected.\n"), "mopen", 3);
+                    return Function::Error;
+                }
+
+                //if value == 0 set swap to 0 otherwise let to 1
+                if(pD3->real_get(0,0) == 0)
+                {
+                    iSwap = 0;
+                }
+
+                if(in.size() >= 4)
+                {
+                    Scierror(999, _("%s: Wrong number of input arguments: %d to %d expected.\n"), "mopen" , 1, 3);
+                    return Function::Error;
+                }
+
+            }
+        }
+    }
+    else
+    {
+        Scierror(999, _("%s: Wrong number of input arguments: %d to %d expected.\n"), "mopen" , 1, 3);
+        return Function::Error;
+    }
+
+
+    iErr = mopen(pstFilename, pstMode, iSwap, &iID);
+
+    
+    if(iErr != MOPEN_NO_ERROR)
+    {//mange file open errors
+        if(_iRetCount == 1)
+        {
+            switch(iErr)
+            {
+                               case MOPEN_CAN_NOT_OPEN_FILE:
+                               {
+                                       ScierrorW(999, _W("%ls: Cannot open file %ls.\n"), L"mopen", pstFilename);
+                                       FREE(pstFilename);
+                                       pstFilename = NULL;
+                    return Function::Error;
+                               }
+                               case MOPEN_INVALID_FILENAME:
+                               {
+                                       ScierrorW(999,_W("%ls: invalid filename.\n"), L"mopen");
+                                       FREE(pstFilename);
+                                       pstFilename = NULL;
+                    return Function::Error;
+                               }
+                               case MOPEN_INVALID_STATUS:
+                               {
+                                       ScierrorW(999,_W("%ls: invalid status.\n"), L"mopen");
+                                       FREE(pstFilename);
+                                       pstFilename = NULL;
+                    return Function::Error;
+                               }
+            }
+        }
+    }
+
+    out.push_back(FileManager::getFile(iID));
+    return Function::OK;
+}
index f356aac..21ce86f 100644 (file)
@@ -16,6 +16,7 @@
 /*--------------------------------------------------------------------------*/
 void C2F(addfile)(int *fd, FILE *fa, int *swap2, int *type, int *mode, char *filename, int *ierr)
 {
+    printf("Call of old addfile\n");
        if (SetFileNameOpenedInScilab(*fd,filename) == FALSE ) 
        {
                *ierr=1;
diff --git a/scilab/modules/fileio/src/c/mopen.c b/scilab/modules/fileio/src/c/mopen.c
deleted file mode 100644 (file)
index aee5400..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2007 - INRIA
- * Copyright (C) 2009 - DIGITEO - 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 <stdio.h>
-#include <string.h>
-#include "mopen.h"
-#include "Status2Mode.h"
-#include "filesmanagement.h"
-#include "getfiledesc.h"
-#include "addfile.h"
-#include "sciprint.h"
-#include "localization.h"
-#include "warningmode.h"
-#include "MALLOC.h"
-#include "BOOL.h"
-#include "charEncoding.h"
-#include "isdir.h"
-/*--------------------------------------------------------------------------*/
-extern int swap;
-/*--------------------------------------------------------------------------*/
-void C2F(mopen)(int *fd, char *file, char *status, int *f_swap, double *res, int *error)
-{   
-       int     littlendian = 1,type = 2,ierr,mode;
-       char    *endptr;
-       FILE * fa;
-
-       if ( getWarningMode() && IsAlreadyOpenedInScilab(file) )
-       {
-               sciprint(_("Warning: file '%s' already opened in Scilab.\n"),file);
-       }
-
-       swap =0;
-       *error = (int)MOPEN_NO_ERROR;
-       endptr = (char *) &littlendian;
-       if ( (!*endptr) )
-       {
-               if( *f_swap == 1 ) swap = 1;
-               else swap = 0;
-       }
-
-       C2F(getfiledesc)(fd);
-
-       if ( *fd == -1 )
-       {
-               *error = (int)MOPEN_NO_MORE_LOGICAL_UNIT;
-               return;
-       }
-
-       /* bug 4846 */
-       if (file == NULL)
-       {
-               *error = (int)MOPEN_INVALID_FILENAME;
-               return;
-       }
-
-       if (strlen(file) == 0)
-       {
-               *error = (int)MOPEN_INVALID_FILENAME;
-               return;
-       }
-
-       if (status == NULL)
-       {
-               *error = (int)MOPEN_INVALID_STATUS;
-               return;
-       }
-
-       if (strlen(status) == 0)
-       {
-               *error = (int)MOPEN_INVALID_STATUS;
-               return;
-       }
-
-       if ((status[0] != 'a') && (status[0] != 'r') && (status[0] != 'w'))
-       {
-               *error = (int)MOPEN_INVALID_STATUS;
-               return;
-       }
-
-       if (isdir(file))
-       {
-               *error = (int)MOPEN_CAN_NOT_OPEN_FILE;
-               return;
-       }
-
-       wcfopen(fa , file,status);
-
-       if (! fa )
-       {     
-               *error = (int)MOPEN_CAN_NOT_OPEN_FILE;
-               return;
-       }
-       mode = Status2Mode(status);
-       C2F(addfile)(fd,fa,&swap,&type,&mode,file,&ierr);
-       if (ierr)
-       {
-               *error = (int)MOPEN_NO_MORE_MEMORY;
-               return;
-       }
-       SetCurrentFileId(*fd);
-       *res = (double)ferror(fa);
-}
-/*--------------------------------------------------------------------------*/
-
index 791873a..12ec80e 100644 (file)
@@ -24,7 +24,7 @@
 #include "islittleendian.h"
 #include "../../../libs/libst/misc.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 /*--------------------------------------------------------------------------*/
 extern struct soundstream ftf; /* defined in mget.c */
 extern int swap; /* defined in mget.c */
diff --git a/scilab/modules/fileio/src/c/os_wfopen.c b/scilab/modules/fileio/src/c/os_wfopen.c
new file mode 100644 (file)
index 0000000..e84dcd7
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-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 "os_wfopen.h"
+#include "MALLOC.h"
+#include "charEncoding.h"
+
+
+#ifdef __APPLE__
+FILE* macos_fopen(const wchar_t* _pstFilename, const wchar_t* _pstMode)
+{
+    return linux_fopen(_pstFilename, _pstMode);
+}
+
+#endif
+
+
+#ifndef _MSC_VER
+FILE* linux_fopen(const wchar_t* _pstFilename, const wchar_t* _pstMode)
+{
+    char* pstFilename   = wide_string_to_UTF8(_pstFilename);
+    char* pstMode       = wide_string_to_UTF8(_pstMode);
+
+    FILE* pFile         = fopen(pstFilename, pstMode);
+    FREE(pstFilename);
+    FREE(pstMode);
+    return pFile;
+}
+
+#endif
index 923c433..4c907f6 100644 (file)
@@ -26,7 +26,7 @@
 #include "MALLOC.h"
 #include "localization.h"
 #include "charEncoding.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "PATH_MAX.h"
 /*--------------------------------------------------------------------------*/
 int scichdirW(wchar_t *wcpath)
diff --git a/scilab/modules/fileio/src/cpp/filemanager.cpp b/scilab/modules/fileio/src/cpp/filemanager.cpp
new file mode 100644 (file)
index 0000000..8dd361a
--- /dev/null
@@ -0,0 +1,110 @@
+/*
+*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+*  Copyright (C) 2008-2008 - 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 "filemanager.hxx"
+
+std::vector<types::File*> FileManager::m_fileList;
+int FileManager::m_iCurrentFile = -1;
+
+int FileManager::getFileID(wstring _stFilename)
+{
+    for(int i = 0 ; i < m_fileList.size() ; i++)
+    {
+        if(m_fileList[i]->getFilename() == _stFilename)
+        {
+            return i + 1;
+        }
+    }
+    return -1;
+}
+
+int FileManager::getFileMaxID()
+{
+    return static_cast<int>(m_fileList.size());
+}
+
+bool FileManager::isOpened(wstring _stFilename)
+{
+    for(int i = 0 ; i < m_fileList.size() ; i++)
+    {
+        if(m_fileList[i]->getFilename() == _stFilename)
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+types::File* FileManager::getFile(int _iID)
+{
+    if(_iID <= m_fileList.size())
+    {//1-indexed
+        return m_fileList[_iID - 1];
+    }
+
+    return NULL;
+}
+
+int FileManager::addFile(types::File* _file)
+{
+    //if already opened, return previous ID
+    //if(isOpened(_file->getFilename()) == true)
+    //{
+    //    int iFile = getFileID(_file->getFilename());
+    //        _file->real_get()[0] = iFile;
+    //    return iFile;
+    //}
+
+    //find first free space
+    for(int i = 0 ; i < m_fileList.size() ; i++)
+    {
+        if(m_fileList[i] == NULL)
+        {
+            m_fileList[i] = _file;
+            //put ID in "double" part
+            _file->real_get()[0] = i + 1;
+            return i + 1;
+        }
+    }
+
+    //no free space, add at the end
+    m_fileList.push_back(_file);
+    int iNewId = static_cast<int>(m_fileList.size());
+    _file->real_get()[0] = iNewId;
+    m_iCurrentFile = iNewId;
+    return iNewId;
+}
+
+void FileManager::deleteFile(int _iID)
+{
+    if(_iID <= m_fileList.size())
+    {//1-indexed
+        //do not delete File object !!!
+        //delete m_fileList[_iID - 1];
+        m_fileList[_iID - 1] = NULL;
+        if(m_iCurrentFile == _iID)
+        {
+            m_iCurrentFile = -1;
+        }
+    }
+
+    //to clean end of list and remove empty spaces
+    while(m_fileList.size() != 0 && m_fileList.back() == NULL)
+    {
+        m_fileList.pop_back();
+    }
+}
+
+int FileManager::getCurrentFile()
+{
+    return m_iCurrentFile;
+}
similarity index 67%
rename from scilab/modules/fileio/src/c/mclose.c
rename to scilab/modules/fileio/src/cpp/mclose.cpp
index cd404f4..d580b9f 100644 (file)
  *
  */
 /*--------------------------------------------------------------------------*/
+#include "filemanager.hxx"
+
+extern "C"
+{
 #include "mclose.h"
 #include "filesmanagement.h"
 #include "delfile.h"
 #include "core_math.h" /* Min Max */
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "sci_warning.h"
+#include "charEncoding.h"
+}
 /*--------------------------------------------------------------------------*/
+int mcloseCurrentFile()
+{
+    return mclose(FileManager::getCurrentFile());
+}
+
+int mcloseAll()
+{
+    while(FileManager::getFileMaxID() != 0)
+    {
+        int iRet = mclose(FileManager::getFileMaxID());
+        if(iRet)
+        {
+            return iRet;
+        }
+    }
+    
+    //for(int i = 0 ; i < FileManager::getFileMaxID() ; i++)
+    //{
+    //    int iRet = mclose(i+1);
+    //    if(iRet)
+    //    {
+    //        return iRet;
+    //    }
+    //}
+
+    return 0;
+}
+
+int mclose(int _iID)
+{
+    File* pF = FileManager::getFile(_iID);
+    if(pF != NULL)
+    {
+        int iRet = fclose(pF->getFiledesc());
+        // this function previously called ferror on a just before fclosed FILE* that could lead to crash at exit, depending on libc implementation.
+        if(iRet != 0)
+        {
+            iRet = 1;
+        }
+
+        FileManager::deleteFile(_iID);
+    }
+    else
+    {
+        if (getWarningMode()) 
+        {
+            sciprintW(_W("%ls: Cannot close file whose descriptor is %d: File is not active.\n"), L"mclose", _iID);
+        }
+    }
+    return 0;
+}
+
 void C2F(mclose) (int *fd, double *res)
 {   
        int fd1 = -1;
diff --git a/scilab/modules/fileio/src/cpp/mopen.cpp b/scilab/modules/fileio/src/cpp/mopen.cpp
new file mode 100644 (file)
index 0000000..01deec3
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2007 - INRIA
+ * Copyright (C) 2009 - DIGITEO - 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 <stdio.h>
+#include <string.h>
+#include "file.hxx"
+#include "filemanager.hxx"
+
+extern "C"
+{
+#include "mopen.h"
+#include "sciprint.h"
+#include "charEncoding.h"
+#include "sci_warning.h"
+#include "isdir.h"
+#include "localization.h"
+#include "os_wfopen.h"
+}
+/*--------------------------------------------------------------------------*/
+int mopen(wchar_t* _pstFilename, wchar_t* _pstMode, int _iSwap, int* _piID)
+{
+    if(getWarningMode() && FileManager::isOpened(_pstFilename))
+    {
+               sciprintW(_W("Warning: file '%ls' already opened in Scilab.\n"), _pstFilename);
+    }
+       /* bug 4846 */
+       if (_pstFilename == NULL)
+       {
+               return MOPEN_INVALID_FILENAME;
+       }
+
+       if (wcslen(_pstFilename) == 0)
+       {
+               return MOPEN_INVALID_FILENAME;
+       }
+
+       if (_pstMode == NULL)
+       {
+               return MOPEN_INVALID_STATUS;
+       }
+
+       if (wcslen(_pstMode) == 0)
+       {
+               return MOPEN_INVALID_STATUS;
+       }
+
+       if ((_pstMode[0] != L'a') && (_pstMode[0] != L'r') && (_pstMode[0] != L'w'))
+       {
+               return MOPEN_INVALID_STATUS;
+       }
+
+       if (isdirW(_pstFilename))
+       {
+               return MOPEN_CAN_NOT_OPEN_FILE;
+       }
+
+       FILE* pF = os_wfopen(_pstFilename, _pstMode);
+       if (pF == NULL)
+       {     
+               return MOPEN_CAN_NOT_OPEN_FILE;
+       }
+
+    //Create File object and fill it
+    types::File* pFile = new types::File();
+    pFile->setFileDesc(pF);
+    pFile->setFilename(_pstFilename);
+    pFile->setFileMode(_pstMode);
+    pFile->setFileSwap(_iSwap);
+
+    *_piID = FileManager::addFile(pFile);
+    return MOPEN_NO_ERROR;
+}
+
+void C2F(mopen)(int *fd, char *file, char *status, int *f_swap, double *res, int *error)
+{   
+}
+/*--------------------------------------------------------------------------*/
+
index 0962945..9790f78 100644 (file)
@@ -77,7 +77,7 @@ Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, types::typ
 #ifdef _MSC_VER
                                swprintf_s(stErr, 1024, L"\"%s\" value is not a valid value for exec function", pS->string_get(0));
 #else
-                               swprintf(stErr, 1024, L"\"%S\" value is not a valid value for exec function", pS->string_get(0));
+                               swprintf(stErr, 1024, L"\"%ls\" value is not a valid value for exec function", pS->string_get(0));
 #endif
                                YaspWriteW(stErr);
                                return Function::Error;
@@ -121,7 +121,6 @@ Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, types::typ
 
        if(in[0]->getType() == InternalType::RealString)
        {//1st argument is a path, parse file and execute it
-               char pstParsePath[PATH_MAX + FILENAME_MAX];
                int iParsePathLen               = 0;
                String* pS = in[0]->getAsString();
                if(pS->size_get() != 1)
@@ -132,6 +131,7 @@ Function::ReturnValue sci_exec(types::typed_list &in, int _iRetCount, types::typ
                wchar_t* pstFile = pS->string_get(0);
         wchar_t *expandedPath = expandPathVariableW(pstFile);
         parser.parseFile(expandedPath, L"exec");
+        FREE(expandedPath);
                if(parser.getExitStatus() !=  Parser::Succeded)
                {
                        YaspWriteW(parser.getErrorMessage());
index b3abfa9..5709309 100644 (file)
@@ -29,7 +29,6 @@ extern "C"
 #include "MALLOC.h"
 
 #include "os_wcsicmp.h"
-#include "cluni0.h"
 #include "PATH_MAX.h"
 #include "prompt.h"
 }
@@ -72,7 +71,7 @@ Function::ReturnValue sci_execstr(types::typed_list &in, int _iRetCount, types::
 #ifdef _MSC_VER
                                swprintf_s(stErr, 1024, L"\"%s\" value is not a valid value for exec function", pS->string_get(0));
 #else
-                               swprintf(stErr, 1024, L"\"%S\" value is not a valid value for exec function", pS->string_get(0));
+                               swprintf(stErr, 1024, L"\"%ls\" value is not a valid value for exec function", pS->string_get(0));
 #endif
                                YaspWriteW(stErr);
                                return Function::Error;
index f7f6577..3c1e368 100644 (file)
 */
 
 #include <string.h>
-#include "parser.hxx"
 #include "funcmanager.hxx"
 #include "context.hxx"
 #include "functions_gw.hxx"
-#include "setenvvar.hxx"
-#include "execvisitor.hxx"
-
-
-extern "C"
-{
-#ifndef _MSC_VER
-#include "stricmp.h"
-#endif
-#include "cluni0.h"
-#include "PATH_MAX.h"
-}
 
 using namespace types;
 /*--------------------------------------------------------------------------*/
index b98985c..f89cfd7 100644 (file)
@@ -21,7 +21,6 @@ getrhsvar_
 createvar_
 stack_
 createvarfromptr_
-getWarningMode
 vartype_
 getLocalVariablesName
 ;
index aae6d6c..17d6c11 100644 (file)
@@ -114,7 +114,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
 #ifdef _MSC_VER
        swprintf_s(pstParseFile, PATH_MAX + FILENAME_MAX, L"%s%slib", pstParsePath, FILE_SEPARATOR);
 #else
-       swprintf(pstParseFile, PATH_MAX + FILENAME_MAX, L"%S%Slib", pstParsePath, FILE_SEPARATOR);
+       swprintf(pstParseFile, PATH_MAX + FILENAME_MAX, L"%ls%Slib", pstParsePath, FILE_SEPARATOR);
 #endif
 
     if(bVerbose)
@@ -122,7 +122,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
 #ifdef _MSC_VER
         swprintf_s(pstVerbose, 65535, _W("-- Creation of [%s] (Macros) --\n"), pstLibName);
 #else
-        swprintf(pstVerbose, 65535, _W("-- Creation of [%S] (Macros) --\n"), pstLibName);
+        swprintf(pstVerbose, 65535, _W("-- Creation of [%ls] (Macros) --\n"), pstLibName);
 #endif
         YaspWriteW(pstVerbose);
     }
@@ -139,7 +139,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
 #ifdef _MSC_VER
         swprintf_s(pstVerbose, 65535, _W("%s: Cannot open file ''%s''.\n"), L"genlib", pstParseFile);
 #else
-        swprintf(pstVerbose, 65535, _W("%S: Cannot open file ''%S''.\n"), L"genlib", pstParseFile);
+        swprintf(pstVerbose, 65535, _W("%ls: Cannot open file ''%ls''.\n"), L"genlib", pstParseFile);
 #endif
         YaspWriteW(pstVerbose);
 
@@ -166,7 +166,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
 #ifdef _MSC_VER
                 swprintf_s(pstVerbose, 65535, _W("%s: Warning: Error in file %s : %s. File ignored\n"), L"genlib", pstPath[k], parser.getErrorMessage());
 #else
-                swprintf(pstVerbose, 65535, _W("%S: Warning: Error in file %S : %S. File ignored\n"), L"genlib", pstPath[k], parser.getErrorMessage());
+                swprintf(pstVerbose, 65535, _W("%ls: Warning: Error in file %ls : %ls. File ignored\n"), L"genlib", pstPath[k], parser.getErrorMessage());
 #endif
                 YaspWriteW(pstVerbose);
                 parser.freeTree();
@@ -186,7 +186,7 @@ Function::ReturnValue sci_genlib(types::typed_list &in, int _iRetCount, types::t
 #ifdef _MSC_VER
                         swprintf_s(pstVerbose, 65535, _W("%s: Warning: %s information cannot be added to file %s. File ignored\n"), L"genlib", pFD->name_get() , pstPath[k]);
 #else
-                        swprintf(pstVerbose, 65535, _W("%S: Warning: Error in file %S : %S. File ignored\n"), L"genlib", pstPath[k], parser.getErrorMessage());
+                        swprintf(pstVerbose, 65535, _W("%ls: Warning: Error in file %ls : %ls. File ignored\n"), L"genlib", pstPath[k], parser.getErrorMessage());
 #endif
                         YaspWriteW(pstVerbose);
                     }
index e9f1a9c..86b0fb0 100644 (file)
@@ -12,7 +12,7 @@
 
 #include "gw_localization.h"
 #include "stack-c.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "localization.h"
 #include "sciprint.h"
 #ifdef _MSC_VER
index 077ae34..41e331d 100644 (file)
@@ -15,7 +15,7 @@
 #include "setgetlanguage.h"
 #include "Scierror.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "defaultlanguage.h"
 #include "MALLOC.h"
 #include "loadhashtableslocalization.h"
index 2ed723e..4c89576 100644 (file)
@@ -16,7 +16,6 @@ EXPORTS
  vstk_
  createvar_
  getSCIHOME
- getWarningMode
  syncexec_
  getmodules
  GetXmlFileEncoding
index dee311c..6588dc5 100644 (file)
@@ -48,4 +48,5 @@ bla𯿽 = 51
 txt = "𯿽"
 txt = "bla𯿽bla"
 txt = "bla𯿽"
-txt = "𯿽bla"
\ No newline at end of file
+txt = "𯿽bla"
+
index bd22479..4339b13 100644 (file)
@@ -125,7 +125,8 @@ libscioptimization_la_CFLAGS=       -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/localization/includes \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
--I$(top_srcdir)/modules/operations/includes
+-I$(top_srcdir)/modules/operations/includes \
+-I$(top_srcdir)/modules/system_env/includes
 
 pkglib_LTLIBRARIES = libscioptimization.la
 
index d5685ac..7fcedf3 100644 (file)
@@ -552,7 +552,8 @@ libscioptimization_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/localization/includes \
 -I$(top_srcdir)/modules/output_stream/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
--I$(top_srcdir)/modules/operations/includes
+-I$(top_srcdir)/modules/operations/includes \
+-I$(top_srcdir)/modules/system_env/includes
 
 pkglib_LTLIBRARIES = libscioptimization.la
 libscioptimization_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index 25dddef..e080f67 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"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../dynamic_link/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OPTIMIZATION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index a05e5d3..9d2bfa7 100644 (file)
@@ -17,7 +17,7 @@
 #include "spd.h"
 #include "sciprint.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 /*--------------------------------------------------------------------------*/
 /* BLAS 1 */
 extern double F2C(dnrm2)( );
index 807cb7a..5f4b0ca 100644 (file)
@@ -27,7 +27,6 @@ getwsmat_
 cvname_
 getIntermediateMemoryNeeded
 getstackinfo_
-getWarningMode
 callFunctionFromGateway
 getmatdims_
 overload_
index 474a41e..a6dfe83 100644 (file)
@@ -62,7 +62,7 @@ int ScierrorW(int iv, const wchar_t *fmt,...)
 #if _MSC_VER
        retval = vsnwprintf(s_buf,bsiz-1, fmt, ap );
 #else
-       retval = swprintf(s_buf, bsiz-1, fmt, ap );
+       retval = vswprintf(s_buf, bsiz-1, fmt, ap );
 #endif
        if (retval < 0) s_buf[bsiz-1]='\0';
 
index a682e06..d087cb9 100644 (file)
@@ -11,7 +11,7 @@
  */
 
 #include <string.h>
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "sciprint.h"
 #include "stack-def.h" /* C2F(cha1) */
 #include "stack-c.h" /* Fin */
index 768b11f..ea8e4f5 100644 (file)
@@ -159,7 +159,6 @@ void ParserSingleInstance::parse(char *command)
 
 /** \brief put the asked line in codeLine */
 char *ParserSingleInstance::getCodeLine(int line, char **codeLine) {
-#ifndef _MSC_VER
     size_t len = 0;
     int i = 0;
 
@@ -172,7 +171,6 @@ char *ParserSingleInstance::getCodeLine(int line, char **codeLine) {
     {
         fgets(*codeLine, 4096, yyin);
     }
-#endif
     return *codeLine;
 }
 
index fe8e740..9350f05 100644 (file)
@@ -20,7 +20,6 @@ void ParserSingleInstance::PrintError(std::wstring msg) {
     // FIXME : Should work under Windows
     // Need to have getline !!!
     std::wostringstream ostr;
-#ifndef _MSC_VER
     char *codeLine = (char *) malloc(4096 * sizeof(char));
 
     /** First print where in the script the error is located */
@@ -52,7 +51,6 @@ void ParserSingleInstance::PrintError(std::wstring msg) {
         ostr << L"^" ;
     }
     ostr << std::endl;
-#endif
 
     /** Finally display the Lexer / Parser message */
     ostr << L"[" <<*(ParserSingleInstance::getProgName()) << L"] ";
index 096fc91..59d6eb0 100644 (file)
@@ -24,6 +24,5 @@ createvarfromptr_
 set_is_reading
 freeArrayOfString
 vartype_
-getWarningMode
 ismenu
 StoreCommand
index 065839f..1123b10 100644 (file)
@@ -1,4 +1,5 @@
        LIBRARY    system_env.dll
 
 EXPORTS 
-getScilabMode
\ No newline at end of file
+getScilabMode
+getWarningMode
index 6e90cfd..552fd08 100644 (file)
@@ -14,7 +14,7 @@
 #include <string.h>
 #include "prompt.h"
 #include "sciprint.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "localization.h"
 #include "MALLOC.h"
 #ifdef _MSC_VER
index 4ab2491..1cdafd1 100644 (file)
@@ -36,7 +36,8 @@ libscispecial_functions_la_CFLAGS=    -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
--I$(top_srcdir)/modules/operations/includes/
+-I$(top_srcdir)/modules/operations/includes/ \
+-I$(top_srcdir)/modules/system_env/includes/
 
 pkglib_LTLIBRARIES = libscispecial_functions.la
 
index 5ba0b4a..b83dacf 100644 (file)
@@ -451,7 +451,8 @@ libscispecial_functions_la_CFLAGS = -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes \
 -I$(top_srcdir)/modules/elementary_functions/includes/ \
 -I$(top_srcdir)/modules/output_stream/includes/ \
--I$(top_srcdir)/modules/operations/includes/
+-I$(top_srcdir)/modules/operations/includes/ \
+-I$(top_srcdir)/modules/system_env/includes/
 
 pkglib_LTLIBRARIES = libscispecial_functions.la
 libscispecial_functions_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
index a5253c0..f5da413 100644 (file)
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "gw_special_functions.h"
 #include "machine.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "localization.h"
 #include "sciprint.h"
 /*--------------------------------------------------------------------------*/
index 09eda3c..a18cc9e 100644 (file)
@@ -12,7 +12,7 @@
 #include <string.h>
 #include "gw_special_functions.h"
 #include "machine.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "localization.h"
 #include "sciprint.h"
 /*--------------------------------------------------------------------------*/
index b1eecbb..c674bed 100644 (file)
@@ -12,7 +12,7 @@
 #include <string.h>
 #include "gw_special_functions.h"
 #include "machine.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "localization.h"
 #include "sciprint.h"
 /*--------------------------------------------------------------------------*/
index 49b942f..eb36bdb 100644 (file)
@@ -13,7 +13,7 @@
 #include <string.h>
 #include "gw_special_functions.h"
 #include "machine.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "localization.h"
 #include "sciprint.h"
 /*--------------------------------------------------------------------------*/
index 85a1eb2..94e8cc2 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;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPECIAL_FUNCTIONS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPECIAL_FUNCTIONS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPECIAL_FUNCTIONS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../elementary_functions/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../special_functions/includes;../../../api_scilab/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPECIAL_FUNCTIONS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index b0aa65a..fe894b0 100644 (file)
@@ -74,7 +74,8 @@ libscistring_la_CFLAGS= $(PCRE_CFLAGS) \
        -I$(top_srcdir)/modules/operations/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
        -I$(top_srcdir)/modules/localization/includes \
-       -I$(top_srcdir)/modules/output_stream/includes
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/system_env/includes
 
 libscistring_la_CPPFLAGS= $(PCRE_CFLAGS) \
        -I$(srcdir)/src/c \
index 290442c..f411fd3 100644 (file)
@@ -515,7 +515,8 @@ libscistring_la_CFLAGS = $(PCRE_CFLAGS) \
        -I$(top_srcdir)/modules/operations/includes \
        -I$(top_srcdir)/modules/api_scilab/includes \
        -I$(top_srcdir)/modules/localization/includes \
-       -I$(top_srcdir)/modules/output_stream/includes
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/system_env/includes
 
 libscistring_la_CPPFLAGS = $(PCRE_CFLAGS) \
        -I$(srcdir)/src/c \
index 43267de..ff2dae2 100644 (file)
@@ -25,7 +25,7 @@
 #include "localization.h"
 #include "freeArrayOfString.h"
 #include "getfastcode.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 #include "sciprint.h"
 /*----------------------------------------------------------------------------*/
 static int asciiStrings(char *fname);
index 1f96117..05eddb2 100644 (file)
@@ -16,7 +16,6 @@ EXPORTS
  stack_
  putlhsvar_
  intersci_
- getWarningMode
  createvar_
  getrhsvar_
  vartype_
diff --git a/scilab/modules/string/src/c/System_env_Import.def b/scilab/modules/string/src/c/System_env_Import.def
new file mode 100644 (file)
index 0000000..8adaee4
--- /dev/null
@@ -0,0 +1,5 @@
+LIBRARY    system_env.dll
+
+
+EXPORTS
+getWarningMode
index 7ba076e..7c7e9d1 100644 (file)
@@ -27,8 +27,8 @@
 #include "strdup_windows.h"
 #endif
 #include "strsubst.h"
+#include "sci_warning.h"
 #include "sciprint.h"
-#include "warningmode.h"
 /*-------------------------------------------------------------------------------*/
 /* A number of things vary for Windows builds. Originally, pcretest opened its
 input and output without "b"; then I was told that "b" was needed in some
index 861bf33..9589208 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"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;STRING_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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string_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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string_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)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)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="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib"
+                               AdditionalDependencies="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib system_env.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;STRING_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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string_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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string_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)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)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="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib"
+                               AdditionalDependencies="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib system_env.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;STRING_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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string_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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string_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)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)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="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib"
+                               AdditionalDependencies="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib system_env.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;STRING_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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string_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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.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)string_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string_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)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)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="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib"
+                               AdditionalDependencies="scilab_windows.lib libscilab.lib string_f.lib scilocalization.lib system_env.lib"
                                OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                        RelativePath=".\string_f_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\System_env_Import.def"
+                                       >
+                               </File>
                        </Filter>
                </Filter>
                <Filter
index eae293f..8ea49cd 100644 (file)
@@ -15,6 +15,7 @@ SYSTEM_ENV_CPP_SOURCES        = \
        src/cpp/sci_path.cpp \
        src/cpp/sci_home.cpp \
        src/cpp/sci_tmpdir.cpp \
+       src/cpp/sci_warning.cpp \
        src/cpp/sci_mode.cpp \
        src/cpp/configvariable.cpp
 
index ddf2f9a..9a80a2c 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_warning.lo \
        libscisystem_env_la-sci_mode.lo \
        libscisystem_env_la-configvariable.lo
 am_libscisystem_env_la_OBJECTS = $(am__objects_1)
@@ -366,6 +367,7 @@ SYSTEM_ENV_CPP_SOURCES = \
        src/cpp/sci_path.cpp \
        src/cpp/sci_home.cpp \
        src/cpp/sci_tmpdir.cpp \
+       src/cpp/sci_warning.cpp \
        src/cpp/sci_mode.cpp \
        src/cpp/configvariable.cpp
 
@@ -462,6 +464,7 @@ distclean-compile:
 @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-sci_warning.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscisystem_env_la-setenvvar.Plo@am__quote@
 
 .cpp.o:
@@ -513,6 +516,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_warning.lo: src/cpp/sci_warning.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_warning.lo -MD -MP -MF $(DEPDIR)/libscisystem_env_la-sci_warning.Tpo -c -o libscisystem_env_la-sci_warning.lo `test -f 'src/cpp/sci_warning.cpp' || echo '$(srcdir)/'`src/cpp/sci_warning.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscisystem_env_la-sci_warning.Tpo $(DEPDIR)/libscisystem_env_la-sci_warning.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/sci_warning.cpp' object='libscisystem_env_la-sci_warning.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_warning.lo `test -f 'src/cpp/sci_warning.cpp' || echo '$(srcdir)/'`src/cpp/sci_warning.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
index 3a3cfbe..e1c9eb4 100644 (file)
@@ -17,6 +17,8 @@
 #include <string>
 #include "dynlib_system_env.h"
 
+#include "file.hxx"
+
 using namespace std;
 class EXTERN_SYSTEM_ENV ConfigVariable
 {
@@ -93,6 +95,14 @@ private :
 public : 
     static void setScilabMode(int _iScilabMode);
     static int getScilabMode(void);
+
+    //Warning mode
+private :
+    static bool m_bWarningMode;
+
+public : 
+    static void setWarningMode(bool _bWarningMode);
+    static bool getWarningMode(void);
 };
 
 #endif /* __CONFIGVARIABLE_HXX__ */
diff --git a/scilab/modules/system_env/includes/sci_warning.h b/scilab/modules/system_env/includes/sci_warning.h
new file mode 100644 (file)
index 0000000..dba7138
--- /dev/null
@@ -0,0 +1,31 @@
+/*
+*  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_HOME_H__
+#define __SCI_HOME_H__
+
+#include <wchar.h>
+#include "dynlib_system_env.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+EXTERN_SYSTEM_ENV int getWarningMode(void);
+EXTERN_SYSTEM_ENV void setWarningMode(int _iMode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // ! __SCI_HOME_H__
index 78605b9..3deb65d 100644 (file)
@@ -196,3 +196,23 @@ int ConfigVariable::getScilabMode(void)
 /*
 ** \}
 */
+
+/*
+** Warning Mode
+** \{
+*/
+bool ConfigVariable::m_bWarningMode = true;
+
+void ConfigVariable::setWarningMode(bool _bWarningMode)
+{
+    m_bWarningMode = _bWarningMode;
+}
+
+bool ConfigVariable::getWarningMode(void)
+{
+    return m_bWarningMode;
+}
+/*
+** \}
+*/
+
diff --git a/scilab/modules/system_env/src/cpp/sci_warning.cpp b/scilab/modules/system_env/src/cpp/sci_warning.cpp
new file mode 100644 (file)
index 0000000..88971a2
--- /dev/null
@@ -0,0 +1,40 @@
+/*
+ *  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 <stdlib.h>
+
+#include "sci_warning.h"
+
+#include "configvariable.hxx"
+
+#include "setenvvar.hxx"
+#include "string.hxx"
+#include "context.hxx"
+
+int getWarningMode(void)
+{
+    if(ConfigVariable::getWarningMode())
+    {
+        return 1;
+    }
+    return 0;
+}
+
+void setWarningMode(int _iMode)
+{
+    if(_iMode == 0)
+    {
+        ConfigVariable::setWarningMode(false);
+    }
+
+    ConfigVariable::setWarningMode(true);
+}
index 3602936..a827e79 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\src\cpp\sci_warning.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\cpp\setenvvar.cpp"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\sci_warning.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\includes\setenvvar.hxx"
                                >
                        </File>
                        </File>
                </Filter>
                <File
+                       RelativePath="..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
                        RelativePath="..\..\bin\lapack.lib"
                        >
                </File>
index 7d5532b..6d1c5d3 100644 (file)
@@ -53,6 +53,7 @@ TYPES_CPP_SOURCES = \
                        src/cpp/struct.cpp \
                        src/cpp/cell.cpp \
                        src/cpp/tlist.cpp \
+                       src/cpp/file.cpp \
                        src/cpp/mlist.cpp
 
 GIWS_WRAPPERS =
index 2fb73fb..e566201 100644 (file)
@@ -141,7 +141,7 @@ am__objects_3 = libscitypes_la-types.lo libscitypes_la-int.lo \
        libscitypes_la-listoperation.lo \
        libscitypes_la-listundefined.lo libscitypes_la-struct.lo \
        libscitypes_la-cell.lo libscitypes_la-tlist.lo \
-       libscitypes_la-mlist.lo
+       libscitypes_la-file.lo libscitypes_la-mlist.lo
 am_libscitypes_la_OBJECTS = $(am__objects_1) $(am__objects_1) \
        $(am__objects_1) $(am__objects_2) $(am__objects_3)
 libscitypes_la_OBJECTS = $(am_libscitypes_la_OBJECTS)
@@ -523,6 +523,7 @@ TYPES_CPP_SOURCES = \
                        src/cpp/struct.cpp \
                        src/cpp/cell.cpp \
                        src/cpp/tlist.cpp \
+                       src/cpp/file.cpp \
                        src/cpp/mlist.cpp
 
 GIWS_WRAPPERS = 
@@ -672,6 +673,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-bool.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-cell.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-double.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-file.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-float.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-function.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libscitypes_la-implicitlist.Plo@am__quote@
@@ -949,6 +951,13 @@ libscitypes_la-tlist.lo: src/cpp/tlist.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) $(libscitypes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscitypes_la-tlist.lo `test -f 'src/cpp/tlist.cpp' || echo '$(srcdir)/'`src/cpp/tlist.cpp
 
+libscitypes_la-file.lo: src/cpp/file.cpp
+@am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitypes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscitypes_la-file.lo -MD -MP -MF $(DEPDIR)/libscitypes_la-file.Tpo -c -o libscitypes_la-file.lo `test -f 'src/cpp/file.cpp' || echo '$(srcdir)/'`src/cpp/file.cpp
+@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscitypes_la-file.Tpo $(DEPDIR)/libscitypes_la-file.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='src/cpp/file.cpp' object='libscitypes_la-file.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) $(libscitypes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libscitypes_la-file.lo `test -f 'src/cpp/file.cpp' || echo '$(srcdir)/'`src/cpp/file.cpp
+
 libscitypes_la-mlist.lo: src/cpp/mlist.cpp
 @am__fastdepCXX_TRUE@  $(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libscitypes_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libscitypes_la-mlist.lo -MD -MP -MF $(DEPDIR)/libscitypes_la-mlist.Tpo -c -o libscitypes_la-mlist.lo `test -f 'src/cpp/mlist.cpp' || echo '$(srcdir)/'`src/cpp/mlist.cpp
 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/libscitypes_la-mlist.Tpo $(DEPDIR)/libscitypes_la-mlist.Plo
index 017a8a2..3fd6301 100644 (file)
@@ -44,5 +44,6 @@
 #include "cell.hxx"
 #include "tlist.hxx"
 #include "mlist.hxx"
+#include "file.hxx"
 
 #endif /* !ALL_TYPES_HXX */
index 057c1b6..a0e5ec8 100644 (file)
@@ -42,6 +42,7 @@ namespace types
     class Cell;
     class TList;
     class MList;
+    class File;
 }
 
 #endif /* !__ANY_TYPES_HXX__ */
diff --git a/scilab/modules/types/includes/file.hxx b/scilab/modules/types/includes/file.hxx
new file mode 100644 (file)
index 0000000..3988d72
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+ *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ *  Copyright (C) 2010-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 __FILE_HH__
+#define __FILE_HH__
+
+#include "double.hxx"
+
+namespace types
+{
+    class File : public Double
+    {
+    public :
+                                    File();
+                                    ~File();
+
+        virtual File*               getAsFile(void) { return this; }
+
+        void                        setFileMode(wstring _pstMode);
+        wstring&                    getFileMode();
+
+        void                        setFileDesc(FILE* _fileDesc);
+        FILE*                       getFiledesc();
+
+        void                        setFileSwap(int _iSwap);
+        int                         getFileSwap();
+
+        void                        setFileType(int _iType);
+        int                         getFileType();
+
+        void                        setFilename(wstring _stFilename);
+        wstring                     getFilename();
+
+    private :
+        FILE*                       m_fileDesc;
+        int                         m_iSwap; /* swap status for each file */
+        wstring                     m_pstMode; /* mode for each file */
+        int                         m_iType; /* type (Fortran,C) for each file must be zero initialized */
+        wstring                     m_stFilename; /* name for each file */
+
+    };
+}
+
+#endif /* __FILE_HH__ */
index d18c89f..a08afde 100644 (file)
@@ -58,7 +58,8 @@ namespace types
           RealListOperation, //parent type
           RealListInsertOperation,
           RealListDeleteOperation,
-          RealListUndefinedOperation
+          RealListUndefinedOperation,
+          RealFile
       };
 
   protected :
@@ -199,6 +200,9 @@ namespace types
       bool                              isImplicitList(void) { return (getType() == RealImplicitList); }
       virtual ImplicitList*             getAsImplicitList(void) { return NULL; }
 
+      /* File */
+      bool                              isFile(void) { return (getType() == RealFile); }
+      virtual File*                     getAsFile(void) { return NULL; }
 
       /**
       ** List Operations
diff --git a/scilab/modules/types/src/cpp/file.cpp b/scilab/modules/types/src/cpp/file.cpp
new file mode 100644 (file)
index 0000000..c94ab2b
--- /dev/null
@@ -0,0 +1,80 @@
+/*
+*  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+*  Copyright (C) 2010-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 "file.hxx"
+
+namespace types
+{
+
+    File::File() : Double(0)
+    {
+        m_fileDesc = NULL;
+        m_iSwap = 0;
+        m_pstMode = L"";
+        m_iType = 0;
+        m_stFilename = L"";
+    }
+
+    File::~File()
+    {
+    }
+
+    void File::setFileDesc(FILE* _fileDesc)
+    {
+        m_fileDesc = _fileDesc;
+    }
+
+    FILE* File::getFiledesc()
+    {
+        return m_fileDesc;
+    }
+
+    void File::setFileMode(wstring _pstMode)
+    {
+        m_pstMode = _pstMode;
+    }
+
+    wstring& File::getFileMode()
+    {
+        return m_pstMode;
+    }
+
+    void File::setFileSwap(int _iSwap)
+    {
+        m_iSwap = _iSwap;
+    }
+
+    int File::getFileSwap()
+    {
+        return m_iSwap;
+    }
+
+    void File::setFileType(int _iType)
+    {
+        m_iType = _iType;
+    }
+
+    int File::getFileType()
+    {
+        return m_iType;
+    }
+
+    void File::setFilename(wstring _stFilename)
+    {
+        m_stFilename = _stFilename;
+    }
+
+    wstring File::getFilename()
+    {
+        return m_stFilename;
+    }
+}
index 2c09e27..e1c656f 100644 (file)
@@ -189,7 +189,7 @@ namespace types
 #ifdef _MSC_VER
                     swprintf_s(sz, bsiz, _W("Undefined variable %s.\n"), (*i).c_str());
 #else
-                    swprintf(sz, bsiz, _W("Undefined variable %S.\n"), (*i).c_str());
+                    swprintf(sz, bsiz, _W("Undefined variable %ls.\n"), (*i).c_str());
 #endif
                     YaspWriteW(sz);
                 }
index 347d686..04f69fa 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\src\cpp\file.cpp"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\cpp\float.cpp"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\file.hxx"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\includes\float.hxx"
                                >
                        </File>
index 5bd7af1..db4ef93 100644 (file)
@@ -72,7 +72,8 @@ libsciumfpack_la_CFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes \
                        -I$(top_srcdir)/modules/mexlib/includes \
                        -I$(top_srcdir)/modules/api_scilab/includes \
-                       -I$(top_srcdir)/modules/operations/includes
+                       -I$(top_srcdir)/modules/operations/includes \
+                       -I$(top_srcdir)/modules/system_env/includes
 
 else
 
index dcb161c..6760d49 100644 (file)
@@ -493,7 +493,8 @@ libsciumfpack_la_etc_DATA = etc/umfpack.quit etc/umfpack.start
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/output_stream/includes \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/mexlib/includes \
 @UMFPACK_TRUE@                 -I$(top_srcdir)/modules/api_scilab/includes \
-@UMFPACK_TRUE@                 -I$(top_srcdir)/modules/operations/includes
+@UMFPACK_TRUE@                 -I$(top_srcdir)/modules/operations/includes \
+@UMFPACK_TRUE@                 -I$(top_srcdir)/modules/system_env/includes
 
 
 # Where all the Scilab stuff is installed (macros, help, ...)
index b02f167..ff0abc3 100644 (file)
@@ -62,7 +62,7 @@
 #include "taucs_scilab.h"
 #include "common_umfpack.h"
 #include "localization.h"
-#include "warningmode.h"
+#include "sci_warning.h"
 
 CellAdr *ListNumeric = NULL;
 CellAdr *ListCholFactors = NULL;
index dc5995a..6a14142 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"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalOptions=""
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                        />
                        <Tool
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Name="VCXMLDataGeneratorTool"
                        />
                        <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
                                Name="VCMIDLTool"
                                TargetEnvironment="3"
                        />
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../../libs/UMFPACK/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;UMFPACK_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"