bug 3884
Allan CORNET [Thu, 29 Jan 2009 12:17:57 +0000 (13:17 +0100)]
56 files changed:
scilab/CHANGES_5.2
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/completion/src/c/LibScilab_Import.def
scilab/modules/completion/src/c/getfilesdictionary.c
scilab/modules/core/Makefile.am
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/c/gw_core.c
scilab/modules/core/sci_gateway/core_gateway.xml
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/tests/unit_tests/funptr.dia.ref
scilab/modules/core/tests/unit_tests/funptr.tst
scilab/modules/fileio/LibScilab_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/help/en_US/chdir.xml [moved from scilab/modules/core/help/en_US/chdir.xml with 100% similarity]
scilab/modules/fileio/help/en_US/pwd.xml [moved from scilab/modules/core/help/en_US/pwd.xml with 100% similarity]
scilab/modules/fileio/help/fr_FR/chdir.xml [moved from scilab/modules/core/help/fr_FR/chdir.xml with 100% similarity]
scilab/modules/fileio/help/fr_FR/pwd.xml [moved from scilab/modules/core/help/fr_FR/pwd.xml with 100% similarity]
scilab/modules/fileio/includes/cluni0.h [moved from scilab/modules/core/includes/cluni0.h with 100% similarity]
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/includes/scicurdir.h [moved from scilab/modules/core/src/c/scicurdir.h with 100% similarity]
scilab/modules/fileio/io_Import.def [new file with mode: 0644]
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/c/sci_chdir.c [moved from scilab/modules/core/sci_gateway/c/sci_chdir.c with 100% similarity]
scilab/modules/fileio/sci_gateway/c/sci_findfiles.c
scilab/modules/fileio/sci_gateway/c/sci_getcwd.c [moved from scilab/modules/core/sci_gateway/c/sci_getcwd.c with 100% similarity]
scilab/modules/fileio/sci_gateway/fileio_gateway.xml
scilab/modules/fileio/src/c/cluni0.c [moved from scilab/modules/core/src/c/cluni0.c with 98% similarity]
scilab/modules/fileio/src/c/scicurdir.c [moved from scilab/modules/core/src/c/scicurdir.c with 100% similarity]
scilab/modules/fileio/tests/nonreg_tests/bug_2273.tst [moved from scilab/modules/core/tests/nonreg_tests/bug_2273.tst with 100% similarity]
scilab/modules/fileio/tests/nonreg_tests/bug_2320.dia.ref [moved from scilab/modules/core/tests/nonreg_tests/bug_2320.dia.ref with 100% similarity]
scilab/modules/fileio/tests/nonreg_tests/bug_2320.tst [moved from scilab/modules/core/tests/nonreg_tests/bug_2320.tst with 100% similarity]
scilab/modules/gui/src/c/LibScilab_Import.def
scilab/modules/gui/src/c/gui.vcproj
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/src/c/LibScilab_Import.def
scilab/modules/history_manager/src/c/fileio_Import.def [new file with mode: 0644]
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/io/Makefile.am
scilab/modules/io/includes/GetenvB.h [moved from scilab/modules/core/includes/GetenvB.h with 100% similarity]
scilab/modules/io/src/c/GetenvB.c [moved from scilab/modules/core/src/c/GetenvB.c with 94% similarity]
scilab/modules/io/src/c/LibScilab_Import.def
scilab/modules/io/src/c/io.vcproj
scilab/modules/io/src/fortran/LibScilab_Import.def
scilab/modules/io/src/fortran/fileio_Import.def [new file with mode: 0644]
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/pvm/LibScilab_Import.def
scilab/modules/pvm/pvm.vcproj
scilab/modules/scicos_blocks/src/c/LibScilab_Import.def
scilab/modules/scicos_blocks/src/c/fileio_Import.def
scilab/modules/sound/LibScilab_Import.def
scilab/modules/sound/sound.vcproj
scilab/modules/spreadsheet/LibScilab_Import.def
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/windows_tools/src/c/LibScilab_Import.def

