move lib in functions module
Allan CORNET [Mon, 11 May 2009 12:50:04 +0000 (14:50 +0200)]
34 files changed:
scilab/CHANGES_5.2.X
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/functions/.gitignore [new file with mode: 0644]
scilab/modules/functions/Makefile.am
scilab/modules/functions/functions.iss
scilab/modules/functions/help/en_US/lib.xml [moved from scilab/modules/io/help/en_US/lib.xml with 100% similarity]
scilab/modules/functions/includes/gw_functions.h [new file with mode: 0644]
scilab/modules/functions/sci_gateway/c/gw_functions.c [new file with mode: 0644]
scilab/modules/functions/sci_gateway/c/sci_lib.c [moved from scilab/modules/io/sci_gateway/c/sci_lib.c with 83% similarity]
scilab/modules/functions/sci_gateway/fortran/intlib.f [moved from scilab/modules/io/sci_gateway/fortran/intlib.f with 100% similarity]
scilab/modules/functions/sci_gateway/functions_gateway.xml [new file with mode: 0644]
scilab/modules/functions/src/c/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/functions/src/c/functions.vcproj [new file with mode: 0644]
scilab/modules/functions/src/c/functions_f_Import.def [new file with mode: 0644]
scilab/modules/functions/src/c/functions_header.def [new file with mode: 0644]
scilab/modules/functions/src/fortran/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/functions/src/fortran/fileio_Import.def [new file with mode: 0644]
scilab/modules/functions/src/fortran/functions_f.vfproj [new file with mode: 0644]
scilab/modules/functions/src/fortran/functions_f2c.vcproj [new file with mode: 0644]
scilab/modules/functions/src/fortran/functions_f_header.def [new file with mode: 0644]
scilab/modules/functions/src/fortran/output_stream_Import.def [new file with mode: 0644]
scilab/modules/functions/src/fortran/string_Import.def [new file with mode: 0644]
scilab/modules/functions/tests/unit_tests/lib.dia.ref [new file with mode: 0644]
scilab/modules/functions/tests/unit_tests/lib.tst [new file with mode: 0644]
scilab/modules/io/Makefile.am
scilab/modules/io/includes/gw_io.h
scilab/modules/io/sci_gateway/c/gw_io.c
scilab/modules/io/sci_gateway/io_gateway.xml
scilab/modules/io/src/c/io.vcproj
scilab/modules/io/src/fortran/io_f.vfproj
scilab/modules/io/src/fortran/io_f2c.vcproj

index a6aeb51..7865ff2 100644 (file)
@@ -28,6 +28,8 @@ Source reorganisation:
 
 * disp moved in output_stream module.
 
+* lib moved in functions module.
+
 Input/Output functions:
 =======================
 
