summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2013-02-27 14:16:32 (GMT)
committer Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-02-27 16:58:25 (GMT)
commit879e8f383ea90da1564128dbd86d81ef17441985 (patch)
treecb506b3a497cfa5239c3716c92193358a91df084
parentcd5f533546dc499c920e3c4bba519c708db9f192 (diff)
downloadscilab-879e8f383ea90da1564128dbd86d81ef17441985.zip
scilab-879e8f383ea90da1564128dbd86d81ef17441985.tar.gz
scilab-879e8f383ea90da1564128dbd86d81ef17441985.tar.bz2
remove dependendy on libst, rewrite mgeti and mputi to follow documentationrefs/changes/24/10624/4
test_run("fileio",["mgeti","mputi"]) Change-Id: If2f9231e494dfa20cb2850bf8bfe72344db15ec0
-rw-r--r--scilab/Scilab.sln18
-rwxr-xr-xscilab/configure3
-rw-r--r--scilab/configure.ac1
-rw-r--r--scilab/libs/Makefile.am1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/libst/DllmainSt.c33
-rw-r--r--scilab/libs/libst/Makefile.am21
-rw-r--r--scilab/libs/libst/Makefile.in1017
-rw-r--r--scilab/libs/libst/libst.c4358
-rw-r--r--scilab/libs/libst/libst.def4
-rw-r--r--scilab/libs/libst/libst.h47
-rw-r--r--scilab/libs/libst/libst.rc96
-rw-r--r--scilab/libs/libst/libst.vcxproj241
-rw-r--r--scilab/libs/libst/libst.vcxproj.filters40
-rw-r--r--scilab/libs/libst/misc.c311
-rw-r--r--scilab/libs/libst/misc.h80
-rw-r--r--scilab/libs/libst/readme.txt13
-rw-r--r--scilab/modules/Makefile.am3
-rw-r--r--scilab/modules/Makefile.in3
-rw-r--r--scilab/modules/fileio/Makefile.am3
-rw-r--r--scilab/modules/fileio/Makefile.in14
-rw-r--r--scilab/modules/fileio/fileio.vcxproj6
-rw-r--r--scilab/modules/fileio/fileio.vcxproj.filters12
-rw-r--r--scilab/modules/fileio/src/c/convert_tools.c142
-rw-r--r--scilab/modules/fileio/src/c/convert_tools.h43
-rw-r--r--scilab/modules/fileio/src/c/mget.c169
-rw-r--r--scilab/modules/fileio/src/c/mgeti.c334
-rw-r--r--scilab/modules/fileio/src/c/mgeti.h24
-rw-r--r--scilab/modules/fileio/src/c/mput.c234
-rw-r--r--scilab/modules/fileio/src/c/mputi.c282
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mgeti.dia.ref67
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mgeti.tst76
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mputi.dia.ref73
-rw-r--r--scilab/modules/fileio/tests/unit_tests/mputi.tst90
-rw-r--r--scilab/modules/integer/src/fortran/Fileio_Import.def2
-rw-r--r--scilab/modules/integer/src/fortran/i_mget.f111
-rw-r--r--scilab/modules/integer/src/fortran/i_mput.f4
37 files changed, 1083 insertions, 6894 deletions
diff --git a/scilab/Scilab.sln b/scilab/Scilab.sln
index 87090a7..9a8c7e3 100644
--- a/scilab/Scilab.sln
+++ b/scilab/Scilab.sln
@@ -338,8 +338,6 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "slatec_f", "modules\element
338 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} 338 {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
339 EndProjectSection 339 EndProjectSection
340EndProject 340EndProject
341Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libst", "libs\libst\libst.vcxproj", "{FBF44619-6C9B-4400-940C-9147D81EB340}"
342EndProject
343Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nosound", "modules\sound\src\nosound\nosound.vcxproj", "{B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}" 341Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nosound", "modules\sound\src\nosound\nosound.vcxproj", "{B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}"
344EndProject 342EndProject
345Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "norandlib", "modules\randlib\src\norandlib\norandlib.vcxproj", "{E5038304-761D-448C-B358-48CA2883778A}" 343Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "norandlib", "modules\randlib\src\norandlib\norandlib.vcxproj", "{E5038304-761D-448C-B358-48CA2883778A}"
@@ -1099,14 +1097,6 @@ Global
1099 {EAF0949C-28D2-497C-954F-FC13B32FF2F3}.Release|Win32.Build.0 = Release|Win32 1097 {EAF0949C-28D2-497C-954F-FC13B32FF2F3}.Release|Win32.Build.0 = Release|Win32
1100 {EAF0949C-28D2-497C-954F-FC13B32FF2F3}.Release|x64.ActiveCfg = Release|x64 1098 {EAF0949C-28D2-497C-954F-FC13B32FF2F3}.Release|x64.ActiveCfg = Release|x64
1101 {EAF0949C-28D2-497C-954F-FC13B32FF2F3}.Release|x64.Build.0 = Release|x64 1099 {EAF0949C-28D2-497C-954F-FC13B32FF2F3}.Release|x64.Build.0 = Release|x64
1102 {FBF44619-6C9B-4400-940C-9147D81EB340}.Debug|Win32.ActiveCfg = Debug|Win32
1103 {FBF44619-6C9B-4400-940C-9147D81EB340}.Debug|Win32.Build.0 = Debug|Win32
1104 {FBF44619-6C9B-4400-940C-9147D81EB340}.Debug|x64.ActiveCfg = Debug|x64
1105 {FBF44619-6C9B-4400-940C-9147D81EB340}.Debug|x64.Build.0 = Debug|x64
1106 {FBF44619-6C9B-4400-940C-9147D81EB340}.Release|Win32.ActiveCfg = Release|Win32
1107 {FBF44619-6C9B-4400-940C-9147D81EB340}.Release|Win32.Build.0 = Release|Win32
1108 {FBF44619-6C9B-4400-940C-9147D81EB340}.Release|x64.ActiveCfg = Release|x64
1109 {FBF44619-6C9B-4400-940C-9147D81EB340}.Release|x64.Build.0 = Release|x64
1110 {B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}.Debug|Win32.ActiveCfg = Debug|Win32 1100 {B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}.Debug|Win32.ActiveCfg = Debug|Win32
1111 {B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}.Debug|Win32.Build.0 = Debug|Win32 1101 {B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}.Debug|Win32.Build.0 = Debug|Win32
1112 {B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}.Debug|x64.ActiveCfg = Debug|x64 1102 {B2A7F55B-8449-47FE-A1BB-5E77EC18DE43}.Debug|x64.ActiveCfg = Debug|x64
@@ -1155,14 +1145,6 @@ Global
1155 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}.Release|Win32.Build.0 = Release|Win32 1145 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}.Release|Win32.Build.0 = Release|Win32
1156 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}.Release|x64.ActiveCfg = Release|x64 1146 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}.Release|x64.ActiveCfg = Release|x64
1157 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}.Release|x64.Build.0 = Release|x64 1147 {445D3B85-C9B1-498B-9C88-0A3C2390B1CC}.Release|x64.Build.0 = Release|x64
1158 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Debug|Win32.ActiveCfg = Debug|Win32
1159 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Debug|Win32.Build.0 = Debug|Win32
1160 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Debug|x64.ActiveCfg = Debug|x64
1161 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Debug|x64.Build.0 = Debug|x64
1162 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Release|Win32.ActiveCfg = Release|Win32
1163 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Release|Win32.Build.0 = Release|Win32
1164 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Release|x64.ActiveCfg = Release|x64
1165 {ED02137F-0A4F-4EF0-AC58-97ACE37FA89D}.Release|x64.Build.0 = Release|x64
1166 {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}.Debug|Win32.ActiveCfg = Debug|Win32 1148 {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}.Debug|Win32.ActiveCfg = Debug|Win32
1167 {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}.Debug|Win32.Build.0 = Debug|Win32 1149 {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}.Debug|Win32.Build.0 = Debug|Win32
1168 {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}.Debug|x64.ActiveCfg = Debug|x64 1150 {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/scilab/configure b/scilab/configure
index 9fae683..15e4f9b 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -38888,7 +38888,7 @@ SCI_LDFLAGS=$(echo $LARGEFILE_LDFLAGS $CODECOVERAGE_LDFLAGS $DEBUG_LDFLAGS $
38888 38888
38889 38889
38890 38890