index ae94897..a9fe824 100644 (file)
@@ -25,3 +25,4 @@ Bug fixes:
 
 * bug 3992 fixed - remove some invalid dependencies on external libraries.
 
+* bug 3884 fixed - chdir, getcwd, pwd moved from core to fileio module.
\ No newline at end of file
index 9500146..4e291bd 100644 (file)
@@ -241,6 +241,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvm", "modules\pvm\pvm.vcpr
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {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}
@@ -416,6 +417,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "modules\sound\sound.vcproj", "{03773159-155A-48E0-9B26-119D0BF35B2B}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
index cc261d7..cec5346 100644 (file)
@@ -195,6 +195,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pvm", "modules\pvm\pvm.vcpr
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
                {13082624-97F9-47DB-A9A1-AD7D6BF3856A} = {13082624-97F9-47DB-A9A1-AD7D6BF3856A}
+               {80C0F142-184B-4E08-A8EE-5E71437CF904} = {80C0F142-184B-4E08-A8EE-5E71437CF904}
                {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}
@@ -319,6 +320,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sound", "modules\sound\sound.vcproj", "{03773159-155A-48E0-9B26-119D0BF35B2B}"
        ProjectSection(ProjectDependencies) = postProject
                {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {4FC72D4A-80EE-4B1A-8724-0201C1A35621} = {4FC72D4A-80EE-4B1A-8724-0201C1A35621}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
index 8c46610..d41b7cf 100644 (file)
@@ -16,8 +16,6 @@ com_
 callFunctionFromGateway
 getlibrarieslist
 getlistmacrosfromlibrary
-scigetcwd
-cluni0_
 getVariablesName
 getcommandkeywords
 GetFunctionsList
index c0fabb9..afa173a 100644 (file)
@@ -14,7 +14,7 @@
 #include <stdlib.h> /* qsort */
 #include "getfilesdictionary.h"
 #include "PATH_MAX.h"
-#include "../../../core/src/c/scicurdir.h" /* scigetcwd */
+#include "scicurdir.h" /* scigetcwd */
 #include "findfiles.h" /* findfiles */
 #include "MALLOC.h"
 #include "cluni0.h"
index e01f6b6..3a2e8be 100644 (file)
@@ -23,11 +23,9 @@ src/c/IsAScalar.c \
 src/c/texmacs.c \
 src/c/sciquit.c \
 src/c/stack1.c \
-src/c/scicurdir.c \
 src/c/realmain.c \
 src/c/stack3.c \
 src/c/str2sci.c \
-src/c/cluni0.c \
 src/c/getmodules.c \
 src/c/fromc.c \
 src/c/setgetSCIpath.c \
@@ -63,7 +61,6 @@ src/c/returnProperty.c \
 src/c/returnPropertyList.c \
 src/c/scilabmode.c \
 src/c/GetXmlFileEncoding.c \
-src/c/GetenvB.c \
 src/c/islittleendian.c \
 src/c/terme.c \
 src/c/ifexpr.c \
@@ -240,7 +237,6 @@ sci_gateway/c/sci_return.c \
 sci_gateway/c/sci_exists.c \
 sci_gateway/c/sci_getmd5.c \
 sci_gateway/c/sci_clear.c \
-sci_gateway/c/sci_chdir.c \
 sci_gateway/c/sci_comp.c \
 sci_gateway/c/sci_clearfun.c \
 sci_gateway/c/sci_setbpt.c \
@@ -249,7 +245,6 @@ sci_gateway/c/sci_what.c \
 sci_gateway/c/sci_predef.c \
 sci_gateway/c/sci_clearglobal.c \
 sci_gateway/c/sci_arg.c \
-sci_gateway/c/sci_getcwd.c \
 sci_gateway/c/sci_type.c \
 sci_gateway/c/sci_typename.c \
 sci_gateway/c/sci_mode.c \
@@ -366,7 +361,6 @@ includes/callFunctionFromGateway.h \
 includes/callinter.h \
 includes/callinterf.h \
 includes/CallScilab.h \
-includes/cluni0.h \
 includes/commandwords.h \
 includes/core_math.h \
 includes/doublecomplex.h \
@@ -376,7 +370,6 @@ includes/freeArrayOfString.h \
 includes/fromjava.h \
 includes/Funtab.h \
 includes/getcommandlineargs.h \
-includes/GetenvB.h \
 includes/GetExceptionCode.h \
 includes/getfunctionslist.h \
 includes/getmemory.h \
index cfc8c47..ba8de02 100644 (file)
@@ -49,8 +49,6 @@ int C2F(sci_mtlb_mode)(char *fname,unsigned long fname_len);
 int C2F(sci_clear)(char *fname,unsigned long fname_len);
 int C2F(sci_what)(char *fname,unsigned long fname_len);
 int C2F(sci_sciargs)(char *fname,unsigned long fname_len);
-int C2F(sci_chdir)(char *fname,unsigned long fname_len);
-int C2F(sci_getcwd)(char *fname,unsigned long fname_len);
 int C2F(sci_ieee)(char *fname,unsigned long fname_len);
 int C2F(sci_typename)(char *fname,unsigned long fname_len);
 int C2F(sci_global)(char *fname,unsigned long fname_len);
index 75fea83..e9b20d9 100644 (file)
@@ -51,11 +51,9 @@ static gw_generic_table Tab[]=
 {C2F(sci_clear),"clear"},
 {C2F(sci_what),"what"},
 {C2F(sci_sciargs),"sciargs"},
-{C2F(sci_chdir),"chdir"},
 {C2F(sci_ieee),"ieee"},
 {C2F(sci_typename),"typename"},
 {C2F(sci_global),"global"},
-{C2F(sci_getcwd),"getcwd"},
 {C2F(sci_clearglobal),"clearglobal"},
 {C2F(sci_isglobal),"isglobal"},
 {C2F(sci_gstacksize),"gstacksize"},
index 64fbb41..bd13b38 100644 (file)
   <PRIMITIVE gatewayId="13" primitiveId="33" primitiveName="clear" />
   <PRIMITIVE gatewayId="13" primitiveId="34" primitiveName="what" />
   <PRIMITIVE gatewayId="13" primitiveId="35" primitiveName="sciargs" />
-  <PRIMITIVE gatewayId="13" primitiveId="36" primitiveName="chdir" />
-  <PRIMITIVE gatewayId="13" primitiveId="37" primitiveName="ieee" />
-  <PRIMITIVE gatewayId="13" primitiveId="38" primitiveName="typename" />
-  <PRIMITIVE gatewayId="13" primitiveId="39" primitiveName="global" />
-  <PRIMITIVE gatewayId="13" primitiveId="40" primitiveName="pwd" />
-  <PRIMITIVE gatewayId="13" primitiveId="40" primitiveName="getcwd" />
-  <PRIMITIVE gatewayId="13" primitiveId="41" primitiveName="clearglobal" />
-  <PRIMITIVE gatewayId="13" primitiveId="42" primitiveName="isglobal" />
-  <PRIMITIVE gatewayId="13" primitiveId="43" primitiveName="gstacksize" />
-  <PRIMITIVE gatewayId="13" primitiveId="44" primitiveName="intppty" />
-  <PRIMITIVE gatewayId="13" primitiveId="45" primitiveName="lasterror" />
-  <PRIMITIVE gatewayId="13" primitiveId="46" primitiveName="getversion" />
-  <PRIMITIVE gatewayId="13" primitiveId="47" primitiveName="macr2tree" />
-  <PRIMITIVE gatewayId="13" primitiveId="48" primitiveName="getos" />
-  <PRIMITIVE gatewayId="13" primitiveId="49" primitiveName="banner" />
-  <PRIMITIVE gatewayId="13" primitiveId="50" primitiveName="fromjava" />
-  <PRIMITIVE gatewayId="13" primitiveId="51" primitiveName="getmemory" />
-  <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="fromc" />
-  <PRIMITIVE gatewayId="13" primitiveId="53" primitiveName="getmd5" />
-  <PRIMITIVE gatewayId="13" primitiveId="54" primitiveName="getmodules" />
-  <PRIMITIVE gatewayId="13" primitiveId="55" primitiveName="with_module" />
-  <PRIMITIVE gatewayId="13" primitiveId="56" primitiveName="librarieslist" />
-  <PRIMITIVE gatewayId="13" primitiveId="57" primitiveName="libraryinfo" />
-  <PRIMITIVE gatewayId="13" primitiveId="58" primitiveName="getdebuginfo" />
-  <PRIMITIVE gatewayId="13" primitiveId="59" primitiveName="readgateway" />
+  <PRIMITIVE gatewayId="13" primitiveId="36" primitiveName="ieee" />
+  <PRIMITIVE gatewayId="13" primitiveId="37" primitiveName="typename" />
+  <PRIMITIVE gatewayId="13" primitiveId="38" primitiveName="global" />
+  <PRIMITIVE gatewayId="13" primitiveId="39" primitiveName="clearglobal" />
+  <PRIMITIVE gatewayId="13" primitiveId="40" primitiveName="isglobal" />
+  <PRIMITIVE gatewayId="13" primitiveId="41" primitiveName="gstacksize" />
+  <PRIMITIVE gatewayId="13" primitiveId="42" primitiveName="intppty" />
+  <PRIMITIVE gatewayId="13" primitiveId="43" primitiveName="lasterror" />
+  <PRIMITIVE gatewayId="13" primitiveId="44" primitiveName="getversion" />
+  <PRIMITIVE gatewayId="13" primitiveId="45" primitiveName="macr2tree" />
+  <PRIMITIVE gatewayId="13" primitiveId="46" primitiveName="getos" />
+  <PRIMITIVE gatewayId="13" primitiveId="47" primitiveName="banner" />
+  <PRIMITIVE gatewayId="13" primitiveId="48" primitiveName="fromjava" />
+  <PRIMITIVE gatewayId="13" primitiveId="49" primitiveName="getmemory" />
+  <PRIMITIVE gatewayId="13" primitiveId="50" primitiveName="fromc" />
+  <PRIMITIVE gatewayId="13" primitiveId="51" primitiveName="getmd5" />
+  <PRIMITIVE gatewayId="13" primitiveId="52" primitiveName="getmodules" />
+  <PRIMITIVE gatewayId="13" primitiveId="53" primitiveName="with_module" />
+  <PRIMITIVE gatewayId="13" primitiveId="54" primitiveName="librarieslist" />
+  <PRIMITIVE gatewayId="13" primitiveId="55" primitiveName="libraryinfo" />
+  <PRIMITIVE gatewayId="13" primitiveId="56" primitiveName="getdebuginfo" />
+  <PRIMITIVE gatewayId="13" primitiveId="57" primitiveName="readgateway" />
   <PRIMITIVE gatewayId="14" primitiveId="1" primitiveName="user" />
   
 </GATEWAY>
index 79b70e2..2b8939b 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath=".\cluni0.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\commandwords.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\GetenvB.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\GetExceptionCode.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_chdir.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\c\sci_clear.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_getcwd.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\c\sci_getdebuginfo.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\scicurdir.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\SCIHOME.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\cluni0.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\includes\commandwords.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\fromjava.h"
+                               RelativePath=".\fromjava.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\fromjava.h"
+                               RelativePath="..\..\includes\fromjava.h"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath=".\scicurdir.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\includes\SCIHOME.h"
                                >
                        </File>
index db80b62..e19ab4c 100644 (file)
@@ -8,7 +8,7 @@
 // test funptr
 //================================================
 ptr = funptr('pwd');
-if ptr <> 1340 then bugmes();quit;end
+if ptr <> 3434 then bugmes();quit;end
 ierr = execstr('ptr = funptr(1)','errcatch');
 if ierr <> 999 then bugmes();quit;end
 ptr = funptr('FCT_NOT_IN_SCILAB');
index 038aa64..f3225e1 100644 (file)
@@ -9,7 +9,7 @@
 // test funptr
 //================================================
 ptr = funptr('pwd');
-if ptr <> 1340 then pause,end
+if ptr <> 3434 then pause,end
 
 ierr = execstr('ptr = funptr(1)','errcatch');
 if ierr <> 999 then pause,end
index 131777c..995d0b2 100644 (file)
@@ -11,7 +11,6 @@ freeArrayOfString
 checkrhs_
 checklhs_
 gettype_
-cluni0_
 getWarningMode
 islittleendian
 callFunctionFromGateway
index f6eb961..8a57d84 100644 (file)
@@ -40,7 +40,9 @@ src/c/createdirectory.c \
 src/c/isdir.c \
 src/c/isDrive.c \
 src/c/removedir.c \
-src/c/set_xxprintf.c 
+src/c/set_xxprintf.c \
+src/c/cluni0.c \
+src/c/scicurdir.c
 
 
 GATEWAY_SOURCES = \
@@ -67,12 +69,15 @@ sci_gateway/c/sci_getlongpathname.c \
 sci_gateway/c/sci_fileext.c \
 sci_gateway/c/sci_isdir.c \
 sci_gateway/c/sci_removedir.c \
-sci_gateway/c/sci_createdir.c
+sci_gateway/c/sci_createdir.c \
+sci_gateway/c/sci_chdir.c \
+sci_gateway/c/sci_getcwd.c
 
 libscifileio_la_CFLAGS=                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
+                               -I$(top_srcdir)/modules/io/includes \
                 -I$(top_srcdir)/modules/string/includes
 
 pkglib_LTLIBRARIES = libscifileio.la
@@ -86,7 +91,7 @@ CHECK_SRC= $(FILEIO_SOURCES) $(GATEWAY_SOURCES)
 INCLUDE_FLAGS = $(libscifileio_la_CFLAGS)
 
 # pb of order $(top_builddir)/modules/shell/libscishell.la
-libscifileio_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/libst/libscilibst.la
+libscifileio_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la  $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/libst/libscilibst.la $(top_builddir)/modules/io/libsciio.la
 #### Target ######
 modulename=fileio
 
@@ -128,6 +133,8 @@ includes/mget.h \
 includes/mput.h \
 includes/mseek.h \
 includes/deleteafile.h \
-includes/readline.h
+includes/readline.h \
+includes/cluni0.h \
+includes/scicurdir.h 
 
 include $(top_srcdir)/Makefile.incl.am
index f15996f..47cc44c 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\bin\dumpexts -o %%~nf.def -n fileio.dll %%f &gt;nul&#x0D;&#x0A;copy *.def fileiotmp.def &gt;nul&#x0D;&#x0A;copy ..\fileio_header.def+fileiotmp.def  ..\fileio.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="libscilab.lib scilab_windows.lib scilocalization.lib io.lib"
                                OutputFile="../../bin/$(ProjectName).dll"
                                LinkIncremental="1"
                                IgnoreDefaultLibraryNames=""
                                >
                        </File>
                        <File
+                               RelativePath=".\src\c\cluni0.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\createdirectory.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_gateway\c\sci_chdir.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_gateway\c\sci_createdir.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\sci_gateway\c\sci_getcwd.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\sci_gateway\c\sci_getdrives.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\src\c\scicurdir.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\set_xxprintf.c"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\cluni0.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\includes\createdirectory.h"
                                >
                        </File>
                                >
                        </File>
                        <File
+                               RelativePath=".\includes\scicurdir.h"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\set_xxprintf.h"
                                >
                        </File>
                                Name="Imports"
                                >
                                <File
+                                       RelativePath=".\io_Import.def"
+                                       >
+                               </File>
+                               <File
                                        RelativePath=".\LibScilab_Import.def"
                                        >
                                </File>
                                        RelativePath=".\Localization_Import.def"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\Scilab_windows_Import.def"
+                                       >
+                               </File>
                        </Filter>
                </Filter>
                <File
index 10d6f2c..d0d5c76 100644 (file)
@@ -50,6 +50,8 @@ int C2F(sci_fileext)(char *fname,unsigned long fname_len);
 int C2F(sci_isdir)(char *fname,unsigned long fname_len);
 int C2F(sci_createdir)(char *fname,unsigned long fname_len);
 int C2F(sci_removedir)(char *fname,unsigned long fname_len);
+int C2F(sci_chdir)(char *fname,unsigned long fname_len);
+int C2F(sci_getcwd)(char *fname,unsigned long fname_len);
 /*--------------------------------------------------------------------------*/ 
 #endif /* __GW_FILEIO_H__ */
 /*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/fileio/io_Import.def b/scilab/modules/fileio/io_Import.def
new file mode 100644 (file)
index 0000000..1fc799e
--- /dev/null
@@ -0,0 +1,7 @@
+LIBRARY    io.dll
+
+
+EXPORTS
+GetenvB
+setUpdateEnvVar
+getUpdateEnvVar
index 7957671..a9d0074 100644 (file)
@@ -50,7 +50,9 @@ static gw_generic_table Tab[]={
        {C2F(sci_fileext),"fileext"},
        {C2F(sci_isdir),"isdir"},
        {C2F(sci_removedir),"removedir"},
-       {C2F(sci_createdir),"createdir"}
+       {C2F(sci_createdir),"createdir"},
+       {C2F(sci_getcwd),"getcwd"},
+       {C2F(sci_chdir),"chdir"}
        };
 /*--------------------------------------------------------------------------*/ 
 int gw_fileio(void)
index de72601..0f939ff 100644 (file)
@@ -17,7 +17,7 @@
 #include "stack-c.h"
 #include "MALLOC.h"
 #include "localization.h"
-#include "../../../core/src/c/scicurdir.h" /* scigetcwd */
+#include "scicurdir.h" /* scigetcwd */
 #include "Scierror.h"
 #include "cluni0.h"
 #include "PATH_MAX.h"
index 1843af5..34a2002 100644 (file)
@@ -66,4 +66,7 @@
 <PRIMITIVE gatewayId="34" primitiveId="31" primitiveName="isdir"/>
 <PRIMITIVE gatewayId="34" primitiveId="32" primitiveName="removedir"/>
 <PRIMITIVE gatewayId="34" primitiveId="33" primitiveName="createdir"/>
+<PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="pwd" />
+<PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="getcwd" />
+<PRIMITIVE gatewayId="34" primitiveId="35" primitiveName="chdir" />
 </GATEWAY>
similarity index 98%
rename from scilab/modules/core/src/c/cluni0.c
rename to scilab/modules/fileio/src/c/cluni0.c
index 08cf94b..9205cd0 100644 (file)
@@ -16,7 +16,7 @@
 #include "PATH_MAX.h"
 #include "core_math.h"
 #include "Os_specific.h"
-#include "../../../io/includes/setenvc.h"
+#include "setenvc.h"
 #include "cluni0.h"
 #include "GetenvB.h"
 #include "charEncoding.h"
index 8090a02..2dc7a44 100644 (file)
@@ -29,4 +29,3 @@ sciReturnRowVectorFromInt
 sciReturnDouble
 sciReturnString
 sciReturnRowVector
-cluni0_
\ No newline at end of file
index 487b335..6b0079e 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
+                               AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../fileio/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GUI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 15564ee..bf569b6 100644 (file)
@@ -50,7 +50,8 @@ libscihistory_manager_la_CFLAGS=      $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/libs/MALLOC/includes/ \
 -I$(top_srcdir)/modules/console/includes/ \
 -I$(top_srcdir)/modules/history_manager/includes/ \
--I$(top_srcdir)/modules/output_stream/includes/
+-I$(top_srcdir)/modules/output_stream/includes/ \
+-I$(top_srcdir)/modules/fileio/includes/
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
 # the system)
@@ -66,7 +67,7 @@ CHECK_SRC= $(HISTORY_MANAGER_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscihistory_manager_la_CFLAGS)
 
 ## Libraries necessary
-libscihistory_manager_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+libscihistory_manager_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/modules/fileio/libscifileio.la
 modulename=history_manager
 
 #### history_manager : Conf files ####
diff --git a/scilab/modules/history_manager/src/c/fileio_Import.def b/scilab/modules/history_manager/src/c/fileio_Import.def
new file mode 100644 (file)
index 0000000..e1e16c6
--- /dev/null
@@ -0,0 +1,7 @@
+       LIBRARY    fileio.dll
+
+
+EXPORTS
+;fileio
+cluni0_
+;
index bd85ddb..4bae59e 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib fileio.lib"
                                OutputFile="../../../../bin/sci$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="history_manager.def"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib fileio.lib"
                                OutputFile="../../../../bin/sci$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="history_manager.def"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib fileio.lib"
                                OutputFile="../../../../bin/sci$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="history_manager.def"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../windows_tools/includes;../../../output_stream/includes;../../../fileio/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS;STATIC_LINKED"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        <Tool
                                Name="VCPreLinkEventTool"
                                Description="Make dependencies"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)Scilab_windows_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilab_windows.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n history_manager.dll %%f &gt;nul&#x0D;&#x0A;copy *.def history_managertmp.def &gt;nul&#x0D;&#x0A;copy ..\history_manager_header.def+history_managertmp.def  ..\history_manager.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib"