index 3f161f7..5413f1e 100644 (file)
@@ -69,6 +69,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab", "libs\LibScilab
                {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
                {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
                {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
+               {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
                {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F}
                {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
@@ -996,6 +997,18 @@ Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "output_stream_f", "modules\
                {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390} = {3A72C3ED-98F7-49C7-B59C-2C6C47FF9390}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functions\src\c\functions.vcproj", "{53A01263-92BE-4C87-AA9A-79297F882310}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
+Project("{6989167D-11E4-40FE-8C1A-2192A86A7E90}") = "functions_f", "modules\functions\src\fortran\functions_f.vfproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2044,6 +2057,22 @@ Global
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}.Release|Win32.Build.0 = Release|Win32
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}.Release|x64.ActiveCfg = Release|x64
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}.Release|x64.Build.0 = Release|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|Win32.ActiveCfg = Debug|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|Win32.Build.0 = Debug|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|x64.ActiveCfg = Debug|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|x64.Build.0 = Debug|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|Win32.ActiveCfg = Release|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|Win32.Build.0 = Release|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|x64.ActiveCfg = Release|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|x64.Build.0 = Release|x64
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|Win32.Build.0 = Debug|Win32
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|x64.ActiveCfg = Debug|x64
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|x64.Build.0 = Debug|x64
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.ActiveCfg = Release|Win32
+               {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
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index e2cb2b8..73124ba 100644 (file)
@@ -63,6 +63,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibScilab_f2c", "libs\LibSc
                {DFA0D75B-F7EF-4D02-B33F-486829405315} = {DFA0D75B-F7EF-4D02-B33F-486829405315}
                {F0190B5D-FB21-47A2-99AC-06627CDD0F8A} = {F0190B5D-FB21-47A2-99AC-06627CDD0F8A}
                {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB} = {34F8E361-D2D9-43B0-93D2-F6CF5FAF6CEB}
+               {53A01263-92BE-4C87-AA9A-79297F882310} = {53A01263-92BE-4C87-AA9A-79297F882310}
                {5B110267-7C18-437C-B87D-DBA2B50729E9} = {5B110267-7C18-437C-B87D-DBA2B50729E9}
                {63352867-3983-48E3-94FE-DD8F0D6E921F} = {63352867-3983-48E3-94FE-DD8F0D6E921F}
                {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60} = {BB8D4E6F-F09E-49FC-8BCB-9F496F639F60}
@@ -993,6 +994,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "output_stream_f2c", "module
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions", "modules\functions\src\c\functions.vcproj", "{53A01263-92BE-4C87-AA9A-79297F882310}"
+       ProjectSection(ProjectDependencies) = postProject
+               {E6552427-01DD-4C12-823C-09AD46F77FAD} = {E6552427-01DD-4C12-823C-09AD46F77FAD}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "functions_f2c", "modules\functions\src\fortran\functions_f2c.vcproj", "{E6552427-01DD-4C12-823C-09AD46F77FAD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {F0F55692-0355-4BC3-BE9D-552C8AAC5238} = {F0F55692-0355-4BC3-BE9D-552C8AAC5238}
+               {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2041,6 +2054,22 @@ Global
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}.Release|Win32.Build.0 = Release|Win32
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}.Release|x64.ActiveCfg = Release|x64
                {E60B43CC-73EA-457E-8DEE-31D0B2BDFA4B}.Release|x64.Build.0 = Release|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|Win32.ActiveCfg = Debug|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|Win32.Build.0 = Debug|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|x64.ActiveCfg = Debug|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Debug|x64.Build.0 = Debug|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|Win32.ActiveCfg = Release|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|Win32.Build.0 = Release|Win32
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|x64.ActiveCfg = Release|x64
+               {53A01263-92BE-4C87-AA9A-79297F882310}.Release|x64.Build.0 = Release|x64
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|Win32.Build.0 = Debug|Win32
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|x64.ActiveCfg = Debug|x64
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Debug|x64.Build.0 = Debug|x64
+               {E6552427-01DD-4C12-823C-09AD46F77FAD}.Release|Win32.ActiveCfg = Release|Win32
+               {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
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index 322de61..6721d0a 100644 (file)
@@ -34,7 +34,7 @@
 /* 11 */                                               #include "dynamic_gateways.h" /* optimization */
 /* 12 */                                               #include "../../differential_equations/includes/gw_differential_equations1.h"
 /* 13 */                                               #include "gw_core.h"
-/* 14  gw_user(); FREE */
+/* 14 */                                               #include "../../functions/includes/gw_functions.h"
 /* 15 */                                               #include "dynamic_gateways.h" /* metanet */
 /* 16 */                                               #include "../../polynomials/includes/gw_polynomials.h"
 /* 17 */                                               #include "../../data_structures/includes/gw_data_structures1.h"
index 20d5dd2..6a7e897 100644 (file)
@@ -44,7 +44,7 @@ static OpTab Interfaces[] = {
        /* 11  */ {gw_dynamic_optimization},
        /* 12  */ {gw_differential_equations1},
        /* 13  */ {gw_core},
-       /* 14  */ {gw_user},
+       /* 14  */ {gw_functions},
        /* 15  */ {gw_dynamic_metanet},
        /* 16  */ {gw_polynomials},
        /* 17  */ {gw_data_structures1},
diff --git a/scilab/modules/functions/.gitignore b/scilab/modules/functions/.gitignore
new file mode 100644 (file)
index 0000000..dc10a0b
--- /dev/null
@@ -0,0 +1,5 @@
+#
+#generated .def files (windows)
+#
+functions.def
+functions_f.def
index 3ccd88f..8a78b99 100644 (file)
@@ -1,9 +1,36 @@
 ##########
-### Sylvestre Ledru <sylvestre.ledru@inria.fr>
-### INRIA - Scilab 2006 
+### Allan CORNET
+### DIGITEO - Scilab 2009
 ##########
 
+FUNCTIONS__C_SOURCES = 
 
+FUNCTIONS__FORTRAN_SOURCES = 
+
+GATEWAY_C_SOURCES = sci_gateway/c/gw_functions.c \
+sci_gateway/c/sci_lib.c
+
+GATEWAY_FORTRAN_SOURCES =  sci_gateway/fortran/intlib.f
+
+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/io/includes \
+                               -I$(top_srcdir)/modules/string/includes \
+                               -I$(top_srcdir)/modules/localization/includes
+
+pkglib_LTLIBRARIES = libscifunctions.la
+
+libscifunctions_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
+
+libscifunctions_la_SOURCES = $(FUNCTIONS__C_SOURCES) $(FUNCTIONS__FORTRAN_SOURCES) $(GATEWAY_C_SOURCES) $(GATEWAY_FORTRAN_SOURCES)
+
+# For the code check (splint)
+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
 #### Target ######
 modulename=functions
 
@@ -13,9 +40,16 @@ libscifunctions_la_rootdir = $(mydatadir)
 libscifunctions_la_root_DATA = changelog.txt license.txt readme.txt version.xml
 
 
-
-####¬†functions : init scripts #### 
+#### functions : init scripts ####
 libscifunctions_la_etcdir = $(mydatadir)/etc
 libscifunctions_la_etc_DATA = etc/functions.quit etc/functions.start
 
+#### functions : gateway declaration ####
+libscifunctions_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscifunctions_la_sci_gateway_DATA = sci_gateway/functions_gateway.xml
+
+#### functions : include files ####
+libscifunctions_la_includedir=$(pkgincludedir)/functions
+libscifunctions_la_include_HEADERS = includes/gw_functions.h 
+
 include $(top_srcdir)/Makefile.incl.am
index 2a2019a..ff5c352 100644 (file)
 ;
 #define FUNCTIONS "functions"
 ;
+Source: bin\functions.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+Source: bin\functions_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#FUNCTIONS}\VERSION.xml; DestDir: {app}\modules\{#FUNCTIONS}; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\readme.txt; DestDir: {app}\modules\{#FUNCTIONS}; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\license.txt; DestDir: {app}\modules\{#FUNCTIONS}; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\changelog.txt; DestDir: {app}\modules\{#FUNCTIONS}; Components: {#COMPN_SCILAB}
 ;
+Source: modules\{#FUNCTIONS}\sci_gateway\functions_gateway.xml; DestDir: {app}\modules\{#FUNCTIONS}\sci_gateway; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#FUNCTIONS}\etc\{#FUNCTIONS}.quit; DestDir: {app}\modules\{#FUNCTIONS}\etc; Components: {#COMPN_SCILAB}
 Source: modules\{#FUNCTIONS}\etc\{#FUNCTIONS}.start; DestDir: {app}\modules\{#FUNCTIONS}\etc; Components: {#COMPN_SCILAB}
 ;
+Source: modules\{#FUNCTIONS}\includes\*.h; DestDir: {app}\modules\{#FUNCTIONS}\includes; Components: {#COMPN_SCILAB}
+;
 Source: modules\{#FUNCTIONS}\help\addchapter.sce; DestDir: {app}\modules\{#FUNCTIONS}\help; Flags: recursesubdirs; Components:  {#COMPN_SCILAB}
 ;
 Source: modules\{#FUNCTIONS}\macros\lib; DestDir: {app}\modules\{#FUNCTIONS}\macros; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/functions/includes/gw_functions.h b/scilab/modules/functions/includes/gw_functions.h
new file mode 100644 (file)
index 0000000..bdd8126
--- /dev/null
@@ -0,0 +1,26 @@
+
+/*
+ * 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
+ *
+ */
+/*--------------------------------------------------------------------------*/
+#ifndef __GW_FUNCTIONS_H__
+#define __GW_FUNCTIONS_H__
+/*--------------------------------------------------------------------------*/
+#include "machine.h"
+/*--------------------------------------------------------------------------*/
+int gw_functions(void);
+/*--------------------------------------------------------------------------*/
+int C2F(sci_lib)(char *fname,unsigned long fname_len);
+/*--------------------------------------------------------------------------*/
+#endif /* __GW_FUNCTIONS_H__ */
+/*--------------------------------------------------------------------------*/
+
diff --git a/scilab/modules/functions/sci_gateway/c/gw_functions.c b/scilab/modules/functions/sci_gateway/c/gw_functions.c
new file mode 100644 (file)
index 0000000..4ebbd32
--- /dev/null
@@ -0,0 +1,30 @@
+
+/*
+ * 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 "gw_functions.h"
+#include "stack-c.h"
+#include "callFunctionFromGateway.h"
+/*--------------------------------------------------------------------------*/
+static gw_generic_table Tab[]=
+{
+       {C2F(sci_lib),"lib"}
+};
+/*--------------------------------------------------------------------------*/
+int gw_functions(void)
+{  
+       Rhs = Max(0, Rhs);
+       callFunctionFromGateway(Tab);
+       return 0;
+}
+/*--------------------------------------------------------------------------*/
similarity index 83%
rename from scilab/modules/io/sci_gateway/c/sci_lib.c
rename to scilab/modules/functions/sci_gateway/c/sci_lib.c
index 4901d1f..906907a 100644 (file)
@@ -10,7 +10,9 @@
  *
  */
 
-#include "gw_io.h"
+#include "gw_functions.h"
+/*--------------------------------------------------------------------------*/
+extern int C2F(intlib)();
 /*--------------------------------------------------------------------------*/
 int C2F(sci_lib)(char *fname,unsigned long fname_len)
 {
diff --git a/scilab/modules/functions/sci_gateway/functions_gateway.xml b/scilab/modules/functions/sci_gateway/functions_gateway.xml
new file mode 100644 (file)
index 0000000..4c9845c
--- /dev/null
@@ -0,0 +1,34 @@
+<?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
+ *
+ -->
+
+<!--
+ Scilab
+ Interface description. In this file, we define the list of the function which
+ will be available into Scilab and the link to the "native" function.
+
+ gatewayId is the position in the hashtable 'Interfaces' defined in the
+ file SCI/modules/core/src/c/callinterf.h
+
+ primitiveId is the position in the hashtable '<module>Table Tab[]' defined
+ in the file modules/<module>/sci_gateway/c/gw_<module>.c
+
+ primitiveName is the name of the Scilab function
+
+ Don't touch if you do not know what you are doing
+-->
+
+<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
+<GATEWAY name="metanet">
+<PRIMITIVE gatewayId="14" primitiveId="1" primitiveName="lib" />
+</GATEWAY>
diff --git a/scilab/modules/functions/src/c/LibScilab_Import.def b/scilab/modules/functions/src/c/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..3b1e633
--- /dev/null
@@ -0,0 +1,8 @@
+       LIBRARY    Libscilab.dll
+
+
+EXPORTS
+;core
+com_
+callFunctionFromGateway
+;
diff --git a/scilab/modules/functions/src/c/functions.vcproj b/scilab/modules/functions/src/c/functions.vcproj
new file mode 100644 (file)
index 0000000..7a3e6e2
--- /dev/null
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="functions"
+       ProjectGUID="{53A01263-92BE-4C87-AA9A-79297F882310}"
+       RootNamespace="functions"
+       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;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
+                               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)functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)functions_f.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 functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functionstmp.def &gt;nul&#x0D;&#x0A;copy ..\functions_header.def+functionstmp.def  ..\functions.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib functions_f.lib"
+                               OutputFile="../../../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="functions.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;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
+                               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)functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)functions_f.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 functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functionstmp.def &gt;nul&#x0D;&#x0A;copy ..\functions_header.def+functionstmp.def  ..\functions.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib functions_f.lib"
+                               OutputFile="../../../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="functions.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;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               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)functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)functions_f.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 functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functionstmp.def &gt;nul&#x0D;&#x0A;copy ..\functions_header.def+functionstmp.def  ..\functions.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib functions_f.lib"
+                               OutputFile="../../../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="functions.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;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_EXPORTS"
+                               StringPooling="true"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               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)functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)functions_f.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 functions.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functionstmp.def &gt;nul&#x0D;&#x0A;copy ..\functions_header.def+functionstmp.def  ..\functions.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib functions_f.lib"
+                               OutputFile="../../../../bin/$(ProjectName).dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="functions.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;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath="..\..\sci_gateway\c\gw_functions.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\sci_lib.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl"
+                       >
+                       <File
+                               RelativePath="..\..\includes\gw_functions.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="localization"
+                       >
+                       <File
+                               RelativePath="..\..\locales\en_US\messages.pot"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+                       <File
+                               RelativePath=".\functions_header.def"
+                               >
+                       </File>
+                       <Filter
+                               Name="Imports"
+                               >
+                               <File
+                                       RelativePath=".\functions_f_Import.def"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\LibScilab_Import.def"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <File
+                       RelativePath="..\..\functions.iss"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\sci_gateway\functions_gateway.xml"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\Makefile.am"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\version.xml"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/functions/src/c/functions_f_Import.def b/scilab/modules/functions/src/c/functions_f_Import.def
new file mode 100644 (file)
index 0000000..9accab8
--- /dev/null
@@ -0,0 +1,8 @@
+LIBRARY    functions_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; functions_f
+; --------------------------------------- 
+intlib_
\ No newline at end of file
diff --git a/scilab/modules/functions/src/c/functions_header.def b/scilab/modules/functions/src/c/functions_header.def
new file mode 100644 (file)
index 0000000..7b1805e
--- /dev/null
@@ -0,0 +1,7 @@
+LIBRARY    functions.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; functions
+; --------------------------------------- 
diff --git a/scilab/modules/functions/src/fortran/LibScilab_Import.def b/scilab/modules/functions/src/fortran/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..646610b
--- /dev/null
@@ -0,0 +1,18 @@
+       LIBRARY    Libscilab.dll
+
+
+EXPORTS
+; core
+com_
+iop_
+cha1_
+stack_
+namstr_
+putid_
+cvname_
+clunit_
+vstk_
+
+; elementary_functions
+isort_
+iset_
\ No newline at end of file
diff --git a/scilab/modules/functions/src/fortran/fileio_Import.def b/scilab/modules/functions/src/fortran/fileio_Import.def
new file mode 100644 (file)
index 0000000..76a3cb7
--- /dev/null
@@ -0,0 +1,6 @@
+       LIBRARY    fileio.dll
+
+
+EXPORTS
+; fileio
+getshortpathname_ 
\ No newline at end of file
diff --git a/scilab/modules/functions/src/fortran/functions_f.vfproj b/scilab/modules/functions/src/fortran/functions_f.vfproj
new file mode 100644 (file)
index 0000000..895dc39
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject ProjectType="typeDynamicLibrary" ProjectCreator="Intel Fortran" Keyword="Dll" Version="9.10" ProjectIdGuid="{E6552427-01DD-4C12-823C-09AD46F77FAD}">
+       <Platforms>
+               <Platform Name="Win32"/>
+               <Platform Name="x64"/></Platforms>
+       <Configurations>
+               <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFResourceCompilerTool"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFCustomBuildTool"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul
+copy *.def functions_f.def &gt;nul
+copy functions_f.def ..\functions_f.vcdef &gt;nul
+del *.def &gt;nul
+cd ..
+copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Description="Build functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/></Configuration>
+               <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFResourceCompilerTool"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFCustomBuildTool"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul
+copy *.def functions_f.def &gt;nul
+copy functions_f.def ..\functions_f.vcdef &gt;nul
+del *.def &gt;nul
+cd ..
+copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Description="Build functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/></Configuration>
+               <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFResourceCompilerTool"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFCustomBuildTool"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul
+copy *.def functions_f.def &gt;nul
+copy functions_f.def ..\functions_f.vcdef &gt;nul
+del *.def &gt;nul
+cd ..
+copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Description="Build functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/></Configuration>
+               <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
+                               <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\functions_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="functions_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\functions_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"/>
+                               <Tool Name="VFResourceCompilerTool"/>
+                               <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
+                               <Tool Name="VFCustomBuildTool"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
+for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul
+copy *.def functions_f.def &gt;nul
+copy functions_f.def ..\functions_f.vcdef &gt;nul
+del *.def &gt;nul
+cd ..
+copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul" Description="Build functions.def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL
+lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPostBuildEventTool"/></Configuration></Configurations>
+       <Files>
+               <Filter Name="Header Files" Filter="fi;fd"/>
+               <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/>
+               <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
+               <File RelativePath="..\..\sci_gateway\fortran\intlib.f"/></Filter>
+               <File RelativePath="..\..\..\..\bin\blasplus.lib"/>
+               <File RelativePath="..\..\sci_gateway\functions_gateway.xml"/>
+               <File RelativePath="..\..\Makefile.am"/></Files>
+       <Globals/></VisualStudioProject>
diff --git a/scilab/modules/functions/src/fortran/functions_f2c.vcproj b/scilab/modules/functions/src/fortran/functions_f2c.vcproj
new file mode 100644 (file)
index 0000000..692e84d
--- /dev/null
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="functions_f2c"
+       ProjectGUID="{E6552427-01DD-4C12-823C-09AD46F77FAD}"
+       RootNamespace="functions_f2c"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+               <ToolFile
+                       RelativePath="..\..\..\..\Visual-Studio-settings\f2c.rules"
+               />
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="f2c rule"
+                               ExecutionBucket="1"
+                       />
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               Description="Build 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)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                               ExecutionBucket="2"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                               ExecutionBucket="4"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               ExecutionBucket="5"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               ExecutionBucket="6"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../../../libs/f2c"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_F2C_EXPORTS;FORDLL"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                               ExecutionBucket="7"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               ExecutionBucket="8"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Build functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functions_f.def &gt;nul&#x0D;&#x0A;copy functions_f.def ..\functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul&#x0D;&#x0A;"
+                               ExecutionBucket="9"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               ExecutionBucket="10"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               OutputFile="$(SolutionDir)bin\functions_f.dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               TargetMachine="1"
+                               CLRUnmanagedCodeCheck="true"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                               ExecutionBucket="11"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               ExecutionBucket="12"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                               ExecutionBucket="13"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                               ExecutionBucket="14"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                               ExecutionBucket="15"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                               ExecutionBucket="17"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="2"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               Description="Build 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)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="f2c rule"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               AdditionalIncludeDirectories="../../../../libs/f2c"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FUNCTIONS_F2C_EXPORTS;FORDLL"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="3"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Build functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functions_f.def &gt;nul&#x0D;&#x0A;copy functions_f.def ..\functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/fixed:no"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               OutputFile="$(SolutionDir)bin\functions_f.dll"
+                               LinkIncremental="2"
+                               ModuleDefinitionFile="functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               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="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               Description="Build 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)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="f2c rule"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../../../libs/f2c"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_F2C_EXPORTS;FORDLL"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="0"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Build functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functions_f.def &gt;nul&#x0D;&#x0A;copy functions_f.def ..\functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               OutputFile="$(SolutionDir)bin\functions_f.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               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="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                               Description="Build 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)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)fileio_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)fileio.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)string_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="f2c rule"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               TargetEnvironment="3"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="../../../../libs/f2c"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FUNCTIONS_F2C_EXPORTS;FORDLL"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="1"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="3"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                               Description="Build functions_f.def"
+                               CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n functions_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def functions_f.def &gt;nul&#x0D;&#x0A;copy functions_f.def ..\functions_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy functions_f_header.def+functions_f.vcdef functions_f.def &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="Libscilab.lib string.lib output_stream.lib fileio.lib"
+                               OutputFile="$(SolutionDir)bin\functions_f.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="functions_f.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               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="..\..\sci_gateway\fortran\intlib.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+               </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}"
+                       >
+               </Filter>
+               <Filter
+                       Name="Fortran files"
+                       >
+                       <File
+                               RelativePath="..\..\sci_gateway\fortran\intlib.f"
+                               >
+                       </File>
+               </Filter>
+               <File
+                       RelativePath="..\..\..\..\bin\blasplus.lib"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\sci_gateway\functions_gateway.xml"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\..\..\bin\libf2c.lib"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\Makefile.am"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/functions/src/fortran/functions_f_header.def b/scilab/modules/functions/src/fortran/functions_f_header.def
new file mode 100644 (file)
index 0000000..0f63e9a
--- /dev/null
@@ -0,0 +1,7 @@
+LIBRARY    functions_f.dll
+
+
+EXPORTS
+; --------------------------------------- 
+; functions_f
+; --------------------------------------- 
diff --git a/scilab/modules/functions/src/fortran/output_stream_Import.def b/scilab/modules/functions/src/fortran/output_stream_Import.def
new file mode 100644 (file)
index 0000000..c20fde3
--- /dev/null
@@ -0,0 +1,6 @@
+       LIBRARY    output_stream.dll
+
+
+EXPORTS
+; output_stream
+error_
\ No newline at end of file
diff --git a/scilab/modules/functions/src/fortran/string_Import.def b/scilab/modules/functions/src/fortran/string_Import.def
new file mode 100644 (file)
index 0000000..66cc943
--- /dev/null
@@ -0,0 +1,6 @@
+       LIBRARY    string.dll
+
+
+EXPORTS
+; string
+cvstr_
\ No newline at end of file
diff --git a/scilab/modules/functions/tests/unit_tests/lib.dia.ref b/scilab/modules/functions/tests/unit_tests/lib.dia.ref
new file mode 100644 (file)
index 0000000..dc7238a
--- /dev/null
@@ -0,0 +1,31 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+cd(TMPDIR);
+mkdir('test_lib');
+cd('test_lib');
+//define some variables
+function z = myplus(x, y), z = x + y,endfunction
+function z = yourplus(x, y), x = x - y,endfunction
+A=1:10;
+//create the *.bin files in libdir
+libdir = TMPDIR + filesep() + 'test_lib';
+save(libdir + '/myplus.bin', myplus);
+save(libdir + '/yourplus.bin', yourplus);
+save(libdir + '/A.bin', A);
+//create the name file
+mputl(['myplus';'yourplus';'A'],libdir+'/names');
+//erase the variables
+clear myplus yourplus A
+//build the library containing myplus and yourplus
+test_lib = lib(libdir+'/');
+ref = 1:10;
+if (A <> ref) then bugmes();quit;end
+if isdef('myplus') <> %t then bugmes();quit;end
+if isdef('yourplus') <> %t then bugmes();quit;end
+if type(yourplus) <> 13 then bugmes();quit;end
+if type(myplus) <> 13 then bugmes();quit;end
+if type(test_lib) <> 14 then bugmes();quit;end
diff --git a/scilab/modules/functions/tests/unit_tests/lib.tst b/scilab/modules/functions/tests/unit_tests/lib.tst
new file mode 100644 (file)
index 0000000..c97f9b9
--- /dev/null
@@ -0,0 +1,41 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+cd(TMPDIR);
+mkdir('test_lib');
+cd('test_lib');
+
+//define some variables
+function z = myplus(x, y), z = x + y,endfunction
+function z = yourplus(x, y), x = x - y,endfunction
+A=1:10;
+
+//create the *.bin files in libdir
+libdir = TMPDIR + filesep() + 'test_lib';
+save(libdir + '/myplus.bin', myplus);
+save(libdir + '/yourplus.bin', yourplus);
+save(libdir + '/A.bin', A);
+
+//create the name file
+mputl(['myplus';'yourplus';'A'],libdir+'/names');
+
+//erase the variables
+clear myplus yourplus A
+
+//build the library containing myplus and yourplus
+test_lib = lib(libdir+'/');
+
+ref = 1:10;
+if (A <> ref) then pause,end
+
+if isdef('myplus') <> %t then pause,end
+if isdef('yourplus') <> %t then pause,end
+if type(yourplus) <> 13 then pause,end
+if type(myplus) <> 13 then pause,end
+if type(test_lib) <> 14 then pause,end
+
+
index 7f6de68..7364536 100644 (file)
@@ -17,7 +17,6 @@ src/fortran/writebuf.f
 GATEWAY_C_SOURCES = sci_gateway/c/sci_execstr.c \
 sci_gateway/c/sci_read4b.c \
 sci_gateway/c/sci_deff.c \
