Merge branch 'master' of git@git.scilab.org:scilab
Allan CORNET [Tue, 7 Jul 2009 14:41:53 +0000 (16:41 +0200)]
66 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/api_scilab/.gitignore [new file with mode: 0644]
scilab/modules/api_scilab/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/api_scilab/Makefile.am [new file with mode: 0644]
scilab/modules/api_scilab/String_Import.def [new file with mode: 0644]
scilab/modules/api_scilab/api_scilab.iss [new file with mode: 0644]
scilab/modules/api_scilab/api_scilab.vcproj [new file with mode: 0644]
scilab/modules/api_scilab/api_scilab_header.def [new file with mode: 0644]
scilab/modules/api_scilab/changelog.txt [new file with mode: 0644]
scilab/modules/api_scilab/etc/api_scilab.quit [new file with mode: 0644]
scilab/modules/api_scilab/etc/api_scilab.start [new file with mode: 0644]
scilab/modules/api_scilab/help/en_US/addchapter.sce [new file with mode: 0644]
scilab/modules/api_scilab/help/en_US/double_writing_api.xml [new file with mode: 0644]
scilab/modules/api_scilab/includes/api_boolean.h [moved from scilab/modules/core/includes/api_boolean.h with 100% similarity]
scilab/modules/api_scilab/includes/api_boolean_sparse.h [moved from scilab/modules/core/includes/api_boolean_sparse.h with 100% similarity]
scilab/modules/api_scilab/includes/api_common.h [moved from scilab/modules/core/includes/api_common.h with 100% similarity]
scilab/modules/api_scilab/includes/api_double.h [moved from scilab/modules/core/includes/api_double.h with 100% similarity]
scilab/modules/api_scilab/includes/api_int.h [moved from scilab/modules/core/includes/api_int.h with 100% similarity]
scilab/modules/api_scilab/includes/api_list.h [moved from scilab/modules/core/includes/api_list.h with 100% similarity]
scilab/modules/api_scilab/includes/api_poly.h [moved from scilab/modules/core/includes/api_poly.h with 100% similarity]
scilab/modules/api_scilab/includes/api_sparse.h [moved from scilab/modules/core/includes/api_sparse.h with 100% similarity]
scilab/modules/api_scilab/includes/api_string.h [moved from scilab/modules/core/includes/api_string.h with 100% similarity]
scilab/modules/api_scilab/includes/api_variable.h [moved from scilab/modules/core/includes/api_variable.h with 100% similarity]
scilab/modules/api_scilab/license.txt [new file with mode: 0644]
scilab/modules/api_scilab/macros/buildmacros.bat [new file with mode: 0644]
scilab/modules/api_scilab/macros/buildmacros.sce [new file with mode: 0644]
scilab/modules/api_scilab/macros/cleanmacros.bat [new file with mode: 0644]
scilab/modules/api_scilab/readme.txt [new file with mode: 0644]
scilab/modules/api_scilab/src/c/DllmainApi_scilab.c [new file with mode: 0644]
scilab/modules/api_scilab/src/c/api_boolean.c [moved from scilab/modules/core/src/c/api_boolean.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_boolean_sparse.c [moved from scilab/modules/core/src/c/api_boolean_sparse.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_common.c [moved from scilab/modules/core/src/c/api_common.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_double.c [moved from scilab/modules/core/src/c/api_double.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_int.c [moved from scilab/modules/core/src/c/api_int.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_boolean.h [moved from scilab/modules/core/src/c/api_internal_boolean.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_boolean_sparse.h [moved from scilab/modules/core/src/c/api_internal_boolean_sparse.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_common.h [moved from scilab/modules/core/src/c/api_internal_common.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_double.h [moved from scilab/modules/core/src/c/api_internal_double.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_int.h [moved from scilab/modules/core/src/c/api_internal_int.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_poly.h [moved from scilab/modules/core/src/c/api_internal_poly.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_sparse.h [moved from scilab/modules/core/src/c/api_internal_sparse.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_internal_string.h [moved from scilab/modules/core/src/c/api_internal_string.h with 100% similarity]
scilab/modules/api_scilab/src/c/api_list.c [moved from scilab/modules/core/src/c/api_list.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_poly.c [moved from scilab/modules/core/src/c/api_poly.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_scilab.rc [new file with mode: 0644]
scilab/modules/api_scilab/src/c/api_sparse.c [moved from scilab/modules/core/src/c/api_sparse.c with 100% similarity]
scilab/modules/api_scilab/src/c/api_string.c [moved from scilab/modules/core/src/c/api_string.c with 100% similarity]
scilab/modules/api_scilab/src/c/resource.h [new file with mode: 0644]
scilab/modules/api_scilab/version.xml [new file with mode: 0644]
scilab/modules/call_scilab/call_scilab.vcproj
scilab/modules/call_scilab/examples/call_scilab/c#/dotnetsci/dotnetsci/Scilab.cs
scilab/modules/call_scilab/src/c/DllmainCall_scilab.c [new file with mode: 0644]
scilab/modules/core/Makefile.am
scilab/modules/core/src/c/core.vcproj
scilab/modules/dynamic_link/macros/ilib_compile.sci
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak
scilab/modules/fileio/LibScilab_Import.def
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/fileio.vcproj
scilab/modules/functions/Makefile.am
scilab/modules/functions/src/c/LibScilab_Import.def
scilab/modules/functions/src/c/functions.vcproj

index d38b736..936617e 100644 (file)
@@ -98,6 +98,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
                {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} = {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} = {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0}
                {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F}
                {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
@@ -283,6 +284,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio", "modules\fileio\fi
                {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -1002,6 +1004,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi
        ProjectSection(ProjectDependencies) = postProject
                {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -1012,6 +1015,12 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "functions_f", "modules\func
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_scilab\api_scilab.vcproj", "{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}"
+       ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2076,6 +2085,14 @@ Global
                {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.Build.0 = Release|Win32
                {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.ActiveCfg = Release|x64
                {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.Build.0 = Release|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.Build.0 = Debug|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.ActiveCfg = Debug|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.Build.0 = Debug|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.ActiveCfg = Release|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 3dea74d..d58d675 100644 (file)
@@ -98,6 +98,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab_f2c", "libs\LibSc
                {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470} = {8BA2DDA8-BD04-4D4D-8EE6-6CAA955F7470}
                {C7865CAA-EC7C-41EB-8324-2B81C384CA20} = {C7865CAA-EC7C-41EB-8324-2B81C384CA20}
                {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89} = {CCCE1EAD-8E62-4DC0-AB17-972C06EF0C89}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0} = {F52E27B6-D1B2-4BC1-9FC9-BE11B11397F0}
                {8091E9B6-4C08-4218-A63D-742867CCFE9F} = {8091E9B6-4C08-4218-A63D-742867CCFE9F}
                {C456D5B8-8A32-496A-A2EE-164B0D734126} = {C456D5B8-8A32-496A-A2EE-164B0D734126}
@@ -283,6 +284,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileio", "modules\fileio\fi
                {805AA73F-EF7B-4177-BF46-200B72D8F83A} = {805AA73F-EF7B-4177-BF46-200B72D8F83A}
                {8D45767A-9B03-4905-97F6-D2F3F79141EA} = {8D45767A-9B03-4905-97F6-D2F3F79141EA}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -1002,6 +1004,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functi
        ProjectSection(ProjectDependencies) = postProject
                {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
                {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0} = {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
                {A5911CD7-F8E8-440C-A23E-4843A0636F3A} = {A5911CD7-F8E8-440C-A23E-4843A0636F3A}
        EndProjectSection
@@ -1012,6 +1015,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f2c", "modules\fu
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_scilab\api_scilab.vcproj", "{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}"
+       ProjectSection(ProjectDependencies) = postProject
+               {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E} = {6A84AD8C-BA18-4A3F-9C72-EC3DF0939E9E}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2076,6 +2085,14 @@ Global
                {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.Build.0 = Release|Win32
                {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.ActiveCfg = Release|x64
                {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|x64.Build.0 = Release|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|Win32.Build.0 = Debug|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.ActiveCfg = Debug|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Debug|x64.Build.0 = Debug|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.ActiveCfg = Release|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|Win32.Build.0 = Release|Win32
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.ActiveCfg = Release|x64
+               {43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index f186c2b..de15e69 100644 (file)
@@ -13,6 +13,7 @@
 <!-- =================== -->
 <modules>
 <module name="core" activate="yes"/>
+<module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="@HELP_ENABLE@"/>
 <module name="differential_equations" activate="yes"/>
 <module name="double" activate="yes"/>
@@ -62,7 +63,6 @@
 <module name="sound" activate="yes"/>
 <module name="scipad" activate="@SCIPAD_ENABLE@"/>
 <module name="randlib" activate="yes"/>
-<module name="scilab2fortran" activate="yes"/>
 <module name="development_tools" activate="yes"/>
 <module name="demo_tools" activate="@DEMOTOOLS_ENABLE@"/>
 <module name="spreadsheet" activate="yes"/>
index 41755ab..0de3bee 100644 (file)
@@ -13,6 +13,7 @@
 <!-- =================== -->
 <modules>
 <module name="core" activate="yes"/>
+<module name="api_scilab" activate="yes"/>
 <module name="helptools" activate="yes"/>
 <module name="differential_equations" activate="yes"/>
 <module name="double" activate="yes"/>
@@ -83,6 +84,4 @@
 <module name="parameters" activate="yes"/>
 <module name="matio" activate="yes"/>
 <!-- comments -->
-<module name="scilab2fortran" activate="no"/>
-<!-- comments -->
 </modules>
index bf1f206..4531569 100644 (file)
@@ -22,6 +22,7 @@ action_binding \
 arnoldi \
 elementary_functions \
 string \
+api_scilab \
 dynamic_link \
 fileio \
 history_manager \
@@ -140,6 +141,7 @@ ENGINE_LIBS =       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/cacsd/libscicacsd.la \
        $(top_builddir)/modules/core/libscicore.la \
        $(top_builddir)/modules/call_scilab/libscicall_scilab.la \
+       $(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
        $(top_builddir)/modules/data_structures/libscidata_structures.la \
        $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
        $(top_builddir)/modules/double/libscidouble.la \
diff --git a/scilab/modules/api_scilab/.gitignore b/scilab/modules/api_scilab/.gitignore
new file mode 100644 (file)
index 0000000..21645b7
--- /dev/null
@@ -0,0 +1,4 @@
+#
+#generated .def files (windows)
+#
+api_scilab.def
diff --git a/scilab/modules/api_scilab/LibScilab_Import.def b/scilab/modules/api_scilab/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..e0429f9
--- /dev/null
@@ -0,0 +1,16 @@
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+com_
+vstk_
+intersci_
+stack_
+iop_
+stackg_
+stackp_
+vGetPointerFromDoubleComplex
+oGetDoubleComplexFromPointer
+iArraySum
+str2name_
+cvnamel_
\ No newline at end of file
diff --git a/scilab/modules/api_scilab/Makefile.am b/scilab/modules/api_scilab/Makefile.am
new file mode 100644 (file)
index 0000000..f3bb4de
--- /dev/null
@@ -0,0 +1,67 @@
+##########
+### Allan CORNET
+### DIGITEO - Scilab 2009
+##########
+
+### SOURCES ###
+API_SCILAB_C_SOURCES = src/c/api_boolean.c \
+src/c/api_boolean_sparse.c \
+src/c/api_common.c \
+src/c/api_double.c \
+src/c/api_int.c \
+src/c/api_list.c \
+src/c/api_poly.c \
+src/c/api_sparse.c \
+src/c/api_string.c
+
+
+libsciapi_scilab_la_CFLAGS=-I$(srcdir)/includes/ \
+-I$(srcdir)/src/c/ \
+-I$(top_srcdir)/modules/core/includes \
+-I$(top_srcdir)/modules/call_scilab/includes \
+-I$(top_srcdir)/libs/MALLOC/includes/ \
+-I$(top_srcdir)/modules/output_stream/includes \
+-I$(top_srcdir)/modules/string/includes
+
+
+pkglib_LTLIBRARIES = libsciapi_scilab.la
+
+libsciapi_scilab_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+
+libsciapi_scilab_la_SOURCES = $(API_SCILAB_C_SOURCES) $(GATEWAY_C_SOURCES)
+
+# For the code check (splint)
+CHECK_SRC= $(libsciapi_scilab_la_SOURCES)
+INCLUDE_FLAGS = $(libsciapi_scilab_la_CFLAGS)
+
+libsciapi_scilab_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la
+
+
+#### Target ######
+modulename=api_scilab
+
+
+#### api_scilab : Conf files ####
+libsciapi_scilab_la_rootdir = $(mydatadir)
+libsciapi_scilab_la_root_DATA = changelog.txt license.txt readme.txt version.xml
+
+
+#### api_scilab : init scripts ####
+libsciapi_scilab_la_etcdir = $(mydatadir)/etc
+libsciapi_scilab_la_etc_DATA = etc/api_scilab.quit etc/api_scilab.start
+
+
+#### api_scilab : include files ####
+libsciapi_scilab_la_includedir=$(pkgincludedir)/api_scilab
+libsciapi_scilab_la_include_HEADERS = includes/api_boolean.h \
+includes/api_boolean_sparse.h \
+includes/api_common.h \
+includes/api_double.h \
+includes/api_int.h \
+includes/api_list.h \
+includes/api_poly.h \
+includes/api_sparse.h \
+includes/api_string.h \
+includes/api_variable.h
+
+include $(top_srcdir)/Makefile.incl.am
diff --git a/scilab/modules/api_scilab/String_Import.def b/scilab/modules/api_scilab/String_Import.def
new file mode 100644 (file)
index 0000000..ae80e0e
--- /dev/null
@@ -0,0 +1,6 @@
+LIBRARY    string.dll
+
+
+EXPORTS
+code2str
+str2code
\ No newline at end of file
diff --git a/scilab/modules/api_scilab/api_scilab.iss b/scilab/modules/api_scilab/api_scilab.iss
new file mode 100644 (file)
index 0000000..bbd5e21
--- /dev/null
@@ -0,0 +1,43 @@
+;##############################################################################################################
+; Script d'installation Inno Setup (5.2.1) pour scilab
+; Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+; Copyright (C) 2009 - DIGITEO - Allan CORNET
+;
+; This file must be used under the terms of the CeCILL.
+; This source file is licensed as described in the file COPYING, which
+; you should have received as part of this distribution.  The terms
+; are also available at
+; http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+;
+
+;##############################################################################################################
+;--------------------------------------------------------------------------------------------------------------
+; api_scilab module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define MODULE_API_SCILAB "api_scilab"
+;
+Source: bin\api_scilab.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\api_scilab.lib; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#MODULE_API_SCILAB}\changelog.txt; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB}
+Source: modules\{#MODULE_API_SCILAB}\license.txt; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB}
+Source: modules\{#MODULE_API_SCILAB}\readme.txt; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB}
+Source: modules\{#MODULE_API_SCILAB}\version.xml; DestDir: {app}\modules\{#MODULE_API_SCILAB}; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#MODULE_API_SCILAB}\includes\*.h; DestDir: {app}\modules\{#MODULE_API_SCILAB}\includes; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#MODULE_API_SCILAB}\etc\{#MODULE_CALL_SCILAB}.quit; DestDir: {app}\modules\{#MODULE_API_SCILAB}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#MODULE_API_SCILAB}\etc\{#MODULE_CALL_SCILAB}.start; DestDir: {app}\modules\{#MODULE_API_SCILAB}\etc; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#MODULE_API_SCILAB}\macros\buildmacros.sce; DestDir: {app}\modules\{#MODULE_API_SCILAB}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#MODULE_API_SCILAB}\macros\buildmacros.bat; DestDir: {app}\modules\{#MODULE_API_SCILAB}\macros; Components: {#COMPN_SCILAB}
+Source: modules\{#MODULE_API_SCILAB}\macros\cleanmacros.bat; DestDir: {app}\modules\{#MODULE_API_SCILAB}\macros; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#MODULE_API_SCILAB}\examples\*.*; DestDir: {app}\modules\{#MODULE_API_SCILAB}\examples; Flags: recursesubdirs; Components:  {#COMPN_SCILAB}
+;
+;Source: modules\{#MODULE_API_SCILAB}\help\addchapter.sce; DestDir: {app}\modules\{#MODULE_API_SCILAB}\help; Flags: recursesubdirs; Components:  {#COMPN_SCILAB}
+;
+;Source: modules\{#MODULE_API_SCILAB}\tests\*.*; DestDir: {app}\modules\{#MODULE_API_SCILAB}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;
+;--------------------------------------------------------------------------------------------------------------
diff --git a/scilab/modules/api_scilab/api_scilab.vcproj b/scilab/modules/api_scilab/api_scilab.vcproj
new file mode 100644 (file)
index 0000000..7b110f9
--- /dev/null
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="api_scilab"
+       ProjectGUID="{43C5BAB1-1DCA-4743-A183-77E0D42FE7D0}"
+       RootNamespace="api_scilab"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes"
+                               PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.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 api_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def api_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\api_scilab_header.def+api_scilabtmp.def  ..\api_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib string.lib"
+                               OutputFile="../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="api_scilab.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../bin/$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes"
+                               PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.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 api_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def api_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\api_scilab_header.def+api_scilabtmp.def  ..\api_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib string.lib"
+                               OutputFile="../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="api_scilab.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../bin/$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes"
+                               PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="0"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.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 api_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def api_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\api_scilab_header.def+api_scilabtmp.def  ..\api_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib string.lib"
+                               OutputFile="../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="api_scilab.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../bin/$(ProjectName).lib"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="2"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="1"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../call_scilab/includes;../string/includes;../../libs/MALLOC/includes"
+                               PreprocessorDefinitions="FORDLL;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="0"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Make dependencies"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.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 api_scilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def api_scilabtmp.def &gt;nul&#x0D;&#x0A;copy ..\api_scilab_header.def+api_scilabtmp.def  ..\api_scilab.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib string.lib"
+                               OutputFile="../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="api_scilab.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../bin/$(ProjectName).lib"
+                               TargetMachine="17"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath=".\src\c\api_boolean.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_boolean_sparse.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_common.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_double.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_int.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_list.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_poly.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_sparse.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_string.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\DllmainApi_scilab.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath=".\includes\api_boolean.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_boolean_sparse.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_common.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_double.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_int.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_boolean.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_boolean_sparse.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_common.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_double.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_int.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_poly.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_sparse.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\api_internal_string.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_list.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_poly.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_sparse.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_string.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\includes\api_variable.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\src\c\resource.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Resource Files"
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+                       >
+                       <File
+                               RelativePath=".\src\c\api_scilab.rc"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="localization"
+                       >
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+                       <File
+                               RelativePath=".\api_scilab_header.def"
+                               >
+                       </File>
+                       <Filter
+                               Name="Imports"
+                               >
+                               <File
+                                       RelativePath=".\LibScilab_Import.def"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <File
+                       RelativePath=".\api_scilab.iss"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
+                       RelativePath=".\Makefile.am"
+                       >
+               </File>
+               <File
+                       RelativePath=".\version.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/api_scilab/api_scilab_header.def b/scilab/modules/api_scilab/api_scilab_header.def
new file mode 100644 (file)
index 0000000..ce0a30a
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    api_scilab.dll
+
+
+EXPORTS
diff --git a/scilab/modules/api_scilab/changelog.txt b/scilab/modules/api_scilab/changelog.txt
new file mode 100644 (file)
index 0000000..1f964ad
--- /dev/null
@@ -0,0 +1,8 @@
+action_binding (0.1-1) stable; urgency=medium
+
+  * First version of the module
+ -- Vincent COUVERT Wed, 24 Oct 2007 15:46:08D +0200
+
+  * Based on module_skeleton
+ -- Sylvestre Ledru  Tue, 13 Mar 2007 13:37:08D +0200
+ -- Allan CORNET  Sun, 13 30 2007 13:37:08D +0200
diff --git a/scilab/modules/api_scilab/etc/api_scilab.quit b/scilab/modules/api_scilab/etc/api_scilab.quit
new file mode 100644 (file)
index 0000000..b4daad0
--- /dev/null
@@ -0,0 +1,17 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+
+// ====================================================================
+// This file contains command to be executed at the end
+// of a scilab session for api_scilab module
+// ====================================================================
+// delete help chapter
+del_help_chapter('api_scilab',%T);
+// ====================================================================
\ No newline at end of file
diff --git a/scilab/modules/api_scilab/etc/api_scilab.start b/scilab/modules/api_scilab/etc/api_scilab.start
new file mode 100644 (file)
index 0000000..3b073cd
--- /dev/null
@@ -0,0 +1,19 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+
+// ====================================================================
+// api_scilab module initialisation file
+// ====================================================================
+//Load  functions libraries
+//load('SCI/modules/api_scilab/macros/lib');
+// ====================================================================
+//add help chapter
+add_module_help_chapter('api_scilab');
+// ====================================================================
diff --git a/scilab/modules/api_scilab/help/en_US/addchapter.sce b/scilab/modules/api_scilab/help/en_US/addchapter.sce
new file mode 100644 (file)
index 0000000..b2fcaf6
--- /dev/null
@@ -0,0 +1,12 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+//
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+path = SCI+"/modules/api_scilab/help/en_US";
+add_help_chapter("API Scilab",path,%T);
+clear path add_help_chapter;
diff --git a/scilab/modules/api_scilab/help/en_US/double_writing_api.xml b/scilab/modules/api_scilab/help/en_US/double_writing_api.xml
new file mode 100644 (file)
index 0000000..1cd42ea
--- /dev/null
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009  - DIGITEO - Antoine ELIAS
+ * 
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at    
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ -->
+<refentry version="5.0-subset Scilab" xml:id="Double management writing_API"
+          xml:lang="en" xmlns="http://docbook.org/ns/docbook"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:ns5="http://www.w3.org/1999/xhtml"
+          xmlns:mml="http://www.w3.org/1998/Math/MathML"
+          xmlns:db="http://docbook.org/ns/docbook">
+
+    <refnamediv>
+        <refname>Double writing</refname>
+
+        <refpurpose>
+            How to write matrices of doubles in a gateway.
+        </refpurpose>
+    </refnamediv>
+    <refsection>
+        <title>Description</title>
+        <para>This help describes how matrix of doubles can be handled through the Scilab API.</para>
+        <para>There are 2 types of functions which can be used to write in the memory of Scilab.</para>
+    </refsection>
+    <refsection>
+        <title>Create from existing data</title>
+        <synopsis>int createMatrixOfDouble(int _iVar, int _iRows, int _iCols, double* _pdblReal)</synopsis>
+        <synopsis>int createComplexMatrixOfDouble(int _iVar, int _iRows, int _iCols, double* _pdblReal, double* _pdblImg)</synopsis>
+    </refsection>
+    <refsection>
+        <title>Parameters</title>
+
+        <variablelist>
+            <varlistentry>
+                <term>_iVar</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_iRows</term>
+                <listitem>
+                    <para>
+                        Number of rows of the new variable
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_iCols</term>
+                <listitem>
+                    <para>
+                        Numbers of columns of the new variable
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_pdblReal</term>
+                <listitem>
+                    <para>
+                        Address of real data array (size: _iCols * _iRows)
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_pdblImg</term>
+                <listitem>
+                    <para>
+                        Address of imaginary data array (size: _iCols * _iRows)
+                    </para>
+                </listitem>
+            </varlistentry>
+
+        </variablelist>
+    </refsection>
+    <refsection>
+        <title>Write directly in Scilab memory</title>
+        <synopsis>int allocMatrixOfDouble(int _iVar, int _iRows, int _iCols, double** _pdblReal)</synopsis>
+        <synopsis>int allocComplexMatrixOfDouble(int _iVar, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)</synopsis>
+    </refsection>
+    <refsection>
+        <title>Parameters</title>
+
+        <variablelist>
+            <varlistentry>
+                <term>_iVar</term>
+                <listitem>
+                    <para>
+                        Position in the Scilab memory where you want to put the variable
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_iRows</term>
+                <listitem>
+                    <para>
+                        Number of rows of the new variable
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_iCols</term>
+                <listitem>
+                    <para>
+                        Numbers of columns of the new variable
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_pdblReal</term>
+                <listitem>
+                    <para>
+                        Returns address of real data array (size: _iCols * _iRows)
+                    </para>
+                </listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term>_pdblImg</term>
+                <listitem>
+                    <para>
+                        Returns address of imaginary data array (size: _iCols * _iRows)
+                    </para>
+                </listitem>
+            </varlistentry>
+
+        </variablelist>
+    </refsection>
+
+    <refsection>
+        <!--File_gateway: SCI/modules/core/tests/unit_tests/double_writing_api.c-->
+        <!--File_scilab: SCI/modules/core/tests/unit_tests/double_writing_api.tst-->
+        <!--Lib_name: double_writing-->
+        <!--Func_list: write_double-->
+        <title>Gateway Source</title>
+        <programlisting role="code gateway">
+            <![CDATA[
+int write_double(char *fname,unsigned long fname_len)
+{
+    int i,j;
+
+    //first variable info : real matrix of double 3 x 4
+    int iRows1          = 3;
+    int iCols1          = 4;
+    double* pdblReal1   = NULL;
+
+    //second variable info : complex matrix of double 4 x 6
+    int iRows2          = 4;
+    int iCols2          = 6;
+    double* pdblReal2   = NULL;
+    double* pdblImg2    = NULL;
+
+    /************************
+    *    First variable    *
+    ************************/
+    //alloc array of data in OS memory
+    pdblReal1 = (double*)malloc(sizeof(double) * iRows1 * iCols1);
+
+    //fill array with incremental values
+    //[ 0   1   2   3
+    //  4   5   6   7
+    //  8   9   10  11]
+    for(i = 0 ; i < iRows1 ; i++)
+    {
+        for(j = 0 ; j < iCols1 ; j++)
+        {
+            pdblReal1[i + iRows1 * j] = i * iCols1 + j;
+        }
+    }
+    //can be written in a single loop
+    //for(i = 0 ; i < iRows1 * iCols1; i++)
+    //{
+    //  pdblReal1[i] = i;
+    //}
+
+    //create a variable from a existing data array
+    createMatrixOfDouble(Rhs + 1, iRows1, iCols1, pdblReal1);
+
+    //after creation, we can free memory.
+    free(pdblReal1);
+    /*************************
+    *    Second variable    *
+    *************************/
+
+    //reserve space in scilab memory and fill it
+    allocComplexMatrixOfDouble(Rhs + 2, iRows2, iCols2, &pdblReal2, &pdblImg2);
+
+    //fill array with incremental values for real part and decremental for imaginary part
+    //[ 23i     1+22i       2+21i       3+20i       4+19i       5+18i
+    //  6+17i   7+16i       8+15i       9+14i       10+13i      11+12i
+    //  12+11i  13+10i      14+9i       15+8i       16+7i       17+6i
+    //  18+5i   19+4i       20+3i       21+2i       22+1i       23  ]
+    for(i = 0 ; i < iRows2 ; i++)
+    {
+       for(j = 0 ; j < iCols2 ; j++)
+        {
+            pdblReal2[i + iRows2 * j] = i * iCols2 + j;
+            pdblImg2 [i + iRows2 * j]  = (iRows2 * iCols2 - 1) - (i * iCols2 + j);
+        }
+    }
+    //can be written in a single loop
+    //for(i = 0 ; i < iRows2 * iCols2; i++)
+    //{
+    //  pdblReal2[i] = i;
+    //  pdblImg2 [i] = (iRows2 * iCols2 - 1) - i;
+    //}
+
+    // /!\ DO NOT FREE MEMORY, in this case, it's the Scilab memory
+
+
+    //assign allocated variables to Lhs position
+    LhsVar(1) = Rhs + 1;
+    LhsVar(2) = Rhs + 2;
+    PutLhsVar();
+    return 0;
+}
+        ]]>
+        </programlisting>
+    </refsection>
+
+    <refsection>
+        <title>Scilab test script</title>
+        <programlisting role="code_scilab">
+            <![CDATA[
+a_ref = [   0 1 2 3; ..
+            4 5 6 7; ..
+            8 9 10 11];
+b_ref = [   23*%i,      1+22*%i,    2+21*%i,    3+20*%i,    4+19*%i,    5+18*%i; ..
+            6+17*%i,    7+16*%i,    8+15*%i,    9+14*%i,     10+13*%i,  11+12*%i; ..
+            12+11*%i,   13+10*%i,   14+9*%i,    15+8*%i,    16+7*%i,    17+6*%i; ..
+            18+5*%i,    19+4*%i,    20+3*%i,    21+2*%i,    22+1*%i,    23];
+[a,b] = write_double();
+if or(a <> a_ref) then error("failed");end
+if or(b <>; b_ref) then error("failed");end
+            ]]>
+        </programlisting>
+    </refsection>
+</refentry>
\ No newline at end of file
diff --git a/scilab/modules/api_scilab/license.txt b/scilab/modules/api_scilab/license.txt
new file mode 100644 (file)
index 0000000..393778b
--- /dev/null
@@ -0,0 +1,9 @@
+Copyright:
+Copyright (c) 2009 - DIGITEO
+
+License:
+This module must be used under the terms of the CeCILL.
+This module file is licensed as described in the file COPYING, which
+you should have received as part of this distribution.  The terms
+are also available at
+http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
diff --git a/scilab/modules/api_scilab/macros/buildmacros.bat b/scilab/modules/api_scilab/macros/buildmacros.bat
new file mode 100644 (file)
index 0000000..433a603
--- /dev/null
@@ -0,0 +1,11 @@
+rem Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2006 - INRIA 
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+
+@..\..\..\bin\scilex -nwni -ns -e exec('buildmacros.sce');quit;
\ No newline at end of file
diff --git a/scilab/modules/api_scilab/macros/buildmacros.sce b/scilab/modules/api_scilab/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..926a8fa
--- /dev/null
@@ -0,0 +1,15 @@
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+// 
+// This file must be used under the terms of the CeCILL.
+// This source file is licensed as described in the file COPYING, which
+// you should have received as part of this distribution.  The terms
+// are also available at    
+// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+if (isdef('genlib') == %f) then
+  exec(SCI+'/modules/functions/scripts/buildmacros/loadgenlib.sce');
+end
+//------------------------------------
+//genlib('api_scilablib','SCI/modules/api_scilab/macros',%f,%t);
+//------------------------------------
diff --git a/scilab/modules/api_scilab/macros/cleanmacros.bat b/scilab/modules/api_scilab/macros/cleanmacros.bat
new file mode 100644 (file)
index 0000000..0009ddb
--- /dev/null
@@ -0,0 +1,13 @@
+rem Scilab ( http://mwww.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2006 - INRIA
+rem
+rem This file must be used under the terms of the CeCILL.
+rem This source file is licensed as described in the file COPYING, which
+rem you should have received as part of this distribution.  The terms
+rem are also available at
+rem http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+
+
+@del *.bin 2>NUL
+@del lib 2>NUL
+@del names 2>NUL
\ No newline at end of file
diff --git a/scilab/modules/api_scilab/readme.txt b/scilab/modules/api_scilab/readme.txt
new file mode 100644 (file)
index 0000000..785eeec
--- /dev/null
@@ -0,0 +1 @@
+README File
diff --git a/scilab/modules/api_scilab/src/c/DllmainApi_scilab.c b/scilab/modules/api_scilab/src/c/DllmainApi_scilab.c
new file mode 100644 (file)
index 0000000..45eacb9
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2009 - DIGITEO - Allan CORNET
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+/*--------------------------------------------------------------------------*/ 
+#include <stdio.h> 
+#include <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../bin/libintl.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+       /* force redirect stdout, stderr in console */
+       freopen("CONOUT$", "wb", stdout); /* redirect stdout --> CONOUT$*/
+       freopen("CONOUT$", "wb", stderr); /* redirect stderr --> CONOUT$*/
+
+       switch (reason) 
+       {
+       case DLL_PROCESS_ATTACH:
+               break;
+       case DLL_PROCESS_DETACH:
+               break;
+       case DLL_THREAD_ATTACH:
+               break;
+       case DLL_THREAD_DETACH:
+               break;
+       }
+       return 1;
+}
+/*--------------------------------------------------------------------------*/ 
+
diff --git a/scilab/modules/api_scilab/src/c/api_scilab.rc b/scilab/modules/api_scilab/src/c/api_scilab.rc
new file mode 100644 (file)
index 0000000..9838e9c
--- /dev/null
@@ -0,0 +1,96 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+//#include "afxres.h"
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 5,1,0,0
+ PRODUCTVERSION 5,1,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "api_scilab module"
+            VALUE "FileVersion", "5, 2, 0, 0"
+            VALUE "InternalName", "api_scilab module"
+            VALUE "LegalCopyright", "Copyright (C) 2009"
+            VALUE "OriginalFilename", "api_scilab.dll"
+            VALUE "ProductName", " api_scilab module"
+            VALUE "ProductVersion", "5, 2, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x40c, 1200
+    END
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/scilab/modules/api_scilab/src/c/resource.h b/scilab/modules/api_scilab/src/c/resource.h
new file mode 100644 (file)
index 0000000..2501ccc
--- /dev/null
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by api_scilab.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/scilab/modules/api_scilab/version.xml b/scilab/modules/api_scilab/version.xml
new file mode 100644 (file)
index 0000000..ef77fdd
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009 - DIGITEO - Allan CORNET
+ *
+ * This file must be used under the terms of the CeCILL.
+ * This source file is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution.  The terms
+ * are also available at
+ * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ *
+ -->
+
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+<MODULE_VERSION name="api_scilab">
+<!-- =================== -->
+<!--
+ Scilab
+ Defines the version of a module
+
+ ===================
+
+-->
+<!-- =================== -->
+
+<VERSION major="5" minor="2" maintenance="0" revision="0" string="unstable-git" />
+</MODULE_VERSION>
\ No newline at end of file
index a47278d..389083b 100644 (file)
                                >
                        </File>
                        <File
+                               RelativePath=".\src\c\DllmainCall_scilab.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\src\c\fromc.c"
                                >
                        </File>
index 935b3c2..c081127 100644 (file)
@@ -47,7 +47,7 @@ namespace DotNetScilab
         private Boolean withGraphics = false;
         //=============================================================================
         private const string CALL_SCILAB_DLL = "call_scilab.dll";
-        private const string LIBSCILAB_DLL = "libscilab.dll";
+        private const string API_SCILAB_DLL = "api_scilab.dll";
         private const string GRAPHICS_DLL = "graphics.dll";
         private const string OUTPUT_STREAM_DLL = "scioutput_stream.dll";
         //=============================================================================
@@ -551,7 +551,7 @@ namespace DotNetScilab
         /// <summary>
         /// import createNamedMatrixOfString from C (see api_string.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private static extern int createNamedMatrixOfString([In] String _pstName,
                                                             [In] int _iRows, [In] int _iCols,
                                                             [In] String[] _pstStrings);
@@ -559,7 +559,7 @@ namespace DotNetScilab
         /// <summary>
         /// import createNamedMatrixOfDouble from C (see api_double.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private static extern int createNamedMatrixOfDouble([In] String _pstName,
                                                             [In] int _iRows, [In] int _iCols,
                                                             [In] double[] _pdblReal);
@@ -567,7 +567,7 @@ namespace DotNetScilab
         /// <summary>
         /// import createNamedMatrixOfBoolean from C (see api_boolean.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private static extern int createNamedMatrixOfBoolean([In] String _pstName,
                                                             [In] int _iRows, [In] int _iCols,
                                                             [In] int[] _piBool);
@@ -575,7 +575,7 @@ namespace DotNetScilab
         /// <summary>
         /// import createNamedMatrixOfInteger32 from C (see api_int.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int createNamedMatrixOfInteger32([In] String _pstName,
                                                            [In] int _iRows, [In] int _iCols,
                                                            [In] int[] _piData);
@@ -583,7 +583,7 @@ namespace DotNetScilab
         /// <summary>
         /// import createNamedComplexMatrixOfDouble from C (see api_double.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int createNamedComplexMatrixOfDouble([In] String _pstName,
                                                             [In] int _iRows, [In] int _iCols,
                                                             [In] double[] _pdblReal,
@@ -592,7 +592,7 @@ namespace DotNetScilab
         /// <summary>
         /// import readNamedMatrixOfString from C (see api_string.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int readNamedMatrixOfString([In] String _pstName,
                                                           [Out]  Int32* _piRows, [Out]  Int32* _piCols,
                                                           [In, Out] int[] _piLength,
@@ -601,7 +601,7 @@ namespace DotNetScilab
         /// <summary>
         /// import readNamedMatrixOfDouble from C (see api_double.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int readNamedMatrixOfDouble([In] String _pstName,
                                                           [Out] Int32* _piRows, [Out] Int32* _piCols,
                                                           [In, Out] Double[] _pdblReal);
@@ -609,7 +609,7 @@ namespace DotNetScilab
         /// <summary>
         /// import readNamedMatrixOfBoolean from C (see api_boolean.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int readNamedMatrixOfBoolean([In] String _pstName,
                                                           [Out] Int32* _piRows, [Out] Int32* _piCols,
                                                           [In, Out] int[] _piBool);
@@ -617,7 +617,7 @@ namespace DotNetScilab
         /// <summary>
         /// import readNamedMatrixOfInteger32 from C (see api_int.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int readNamedMatrixOfInteger32([In] String _pstName,
                                                           [Out] Int32* _piRows, [Out] Int32* _piCols,
                                                           [In, Out] int[] _piData);
@@ -626,7 +626,7 @@ namespace DotNetScilab
         /// <summary>
         /// import readNamedComplexMatrixOfDouble from C (see api_double.h)
         /// </summary>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int readNamedComplexMatrixOfDouble([In] String _pstName,
                                                         [Out] Int32* _piRows, [Out] Int32* _piCols,
                                                         [In, Out] double[] _pdblReal,
@@ -639,7 +639,7 @@ namespace DotNetScilab
         /// <param name="_pstName">variable name</param>
         /// <param name="_piAddress"> stack address</param>
         /// <returns>1 if ok</returns>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int getVarAddressFromName([In] String _pstName,
                                                                [Out] Int32** _piAddress);
         //=============================================================================
@@ -649,7 +649,7 @@ namespace DotNetScilab
         /// </summary>
         /// <param name="_piAddress"> stack address</param>
         /// <returns>scilab type, 0 fails</returns>
-        [DllImport(LIBSCILAB_DLL, CharSet = CharSet.Ansi)]
+        [DllImport(API_SCILAB_DLL, CharSet = CharSet.Ansi)]
         private unsafe static extern int getVarType([In] Int32* _piAddress);
         //=============================================================================
         /// <summary>
diff --git a/scilab/modules/call_scilab/src/c/DllmainCall_scilab.c b/scilab/modules/call_scilab/src/c/DllmainCall_scilab.c
new file mode 100644 (file)
index 0000000..45eacb9
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+* Copyright (C) 2009 - DIGITEO - Allan CORNET
+* 
+* This file must be used under the terms of the CeCILL.
+* This source file is licensed as described in the file COPYING, which
+* you should have received as part of this distribution.  The terms
+* are also available at    
+* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+*
+*/
+/*--------------------------------------------------------------------------*/ 
+#include <stdio.h> 
+#include <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../bin/libintl.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+       /* force redirect stdout, stderr in console */
+       freopen("CONOUT$", "wb", stdout); /* redirect stdout --> CONOUT$*/
+       freopen("CONOUT$", "wb", stderr); /* redirect stderr --> CONOUT$*/
+
+       switch (reason) 
+       {
+       case DLL_PROCESS_ATTACH:
+               break;
+       case DLL_PROCESS_DETACH:
+               break;
+       case DLL_THREAD_ATTACH:
+               break;
+       case DLL_THREAD_DETACH:
+               break;
+       }
+       return 1;
+}
+/*--------------------------------------------------------------------------*/ 
+
index 5d5e3f8..07feb61 100644 (file)
@@ -82,15 +82,6 @@ src/c/mode_exec.c \
 src/c/predef.c \
 src/c/transposeMatrix.c \
 src/c/recursionFunction.c \
-src/c/api_common.c \
-src/c/api_double.c \
-src/c/api_int.c \
-src/c/api_poly.c \
-src/c/api_sparse.c \
-src/c/api_boolean_sparse.c \
-src/c/api_boolean.c \
-src/c/api_string.c \
-src/c/api_list.c \
 src/c/typename.c \
 src/c/inittypenames.c \
 src/c/funcprot.c
@@ -291,21 +282,22 @@ sci_gateway/fortran/sci_isglobal.f
 libscicore_la_CFLAGS = -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
        -I$(top_srcdir)/libs/MALLOC/includes/ \
-        -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
+       -I$(top_srcdir)/libs/dynamiclibrary/includes/ \
        -I$(top_srcdir)/libs/doublylinkedlist/includes \
-        -I$(top_srcdir)/modules/intersci/includes \
-        -I$(top_srcdir)/modules/call_scilab/includes \
-        -I$(top_srcdir)/modules/action_binding/includes \
+       -I$(top_srcdir)/modules/intersci/includes \
+       -I$(top_srcdir)/modules/call_scilab/includes \
+       -I$(top_srcdir)/modules/api_scilab/includes \
+       -I$(top_srcdir)/modules/action_binding/includes \
        -I$(top_srcdir)/modules/output_stream/includes \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/tclsci/includes \
-        -I$(top_srcdir)/modules/dynamic_link/includes \
-        -I$(top_srcdir)/modules/pvm/includes \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       -I$(top_srcdir)/modules/pvm/includes \
        -I$(top_srcdir)/modules/elementary_functions/includes \
-        -I$(top_srcdir)/modules/string/includes \
-        -I$(top_srcdir)/modules/fileio/includes \
-        -I$(top_srcdir)/modules/shell/includes \
-                       $(XML_FLAGS)
+       -I$(top_srcdir)/modules/string/includes \
+       -I$(top_srcdir)/modules/fileio/includes \
+       -I$(top_srcdir)/modules/shell/includes \
+       $(XML_FLAGS)
 
 
 
@@ -425,16 +417,6 @@ includes/LaunchScilabSignal.h \
 includes/getos.h \
 includes/mode_exec.h \
 includes/transposeMatrix.h \
-includes/api_boolean.h \
-includes/api_double.h \
-includes/api_sparse.h \
-includes/api_boolean_sparse.h \
-includes/api_int.h \
-includes/api_string.h \
-includes/api_common.h \
-includes/api_poly.h \
-includes/api_variable.h \
-includes/api_list.h \
 includes/recursionFunction.h
 
 include $(top_srcdir)/Makefile.incl.am
index f87afdf..e61781e 100644 (file)
@@ -45,7 +45,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../api_scilab/includes;../../../string/includes;../../../functions/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../shell/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c;../../../graphics/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="2"
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
                        >
                        <File
-                               RelativePath=".\api_boolean.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_boolean_sparse.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_common.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_double.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_int.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_list.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_poly.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_sparse.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_string.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\banier.c"
                                >
                        </File>
                        Filter="h;hpp;hxx;hm;inl"
                        >
                        <File
-                               RelativePath="..\..\includes\api_boolean.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_boolean_sparse.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_common.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_double.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_int.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_internal_boolean.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_internal_common.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_internal_double.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_internal_int.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_internal_poly.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\api_internal_string.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_list.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_poly.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_sparse.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_string.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\includes\api_variable.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\banier.h"
                                >
                        </File>
index 61a731f..cd7a65a 100644 (file)
@@ -77,7 +77,7 @@ function libn = ilib_compile(lib_name,makename,files, ..
    
   else
     //** ---------- Linux section ---------------------  
-       defaultModulesCHeader=[ "core", "mexlib", "output_stream" ];
+       defaultModulesCHeader=[ "core", "mexlib","api_scilab","output_stream","localization" ];
        defaultModulesFHeader=[ "core" ];
        
     // Source tree version
index 324849f..44a1b51 100644 (file)
@@ -39,16 +39,14 @@ CC_OPTIONS = $(CC_COMMON) -W3 -Gd $(CC__OPTIMISATION_MODE) /Fo"$(DIR_OBJ)/" /Fd"
 # include options 
 INCLUDES=-I"$(SCIDIR)/libs/MALLOC/includes" \
 -I"$(SCIDIR)/modules/core/includes" \
+-I"$(SCIDIR)/modules/api_scilab/includes" \
 -I"$(SCIDIR)/modules/call_scilab/includes" \
 -I"$(SCIDIR)/modules/output_stream/includes" \
 -I"$(SCIDIR)/modules/jvm/includes" \
 -I"$(SCIDIR)/modules/localization/includes" \
--I"$(SCIDIR)/libs/intl" \
--I"$(SCIDIR)/libs/f2c" \
 -I"$(SCIDIR)/modules/mexlib/includes" \
--I"$(SCIDIR)/modules/localization/includes" \
--I"$(SCIDIR)/modules/jvm/includes" \
 -I"$(SCIDIR)/modules/time/includes" \
+-I"$(SCIDIR)/libs/f2c" \
 -I"$(SCIDIR)/libs/intl"
 
 
@@ -67,9 +65,9 @@ USE_F2C=NO
 # if USE_F2C is set to NO we will use the following Fortran compiler (i.e Intel Fortran 10.x)
 !IF "$(USE_F2C)" == "NO"
 FC=ifort 
-FC_OPTIONS_COMMON=/nologo /G6 /DFORDLL /assume:underscore \
+FC_OPTIONS_COMMON=/nologo /DFORDLL /assume:underscore \
 /noaltparam /f77rtl /fpscomp:nolibs /names:lowercase \
-/iface:cref /libs:dll /threads /dbglibs /c /Qvc9 \
+/iface:cref /libs:dll /threads /c /Qvc9 \
 /Fo"$(DIR_OBJ)/" /Fd"$(DIR_OBJ)/" \
 /include:"$(SCIDIR1)/modules/core/includes"
 #==================================================
@@ -100,7 +98,8 @@ SCILAB_LIBS="$(SCIDIR1)/bin/MALLOC.lib" "$(SCIDIR1)/bin/blasplus.lib" \
 "$(SCIDIR1)/bin/integer.lib" "$(SCIDIR1)/bin/optimization_f.lib" \
 "$(SCIDIR1)/bin/libjvm.lib" "$(SCIDIR1)/bin/scilocalization.lib" \
 "$(SCIDIR1)/bin/libintl.lib" "$(SCIDIR1)/bin/linpack_f.lib" \
-"$(SCIDIR1)/bin/call_scilab.lib" "$(SCIDIR1)/bin/time.lib"
+"$(SCIDIR1)/bin/call_scilab.lib" "$(SCIDIR1)/bin/time.lib" \
+"$(SCIDIR1)/bin/api_scilab.lib"
 #==================================================
 # default rules for Fortran 77 & 90 Compilation 
 #==================================================
index df15e97..eb6e8b8 100644 (file)
@@ -2,111 +2,29 @@ LIBRARY    LibScilab.dll
 
 
 EXPORTS
+vstk_
 iop_
-getScilabMode
-stack_
-getrhsvar_
-getwsmat_
 com_
-vstk_
-mkmlistfromvars_
-createvarfromptr_
-createvarfromptr_
-putlhsvar_
+stack_
 intersci_
-createvar_
+returnanan_
 callFunctionFromGateway
-islittleendian
 getWarningMode
+islittleendian
+createvarfromptr_
+putlhsvar_
+createvar_
+getrhsvar_
 gettype_
 checklhs_
 checkrhs_
-freeArrayOfString
-GetData
+vartype_
 getmatdims_
 overload_
-vartype_
 xscion_
-returnanan_
+getwsmat_
+mkmlistfromvars_
+freeArrayOfString
 transposeMatrixDouble
-iAllocMatrixOfBoolean
-iArraySum
-GetRhsStringVar
-iGetAddressFromItemPos
-iGetListItemType
-getMatrixOfDouble
-getComplexMatrixOfDouble
-isVarComplex
-getVarType
-getMatrixOfString
-getVarDimension
-allocMatrixOfBoolean
-getListItemAddress
-getListItemNumber
-getScilabTypeFromDataSet
-getDataSetId
-createMatrixOfDouble
-readDoubleMatrix
-getDataSetDims
-createMatrixOfString
-readStringMatrix
-createMatrixOfDoubleInList
-createMatrixOfStringInList
-createListInList
-createList
-createMListInList
-createTListInList
-createMList
-createTList
-createMatrixOfInteger32
-createMatrixOfBoolean
-getMatrixOfBoolean
-createMatrixOfBooleanInList
-getMatrixOfPoly
-getPolyVariableName
-createMatrixOfPoly
-createMatrixOfPolyInList
-createNamedList
-createMatrixOfDoubleInNamedList
-createNamedMatrixOfDouble
-getVarNameFromPostion
-getVarAddressFromName
-createMListInNamedList
-createTListInNamedList
-createListInNamedList
-createNamedMList
-createNamedTList
-createNamedMatrixOfString
-createMatrixOfStringInNamedList
-createMatrixOfBooleanInNamedList
-createNamedMatrixOfBoolean
-getVarAddressFromPosition
-createNamedMatrixOfPoly
-createMatrixOfPolyInNamedList
-createComplexMatrixOfDoubleInNamedList
-createNamedComplexMatrixOfDouble
-getComplexMatrixOfPoly
-createComplexMatrixOfPolyInNamedList
-createNamedComplexMatrixOfPoly
-getMatrixOfIntegerPrecision
-getMatrixOfInteger8
-getMatrixOfInteger16
-getMatrixOfInteger32
-createNamedMatrixOfInteger8
-createNamedMatrixOfInteger16
-createNamedMatrixOfInteger32
-createMatrixOfInteger8InNamedList
-createMatrixOfInteger16InNamedList
-createMatrixOfInteger32InNamedList
-readMatrixOfPolyInNamedList
-writeSparseMatrix
-getSparseMatrix
-writeSparseComplexMatrix
-getComplexSparseMatrix
-getBooleanSparseMatrix
-createSparseMatrixInNamedList
-createComplexSparseMatrixInNamedList
-createNamedSparseMatrix
-createNamedComplexSparseMatrix 
-createBooleanSparseMatrixInNamedList
-createNamedBooleanSparseMatrix
+getScilabMode
+GetData
index cf6fc8b..72092a4 100644 (file)
@@ -115,6 +115,7 @@ libscifileio_la_CFLAGS=             -I$(srcdir)/includes/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes \
                                -I$(top_srcdir)/modules/io/includes \
+                               -I$(top_srcdir)/modules/api_scilab/includes \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/localization/includes \
                                $(HDF5_CFLAGS)
@@ -132,6 +133,7 @@ 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)/modules/string/libsciapi_scilab.la \
                                $(top_builddir)/libs/MALLOC/libscimalloc.la \
                                $(top_builddir)/modules/output_stream/libscioutput_stream.la \
                                $(top_builddir)/libs/libst/libscilibst.la
index dc39eda..be87354 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/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;_HDF5USEDLL_;WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/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;_HDF5USEDLL_;WIN32"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/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;_HDF5USEDLL_;WIN32"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../../libs/hdf5/include;../windows_tools/includes;../api_scilab/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;_HDF5USEDLL_;WIN32"
                                StringPooling="true"
                                RuntimeLibrary="2"
index f5522b1..5314cbf 100644 (file)
@@ -24,6 +24,7 @@ libscifunctions_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/api_scilab/includes \
                                -I$(top_srcdir)/modules/io/includes \
                                -I$(top_srcdir)/modules/string/includes \
                                -I$(top_srcdir)/modules/localization/includes
@@ -38,7 +39,12 @@ libscifunctions_la_SOURCES = $(FUNCTIONS__C_SOURCES) $(FUNCTIONS__FORTRAN_SOURCE
 CHECK_SRC= $(FUNCTIONS_SOURCES) $(GATEWAY_SOURCES)
 INCLUDE_FLAGS = $(libscifunctions_la_CFLAGS)
 
-libscifunctions_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
+libscifunctions_la_LIBADD =  $(top_builddir)/modules/core/libscicore.la \
+$(top_builddir)/modules/string/libscistring.la \
+$(top_builddir)/modules/output_stream/libscioutput_stream.la \
+$(top_builddir)/modules/api_scilab/libsciapi_scilab.la \
+$(top_builddir)/libs/MALLOC/libscimalloc.la \
+
 #### Target ######
 modulename=functions
 
index b43751d..9372ddb 100644 (file)
@@ -5,15 +5,10 @@ EXPORTS
 ;core
 com_
 callFunctionFromGateway
-getRecursionGatewayToCall
-isRecursionCallToFunction
 getRecursionFunctionToCall
-getMatrixOfString
-getVarType
-getVarAddressFromPosition
+isRecursionCallToFunction
 checklhs_
 checkrhs_
-createMatrixOfString
 intersci_
 putlhsvar_
 ;
index f4eae27..e8af441 100644 (file)
@@ -44,7 +44,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"