+                               AdditionalDependencies="LibScilab.lib scilab_windows.lib scilocalization.lib fileio.lib"
                                OutputFile="../../../../bin/sci$(ProjectName).dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="history_manager.def"
                                Name="Imports"
                                >
                                <File
+                                       RelativePath=".\fileio_Import.def"
+                                       >
+                               </File>
+                               <File
                                        RelativePath=".\LibScilab_Import.def"
                                        >
                                </File>
index a317a58..63bd0a8 100644 (file)
@@ -6,7 +6,8 @@
 IO_C_SOURCES = src/c/getpidc.c \
 src/c/setenvc.c \
 src/c/systemc.c \
-src/c/getenvc.c
+src/c/getenvc.c \
+src/c/GetenvB.c
 
 IO_FORTRAN_SOURCES = src/fortran/v2unit.f \
 src/fortran/newsave.f \
@@ -115,6 +116,7 @@ libsciio_la_includedir=$(pkgincludedir)/io
 libsciio_la_include_HEADERS = includes/sci_getrelativefilename.h \
 includes/gw_io.h \
 includes/getenvc.h \
-includes/setenvc.h
+includes/setenvc.h \
+includes/GetenvB.h
 
 include $(top_srcdir)/Makefile.incl.am
similarity index 94%
rename from scilab/modules/core/src/c/GetenvB.c
rename to scilab/modules/io/src/c/GetenvB.c
index ed6a533..dc5f700 100644 (file)
@@ -12,7 +12,7 @@
  */
  
 #include "GetenvB.h"