-sci_gateway/c/sci_lib.c \
 sci_gateway/c/sci_getio.c \
 sci_gateway/c/sci_readb.c \
 sci_gateway/c/sci_host.c \
@@ -54,7 +53,6 @@ sci_gateway/fortran/intwritb.f \
 sci_gateway/fortran/intwrite.f \
 sci_gateway/fortran/intread4b.f \
 sci_gateway/fortran/intdeff.f \
-sci_gateway/fortran/intlib.f \
 sci_gateway/fortran/intread.f \
 sci_gateway/fortran/intexecstr.f \
 sci_gateway/fortran/intreadb.f \
index 0c25691..96bdff8 100644 (file)
@@ -21,7 +21,7 @@ int C2F(sci_oldload)(char *fname,unsigned long fname_len);
 int C2F(sci_read)(char *fname,unsigned long fname_len);
 int C2F(sci_getf)(char *fname,unsigned long fname_len);
 int C2F(sci_exec)(char *fname,unsigned long fname_len);
-int C2F(sci_lib)(char *fname,unsigned long fname_len);
+
 int C2F(sci_diary)(char *fname,unsigned long fname_len);
 int C2F(sci_oldsave)(char *fname,unsigned long fname_len);
 int C2F(sci_write)(char *fname,unsigned long fname_len);
index 5a78d2f..474c568 100644 (file)
@@ -22,7 +22,7 @@ static gw_generic_table Tab[]=
 {C2F(sci_read),"read"},
 {C2F(sci_getf),"getf"},
 {C2F(sci_exec),"exec"},
-{C2F(sci_lib),"lib"},
+{C2F(sci_getio),"getio"},
 {C2F(sci_diary),"diary"},
 {C2F(sci_oldsave),"oldsave"},
 {C2F(sci_write),"write"},
@@ -41,7 +41,6 @@ static gw_generic_table Tab[]=
 {C2F(sci_save),"save"},
 {C2F(sci_load),"load"},
 {C2F(sci_mgetl),"mgetl"},
-{C2F(sci_getio),"getio"},
 {C2F(sci_setenv),"setenv"},
 {sci_export_to_hdf5,"export_to_hdf5"}
 };
index e1f6b7c..c33f74a 100644 (file)
@@ -39,7 +39,7 @@
 <PRIMITIVE gatewayId="5" primitiveId="2" primitiveName="read" />
 <PRIMITIVE gatewayId="5" primitiveId="3" primitiveName="getf" />
 <PRIMITIVE gatewayId="5" primitiveId="4" primitiveName="exec" />
-<PRIMITIVE gatewayId="5" primitiveId="5" primitiveName="lib" />
+<PRIMITIVE gatewayId="5" primitiveId="5" primitiveName="getio" />
 <PRIMITIVE gatewayId="5" primitiveId="6" primitiveName="diary" />
 <PRIMITIVE gatewayId="5" primitiveId="7" primitiveName="oldsave" />
 <PRIMITIVE gatewayId="5" primitiveId="8" primitiveName="write" />