-#include "../../io/includes/getenvc.h"
+#include "getenvc.h"
 
 void GetenvB(char *name, char *env, int len)
 {
index d1b9dcc..e722bce 100644 (file)
@@ -10,7 +10,6 @@ EXPORTS
  recu_
  putlhsvar_
  intersci_
- cluni0_
  stack_
  createvar_
  getrhsvar_
@@ -22,7 +21,6 @@ EXPORTS
  iop_
  GetFile
  getTMPDIR
- scigetcwd
  vartype_
  callFunctionFromGateway
  freeArrayOfString
index 8de0750..116c198 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\GetenvB.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\getenvc.c"
                                >
                        </File>
                        Filter="h;hpp;hxx;hm;inl"
                        >
                        <File
+                               RelativePath="..\..\includes\GetenvB.h"
+                               >
+                       </File>
+                       <File
                                RelativePath="..\..\includes\getenvc.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\setenvc.h"
+                               RelativePath=".\setenvc.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\setenvc.h"
+                               RelativePath="..\..\includes\setenvc.h"
                                >
                        </File>
                        <File
diff --git a/scilab/modules/io/src/fortran/fileio_Import.def b/scilab/modules/io/src/fortran/fileio_Import.def
new file mode 100644 (file)
index 0000000..fc42769
--- /dev/null
@@ -0,0 +1,5 @@
+LIBRARY    fileio.dll
+
+
+EXPORTS
+ cluni0_
\ No newline at end of file
index 12d60e1..012d85e 100644 (file)
@@ -18,7 +18,8 @@ del *.def &gt;nul
 cd ..
 copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
                                <Tool Name="VFPreBuildEventTool" 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
-lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
@@ -34,11 +35,12 @@ del *.def &gt;nul
 cd ..
 copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
                                <Tool Name="VFPreBuildEventTool" 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
-lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib fileio.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -50,11 +52,12 @@ del *.def &gt;nul
 cd ..
 copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
                                <Tool Name="VFPreBuildEventTool" 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
-lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
-                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
+                               <Tool Name="VFLinkerTool" AdditionalOptions="/DLL libcmt.lib /DLL ifconsol.lib /DLL libifport.lib /DLL libirc.lib /DLL libifcoremd.lib /DLL libmmd.lib /DLL io.lib" OutputFile="$(SolutionDir)bin\io_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="io_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\io_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib fileio.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -66,7 +69,8 @@ del *.def &gt;nul
 cd ..
 copy io_f_header.def+io_f.vcdef io_f.def &gt;nul" Description="Build io.def"/>
                                <Tool Name="VFPreBuildEventTool" 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
-lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/></Configuration></Configurations>
        <Files>
                <Filter Name="Header Files" Filter="fi;fd"/>
index 3315c84..395212f 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes"
+                               AdditionalIncludeDirectories="includes;src/c;&quot;$(ProjectDir)pvm3/include&quot;;&quot;$(ProjectDir)pvm3/src&quot;;../../libs/MALLOC/includes;../../libs/intl;../localization/includes;../core/includes;../output_stream/includes;../io/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;PVM_EXPORTS;WIN32;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 05b9994..9bb4d02 100644 (file)
@@ -7,4 +7,5 @@ mputnc_
 mget2
 mopen_
 mclose_
-mgetnc_
\ No newline at end of file
+mgetnc_
+cluni0_
\ No newline at end of file
index 87422cc..ec7012e 100644 (file)
@@ -3,7 +3,6 @@ LIBRARY    LibScilab.dll
 
 EXPORTS
  putlhsvar_
- cluni0_
  createvar_
  stack_
  com_
index 9d3deef..2653070 100644 (file)
@@ -45,7 +45,7 @@
                                Name="VCCLCompilerTool"
                                AdditionalOptions="&#x0D;&#x0A;"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index ed270ef..bfa088d 100644 (file)
@@ -3,7 +3,6 @@ LIBRARY    LibScilab.dll
 
 EXPORTS
  putlhsvar_
- cluni0_
  createvar_
  stack_
  com_
index 0ccb928..ea6ae82 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c/ripole;src/c;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"