@@ -58,7 +58,6 @@
 <PRIMITIVE gatewayId="5" primitiveId="21" primitiveName="save" />
 <PRIMITIVE gatewayId="5" primitiveId="22" primitiveName="load" />
 <PRIMITIVE gatewayId="5" primitiveId="23" primitiveName="mgetl" />
-<PRIMITIVE gatewayId="5" primitiveId="24" primitiveName="getio" />
-<PRIMITIVE gatewayId="5" primitiveId="25" primitiveName="setenv" />
-<PRIMITIVE gatewayId="5" primitiveId="26" primitiveName="export_to_hdf5" />
+<PRIMITIVE gatewayId="5" primitiveId="24" primitiveName="setenv" />
+<PRIMITIVE gatewayId="5" primitiveId="25" primitiveName="export_to_hdf5" />
 </GATEWAY>
\ No newline at end of file
index 0c13a16..5bee60e 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\sci_lib.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\c\sci_load.c"
                                >
                        </File>
index 4f31411..ec97a60 100644 (file)
@@ -81,7 +81,6 @@ lib /DEF:&quot;$(InputDir)output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /M
                <File RelativePath="..\..\sci_gateway\fortran\intexecstr.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intfile.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intgetf.f"/>
-               <File RelativePath="..\..\sci_gateway\fortran\intlib.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intmgetl.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intrat.f"/>
                <File RelativePath="..\..\sci_gateway\fortran\intread.f"/>
index 539c5fe..dde4bf8 100644 (file)
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\intlib.c"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\fortran\intmgetl.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\fortran\intlib.f"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\sci_gateway\fortran\intmgetl.f"
                                >
                        </File>