hdf5 module (windows)
Allan CORNET [Fri, 10 Jul 2009 09:38:47 +0000 (11:38 +0200)]
48 files changed:
scilab/Scilab.sln
scilab/Scilab_f2c.sln
scilab/configure.ac
scilab/etc/modules.xml.in
scilab/etc/modules.xml.vc
scilab/modules/Makefile.am
scilab/modules/core/includes/callinterf.h
scilab/modules/core/src/c/callinterf.c
scilab/modules/fileio/Makefile.am
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/includes/gw_fileio.h
scilab/modules/fileio/sci_gateway/c/gw_fileio.c
scilab/modules/fileio/sci_gateway/fileio_gateway.xml
scilab/modules/fileio/src/c/DllmainFileio.c
scilab/modules/hdf5/.gitignore [new file with mode: 0644]
scilab/modules/hdf5/Makefile.am [new file with mode: 0644]
scilab/modules/hdf5/build.xml [new file with mode: 0644]
scilab/modules/hdf5/changelog.txt [new file with mode: 0644]
scilab/modules/hdf5/etc/hdf5.quit [new file with mode: 0644]
scilab/modules/hdf5/etc/hdf5.start [new file with mode: 0644]
scilab/modules/hdf5/hdf5.iss [new file with mode: 0644]
scilab/modules/hdf5/includes/gw_hdf5.h [new file with mode: 0644]
scilab/modules/hdf5/includes/h5_attributeConstants.h [moved from scilab/modules/fileio/includes/h5_attributeConstants.h with 100% similarity]
scilab/modules/hdf5/includes/h5_fileManagement.h [moved from scilab/modules/fileio/includes/h5_fileManagement.h with 100% similarity]
scilab/modules/hdf5/includes/h5_readDataFromFile.h [moved from scilab/modules/fileio/includes/h5_readDataFromFile.h with 100% similarity]
scilab/modules/hdf5/includes/h5_writeDataToFile.h [moved from scilab/modules/fileio/includes/h5_writeDataToFile.h with 100% similarity]
scilab/modules/hdf5/license.txt [new file with mode: 0644]
scilab/modules/hdf5/macros/buildmacros.bat [new file with mode: 0644]
scilab/modules/hdf5/macros/buildmacros.sce [new file with mode: 0644]
scilab/modules/hdf5/macros/cleanmacros.bat [new file with mode: 0644]
scilab/modules/hdf5/readme.txt [new file with mode: 0644]
scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c [new file with mode: 0644]
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp [moved from scilab/modules/fileio/sci_gateway/cpp/sci_export_to_hdf5.cpp with 99% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp [moved from scilab/modules/fileio/sci_gateway/cpp/sci_import_from_hdf5.cpp with 99% similarity]
scilab/modules/hdf5/sci_gateway/cpp/sci_no_hdf5.cpp [moved from scilab/modules/fileio/sci_gateway/cpp/sci_no_hdf5.cpp with 100% similarity]
scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml [new file with mode: 0644]
scilab/modules/hdf5/src/c/DllmainHdf5.c [new file with mode: 0644]
scilab/modules/hdf5/src/c/LibScilab_Import.def [new file with mode: 0644]
scilab/modules/hdf5/src/c/h5_fileManagement.c [moved from scilab/modules/fileio/src/c/h5_fileManagement.c with 100% similarity]
scilab/modules/hdf5/src/c/h5_readDataFromFile.c [moved from scilab/modules/fileio/src/c/h5_readDataFromFile.c with 100% similarity]
scilab/modules/hdf5/src/c/h5_writeDataToFile.c [moved from scilab/modules/fileio/src/c/h5_writeDataToFile.c with 100% similarity]
scilab/modules/hdf5/src/c/hdf5.rc [new file with mode: 0644]
scilab/modules/hdf5/src/c/hdf5.vcproj [new file with mode: 0644]
scilab/modules/hdf5/src/c/hdf5_header.def [new file with mode: 0644]
scilab/modules/hdf5/src/c/localization_Import.def [new file with mode: 0644]
scilab/modules/hdf5/src/c/resource.h [new file with mode: 0644]
scilab/modules/hdf5/src/java/hdf5-JAVA.vcproj [new file with mode: 0644]
scilab/modules/hdf5/version.xml [new file with mode: 0644]

index 936617e..b2dba9e 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}
+               {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
                {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}
@@ -1021,6 +1022,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_s
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {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
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2093,6 +2105,22 @@ Global
                {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
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.Build.0 = Debug|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.ActiveCfg = Debug|x64
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.Build.0 = Debug|x64
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.ActiveCfg = Release|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.Build.0 = Release|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.ActiveCfg = Release|x64
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.Build.0 = Release|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.ActiveCfg = Debug|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.Build.0 = Debug|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.ActiveCfg = Debug|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.Build.0 = Debug|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.ActiveCfg = Release|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.Build.0 = Release|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.ActiveCfg = Release|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index d58d675..d83ac84 100644 (file)
@@ -69,6 +69,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}
+               {A824EA62-AF07-4F43-9036-0E63990556BD} = {A824EA62-AF07-4F43-9036-0E63990556BD}
                {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}
@@ -1021,6 +1022,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "api_scilab", "modules\api_s
                {3170E4C2-1173-4264-A222-7EE8CCB3DDF7} = {3170E4C2-1173-4264-A222-7EE8CCB3DDF7}
        EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5", "modules\hdf5\src\c\hdf5.vcproj", "{A824EA62-AF07-4F43-9036-0E63990556BD}"
+       ProjectSection(ProjectDependencies) = postProject
+               {ECFFEB0C-1EDA-45EE-9A10-B18143852E17} = {ECFFEB0C-1EDA-45EE-9A10-B18143852E17}
+               {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
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5-Ant", "modules\hdf5\src\java\hdf5-JAVA.vcproj", "{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -2093,6 +2105,22 @@ Global
                {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
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.ActiveCfg = Debug|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|Win32.Build.0 = Debug|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.ActiveCfg = Debug|x64
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Debug|x64.Build.0 = Debug|x64
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.ActiveCfg = Release|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|Win32.Build.0 = Release|Win32
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.ActiveCfg = Release|x64
+               {A824EA62-AF07-4F43-9036-0E63990556BD}.Release|x64.Build.0 = Release|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.ActiveCfg = Debug|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|Win32.Build.0 = Debug|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.ActiveCfg = Debug|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Debug|x64.Build.0 = Debug|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.ActiveCfg = Release|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|Win32.Build.0 = Release|Win32
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.ActiveCfg = Release|x64
+               {9B6500B0-66F6-44F0-910D-47A1435B4E02}.Release|x64.Build.0 = Release|x64
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
index b5dead2..7302819 100644 (file)
@@ -1431,6 +1431,7 @@ modules/windows_tools/Makefile
 modules/core/Makefile
 modules/api_scilab/Makefile
 modules/call_scilab/Makefile
+modules/hdf5/Makefile
 modules/fftw/Makefile
 modules/umfpack/Makefile
 modules/scicos/Makefile
index de15e69..2590bd5 100644 (file)
@@ -81,4 +81,5 @@
 <module name="simulated_annealing" activate="yes"/>
 <module name="parameters" activate="yes"/>
 <module name="matio" activate="@MATIO_ENABLE@"/>
+<module name="hdf5" activate="yes"/>
 </modules>
index 0de3bee..9127f00 100644 (file)
@@ -83,5 +83,6 @@
 <module name="simulated_annealing" activate="yes"/>
 <module name="parameters" activate="yes"/>
 <module name="matio" activate="yes"/>
+<module name="hdf5" activate="yes"/>
 <!-- comments -->
 </modules>
index 9babc2a..d5eb528 100644 (file)
@@ -80,7 +80,8 @@ demo_tools \
 genetic_algorithms \
 simulated_annealing \
 parameters \
-matio
+matio \
+hdf5
 
 #umfpack
 
@@ -177,7 +178,8 @@ ENGINE_LIBS =       $(top_builddir)/modules/fileio/libscifileio.la \
        $(top_builddir)/modules/signal_processing/libscisignal_processing.la \
        $(top_builddir)/modules/interpolation/libsciinterpolation.la \
        $(top_builddir)/modules/string/libscistring.la \
-       $(top_builddir)/modules/functions/libscifunctions.la 
+       $(top_builddir)/modules/functions/libscifunctions.la \
+       $(top_builddir)/modules/hdf5/libscihdf5.la
 
 OTHER_LIBS = $(top_builddir)/modules/fftw/libscifftw.la \
 $(top_builddir)/modules/umfpack/libsciumfpack.la \
index a94deca..9edf11f 100644 (file)
@@ -83,6 +83,7 @@
 /* 59 */                                               #include "dynamic_gateways.h" /* matio */
 /* 60 */                                               #include "dynamic_gateways.h" /* helptools */
 /* 61 */                                               #include "../../call_scilab/includes/gw_call_scilab.h"
+/* 62 */                                               #include "../../hdf5/includes/gw_hdf5.h"
 
 /*-------------------------------------
  * long jump to stop interface computation
index 26bdcce..eb5dff7 100644 (file)
@@ -33,7 +33,7 @@ static void sci_sigint_addinter(int n);
  ** Watch out the positions are crutial !!!
  ** @TODO : Make this less crappy...
  **/
-#define INTERFACES_MAX 61
+#define INTERFACES_MAX 62
 static OpTab Interfaces[INTERFACES_MAX] = {
     /* 01  */ {gw_user}, /* free position may be used */
        /* 02  */ {gw_linear_algebra},
@@ -95,7 +95,8 @@ static OpTab Interfaces[INTERFACES_MAX] = {
     /* 58  */ {gw_dynamic_umfpack},
        /* 59  */ {gw_dynamic_matio},
        /* 60  */ {gw_dynamic_helptools},
-       /* 61  */ {gw_call_scilab}
+       /* 61  */ {gw_call_scilab},
+       /* 62  */ {gw_hdf5}
 };
 /*--------------------------------------------------------------------------*/
 static int sig_ok = 0;
index 393d031..9bdd7ac 100644 (file)
@@ -84,32 +84,11 @@ sci_gateway/c/sci_newest.c \
 sci_gateway/c/sci_get_absolute_file_path.c  \
 sci_gateway/c/sci_getrelativefilename.c
 
-if HDF5
-FILEIO_SOURCES += src/c/h5_fileManagement.c \
-src/c/h5_writeDataToFile.c \
-src/c/h5_readDataFromFile.c
-
-#GATEWAY_SOURCES += \
-#sci_gateway/c/sci_import_from_hdf5.c
-
-GATEWAY_CPP_SOURCES = \
-sci_gateway/cpp/sci_export_to_hdf5.cpp \
-sci_gateway/cpp/sci_import_from_hdf5.cpp 
-
-else
-
-GATEWAY_CPP_SOURCES = \
-sci_gateway/cpp/sci_no_hdf5.cpp
-
-endif
-
-
 libscifileio_la_CXXFLAGS=      -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
                                -I$(top_srcdir)/libs/MALLOC/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes \
-                               -I$(top_srcdir)/modules/output_stream/includes \
-                               $(HDF5_CFLAGS)
+                               -I$(top_srcdir)/modules/output_stream/includes
 
 libscifileio_la_CFLAGS=                -I$(srcdir)/includes/ \
                                -I$(srcdir)/src/c/ \
@@ -118,12 +97,11 @@ libscifileio_la_CFLAGS=            -I$(srcdir)/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)
+                               -I$(top_srcdir)/modules/localization/includes
 
 pkglib_LTLIBRARIES = libscifileio.la
 
-libscifileio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) $(HDF5_LIBS)
+libscifileio_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION)
 
 libscifileio_la_SOURCES = $(FILEIO_SOURCES) $(GATEWAY_SOURCES) $(GATEWAY_CPP_SOURCES)
 
index f2f99a5..54a8cd0 100644 (file)
@@ -6,7 +6,7 @@
        ProjectGUID="{4FC72D4A-80EE-4B1A-8724-0201C1A35621}"
        RootNamespace="fileio"
        Keyword="Win32Proj"
-
+       TargetFrameworkVersion="0"
        >
        <Platforms>
                <Platform
@@ -44,8 +44,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               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"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../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"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               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"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../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"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="3"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               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"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../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"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               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"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../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"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="0"
                                >
                        </File>
                        <File
-                               RelativePath=".\src\c\h5_fileManagement.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\src\c\h5_readDataFromFile.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\src\c\h5_writeDataToFile.c"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\src\c\isdir.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\cpp\sci_export_to_hdf5.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="0"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="0"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="0"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Release|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="0"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_fileext.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\sci_gateway\cpp\sci_import_from_hdf5.cpp"
-                               >
-                               <FileConfiguration
-                                       Name="Debug|x64"
-                                       >
-                                       <Tool
-                                               Name="VCCLCompilerTool"
-                                               CompileAs="0"
-                                       />
-                               </FileConfiguration>
-                       </File>
-                       <File
                                RelativePath=".\sci_gateway\c\sci_isdir.c"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath=".\includes\h5_attributeConstants.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\includes\h5_fileManagement.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\includes\h5_readDataFromFile.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath=".\includes\h5_writeDataToFile.h"
-                               >
-                       </File>
-                       <File
                                RelativePath=".\includes\isdir.h"
                                >
                        </File>
                        >
                </File>
                <File
-                       RelativePath="..\..\bin\hdf5dll.lib"
-                       >
-               </File>
-               <File
                        RelativePath=".\Makefile.am"
                        >
                </File>
index 6f23b4a..b4fc879 100644 (file)
@@ -51,9 +51,6 @@ int sci_fileinfo(char *fname,unsigned long fname_len);
 int sci_newest(char *fname,unsigned long fname_len);
 int sci_getrelativefilename(char *fname, unsigned long l);
 int sci_get_absolute_file_path(char *fname,unsigned long fname_len);
-int sci_export_to_hdf5(char *fname,unsigned long fname_len);
-int sci_import_from_hdf5(char *fname,unsigned long fname_len);
-
 /*--------------------------------------------------------------------------*/ 
 #endif /* __GW_FILEIO_H__ */
 /*--------------------------------------------------------------------------*/
index f275ec8..1159bd8 100644 (file)
@@ -17,7 +17,7 @@
 /*--------------------------------------------------------------------------*/ 
 /*  interface function */
 /*--------------------------------------------------------------------------*/ 
-#define FILEIO_TAB_SIZE 38
+#define FILEIO_TAB_SIZE 36
 static gw_generic_table Tab[FILEIO_TAB_SIZE]={
        {sci_mopen, "mopen"},
        {sci_mputstr, "mputstr"},
@@ -54,9 +54,7 @@ static gw_generic_table Tab[FILEIO_TAB_SIZE]={
        {sci_fileinfo,"fileinfo"},
        {sci_newest,"newest"},
        {sci_getrelativefilename,"getrelativefilename"},
-       {sci_get_absolute_file_path,"get_absolute_file_path"},
-       {sci_export_to_hdf5,"export_to_hdf5"},
-       {sci_import_from_hdf5,"import_from_hdf5"}
+       {sci_get_absolute_file_path,"get_absolute_file_path"}
        };
 /*--------------------------------------------------------------------------*/ 
 int gw_fileio(void)
index b45ecdb..f044885 100644 (file)
@@ -70,6 +70,4 @@
 <PRIMITIVE gatewayId="34" primitiveId="34" primitiveName="newest" />
 <PRIMITIVE gatewayId="34" primitiveId="35" primitiveName="getrelativefilename" />
 <PRIMITIVE gatewayId="34" primitiveId="36" primitiveName="get_absolute_file_path" />
-<PRIMITIVE gatewayId="34" primitiveId="37" primitiveName="export_to_hdf5" />
-<PRIMITIVE gatewayId="34" primitiveId="38" primitiveName="import_from_hdf5" />
 </GATEWAY>
index 47a2667..ce4a942 100644 (file)
@@ -14,8 +14,6 @@
 #include <windows.h> 
 /*--------------------------------------------------------------------------*/ 
 #pragma comment(lib,"../../bin/libintl.lib")
-#pragma comment(lib,"../../bin/hdf5dll.lib")
-#pragma comment(lib,"../../bin/hdf5_cppdll.lib")
 /*--------------------------------------------------------------------------*/ 
 int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
 {
diff --git a/scilab/modules/hdf5/.gitignore b/scilab/modules/hdf5/.gitignore
new file mode 100644 (file)
index 0000000..981c9c0
--- /dev/null
@@ -0,0 +1,5 @@
+#
+#generated .def files (windows)
+#
+src/c/integer.def
+
diff --git a/scilab/modules/hdf5/Makefile.am b/scilab/modules/hdf5/Makefile.am
new file mode 100644 (file)
index 0000000..2807327
--- /dev/null
@@ -0,0 +1,67 @@
+# 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
+
+
+#### Target ####
+modulename=hdf5
+
+#### hdf5 : Conf files ####
+libscihdf5_la_rootdir = $(mydatadir)
+libscihdf5_la_root_DATA = changelog.txt license.txt readme.txt version.xml
+
+#### hdf5 : init scripts ####
+libscihdf5_la_etcdir = $(mydatadir)/etc
+libscihdf5_la_etc_DATA = etc/hdf5.quit etc/hdf5.start etc/hdf5_options.xml
+
+
+libscihdf5_la_CFLAGS=          -I$(top_srcdir)/libs/MALLOC/includes/ \
+                       -I$(top_srcdir)/modules/output_stream/includes/ \
+                       -I$(top_srcdir)/modules/localization/includes/ \
+                       -I$(top_srcdir)/modules/string/includes/ \
+                       -I$(top_srcdir)/modules/fileio/includes/
+
+pkglib_LTLIBRARIES = libscihdf5-disable.la
+
+if GUI
+pkglib_LTLIBRARIES += libscihdf5.la
+endif
+
+libscihdf5_la_LDFLAGS = -version-info $(SCILAB_LIBRARY_VERSION) -lpthread $(XML_LIBS)
+
+
+libscihdf5_la_LIBADD =  $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/fileio/libscifileio.la $(top_builddir)/modules/core/libscicore.la $(top_builddir)/libs/dynamiclibrary/libscidynamiclibrary.la $(top_builddir)/modules/output_stream/libscioutput_stream.la
+
+#### hdf5 : gateway declaration ####
+libscihdf5_la_sci_gatewaydir = $(mydatadir)/sci_gateway
+libscihdf5_la_sci_gateway_DATA = sci_gateway/hdf5_gateway.xml
+
+#### hdf5 : include files ####
+libscihdf5_la_includedir=$(pkgincludedir)/hdf5
+libscihdf5_la_include_HEADERS = 
+
+GATEWAY_C_SOURCES = 
+
+HDF5_C_SOURCES = 
+
+USEANT=1
+
+libscihdf5_disable_la_SOURCES = src/nojvm/nojvm.c
+libscihdf5_disable_la_CFLAGS = -I$(srcdir)/includes/ \
+                       -I$(top_srcdir)/modules/call_scilab/includes \
+                       -I$(srcdir)/src/c \
+                       -I$(top_srcdir)/modules/output_stream/includes/
+
+libscihdf5_la_SOURCES = $(JVM_C_SOURCES) $(GATEWAY_C_SOURCES)
+
+# For the code check (splint)
+CHECK_SRC= $(libscihdf5_la_SOURCES)
+INCLUDE_FLAGS = $(libscihdf5_la_CFLAGS)
+
+
+include $(top_srcdir)/Makefile.incl.am
diff --git a/scilab/modules/hdf5/build.xml b/scilab/modules/hdf5/build.xml
new file mode 100644 (file)
index 0000000..da1ed52
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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
+ *
+ -->
+
+<project name="hdf5" default="jar">
+  <import file="../../build.incl.xml"/>
+
+  <property name="library.name" value="${library.action_binding.name}" />
+
+  <description>
+       Build the hdf5 Scilab module
+  </description>
+
+</project>
+
diff --git a/scilab/modules/hdf5/changelog.txt b/scilab/modules/hdf5/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/hdf5/etc/hdf5.quit b/scilab/modules/hdf5/etc/hdf5.quit
new file mode 100644 (file)
index 0000000..ca3134e
--- /dev/null
@@ -0,0 +1,8 @@
+// ====================================================================
+// This file contains command to be executed at the end 
+// of a scilab session for gui module
+// Copyright DIGITEO 2009
+// ====================================================================
+// delete help chapter
+del_help_chapter('hdf5',%T);
+// ====================================================================
diff --git a/scilab/modules/hdf5/etc/hdf5.start b/scilab/modules/hdf5/etc/hdf5.start
new file mode 100644 (file)
index 0000000..9443b7b
--- /dev/null
@@ -0,0 +1,15 @@
+// ====================================================================
+// gui module initialisation file 
+// Copyright DIGITEO 2009
+// ====================================================================
+//Load  functions libraries
+//load('SCI/modules/hdf5/macros/lib');
+// ====================================================================
+//add help chapter
+//add_module_help_chapter('hdf5');
+// ====================================================================
+//add demos
+//pathdemos = pathconvert(SCI+"/modules/hdf5/demos/hdf5.dem.gateway.sce",%f,%t);
+//add_demo(gettext("hdf5"),pathdemos);
+clear pathdemos;
+// ====================================================================
diff --git a/scilab/modules/hdf5/hdf5.iss b/scilab/modules/hdf5/hdf5.iss
new file mode 100644 (file)
index 0000000..b9a1e1a
--- /dev/null
@@ -0,0 +1,53 @@
+;
+; 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
+;
+;##############################################################################################################
+; Script d'installation Inno Setup (5.2.1) pour scilab
+;##############################################################################################################
+;--------------------------------------------------------------------------------------------------------------
+; hdf5 module
+;--------------------------------------------------------------------------------------------------------------
+;
+#define HDF5 "hdf5"
+;
+Source: bin\scihdf5.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#HDF5}\jar\org.scilab.modules.hdf5.jar;DestDir: {app}\modules\{#HDF5}\jar; Components: {#COMPN_SCILAB}
+;
+;Source: bin\nohdf5.dll; DestDir: {app}\bin; DestName: scihdf5.dll; Components: not ({#COMPN_ACTION_BINDING})
+;
+Source: modules\{#HDF5}\changelog.txt; DestDir: {app}\modules\{#HDF5}; Components: {#COMPN_SCILAB};
+Source: modules\{#HDF5}\license.txt; DestDir: {app}\modules\{#HDF5}; Components: {#COMPN_SCILAB}
+Source: modules\{#HDF5}\readme.txt; DestDir: {app}\modules\{#HDF5}; Components: {#COMPN_SCILAB}
+Source: modules\{#HDF5}\version.xml; DestDir: {app}\modules\{#HDF5}; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#HDF5}\sci_gateway\hdf5_gateway.xml; DestDir: {app}\modules\{#HDF5}\sci_gateway; Components: {#COMPN_SCILAB}
+;
+Source: modules\{#HDF5}\includes\*.h; DestDir: {app}\modules\{#HDF5}\includes; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#HDF5}\help\addchapter.sce; DestDir: {app}\modules\{#HDF5}\help; Flags: recursesubdirs; Components:  {#COMPN_SCILAB}
+;
+Source: modules\{#HDF5}\etc\{#HDF5}.quit; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB}
+Source: modules\{#HDF5}\etc\{#HDF5}.start; DestDir: {app}\modules\{#HDF5}\etc; Components: {#COMPN_SCILAB}
+;
+;
+;Source: modules\{#HDF5}\macros\buildmacros.sce; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#HDF5}\macros\buildmacros.bat; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#HDF5}\macros\cleanmacros.bat; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#HDF5}\macros\*.bin; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#HDF5}\macros\*.sci; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#HDF5}\macros\lib; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;Source: modules\{#HDF5}\macros\names; DestDir: {app}\modules\{#HDF5}\macros; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#HDF5}\demos\*.*; DestDir: {app}\modules\{#HDF5}\demos; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
+;
+;Source: modules\{#HDF5}\tests\*.*; DestDir: {app}\modules\{#HDF5}\tests; Flags: recursesubdirs; Components: {#COMPN_SCILAB} and {#COMPN_TESTS}
+;--------------------------------------------------------------------------------------------------------------
+
diff --git a/scilab/modules/hdf5/includes/gw_hdf5.h b/scilab/modules/hdf5/includes/gw_hdf5.h
new file mode 100644 (file)
index 0000000..609ee7d
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * 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_HDF5_H__
+#define __GW_HDF5_H__
+/*--------------------------------------------------------------------------*/ 
+int gw_hdf5(void);
+/*--------------------------------------------------------------------------*/ 
+int sci_export_to_hdf5(char *fname,unsigned long fname_len);
+int sci_import_from_hdf5(char *fname,unsigned long fname_len);
+/*--------------------------------------------------------------------------*/ 
+#endif /* __GW_HDF5_H__ */
+/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/hdf5/license.txt b/scilab/modules/hdf5/license.txt
new file mode 100644 (file)
index 0000000..9d8b3b8
--- /dev/null
@@ -0,0 +1,9 @@
+Copyright:
+Copyright (c) 2008 - 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/hdf5/macros/buildmacros.bat b/scilab/modules/hdf5/macros/buildmacros.bat
new file mode 100644 (file)
index 0000000..1f23385
--- /dev/null
@@ -0,0 +1,11 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2008 - 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;
diff --git a/scilab/modules/hdf5/macros/buildmacros.sce b/scilab/modules/hdf5/macros/buildmacros.sce
new file mode 100644 (file)
index 0000000..ec502d3
--- /dev/null
@@ -0,0 +1,16 @@
+
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2007-2008 - INRIA - Allan CORNET <allan.cornet@inria.fr>
+//
+// 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("hdf5lib","SCI/modules/hdf5/macros",%f,%t);
+
diff --git a/scilab/modules/hdf5/macros/cleanmacros.bat b/scilab/modules/hdf5/macros/cleanmacros.bat
new file mode 100644 (file)
index 0000000..6e6b7bc
--- /dev/null
@@ -0,0 +1,13 @@
+
+rem Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+rem Copyright (C) 2008 - 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
diff --git a/scilab/modules/hdf5/readme.txt b/scilab/modules/hdf5/readme.txt
new file mode 100644 (file)
index 0000000..785eeec
--- /dev/null
@@ -0,0 +1 @@
+README File
diff --git a/scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c b/scilab/modules/hdf5/sci_gateway/c/gw_hdf5.c
new file mode 100644 (file)
index 0000000..bf3e9e8
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ * 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_hdf5.h"
+#include "callFunctionFromGateway.h"
+#include "stack-c.h"
+/*--------------------------------------------------------------------------*/ 
+/*  interface function */
+/*--------------------------------------------------------------------------*/ 
+#define HDF5_TAB_SIZE 2
+static gw_generic_table Tab[HDF5_TAB_SIZE]={
+       {sci_export_to_hdf5,"export_to_hdf5"},
+       {sci_import_from_hdf5,"import_from_hdf5"}
+       };
+/*--------------------------------------------------------------------------*/ 
+int gw_hdf5(void)
+{
+       Rhs = Max(0,Rhs);
+       callFunctionFromGateway(Tab, HDF5_TAB_SIZE);
+       return 0;
+}
+/*--------------------------------------------------------------------------*/ 
+
@@ -14,7 +14,7 @@ extern "C"
 {
 #include <string.h>
 #include <stdio.h>
-#include "gw_fileio.h"
+#include "gw_hdf5.h"
 #include "stack-c.h"
 #include "MALLOC.h"
 #include "Scierror.h"
@@ -14,7 +14,7 @@ extern "C"
 {
 #include <hdf5.h>
 #include <string.h>
-#include "gw_fileio.h"
+#include "gw_hdf5.h"
 #include "stack-c.h"
 #include "MALLOC.h"
 #include "Scierror.h"
diff --git a/scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml b/scilab/modules/hdf5/sci_gateway/hdf5_gateway.xml
new file mode 100644 (file)
index 0000000..f6e3eb9
--- /dev/null
@@ -0,0 +1,35 @@
+<?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 GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
+<GATEWAY name="hdf5">
+
+<!--
+ 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
+
+-->
+<PRIMITIVE gatewayId="62" primitiveId="1" primitiveName="export_to_hdf5" />
+<PRIMITIVE gatewayId="62" primitiveId="2" primitiveName="import_from_hdf5" />
+
+</GATEWAY>
diff --git a/scilab/modules/hdf5/src/c/DllmainHdf5.c b/scilab/modules/hdf5/src/c/DllmainHdf5.c
new file mode 100644 (file)
index 0000000..af28cd0
--- /dev/null
@@ -0,0 +1,35 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2009 - DIGITEO  - 
+ *
+ * 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 <windows.h> 
+/*--------------------------------------------------------------------------*/ 
+#pragma comment(lib,"../../../../bin/libintl.lib")
+#pragma comment(lib,"../../../../bin/hdf5dll.lib")
+#pragma comment(lib,"../../../../bin/hdf5_cppdll.lib")
+/*--------------------------------------------------------------------------*/ 
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
+{
+  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/hdf5/src/c/LibScilab_Import.def b/scilab/modules/hdf5/src/c/LibScilab_Import.def
new file mode 100644 (file)
index 0000000..9fb8477
--- /dev/null
@@ -0,0 +1,11 @@
+LIBRARY    LibScilab.dll
+
+
+EXPORTS
+com_
+putlhsvar_
+intersci_
+checklhs_
+freeArrayOfString
+callFunctionFromGateway
+checkrhs_
\ No newline at end of file
diff --git a/scilab/modules/hdf5/src/c/hdf5.rc b/scilab/modules/hdf5/src/c/hdf5.rc
new file mode 100644 (file)
index 0000000..f5bd64e
--- /dev/null
@@ -0,0 +1,97 @@
+// 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,2,0,0
+ PRODUCTVERSION 5,2,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x0L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040c04b0"
+        BEGIN
+            VALUE "FileDescription", "hdf5 module"
+            VALUE "FileVersion", "5, 2, 0, 0"
+            VALUE "InternalName", "hdf5 module"
+            VALUE "LegalCopyright", "Copyright (C) 2009"
+            VALUE "OriginalFilename", "scihdf5.dll"
+            VALUE "ProductName", " hdf5"
+            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/hdf5/src/c/hdf5.vcproj b/scilab/modules/hdf5/src/c/hdf5.vcproj
new file mode 100644 (file)
index 0000000..2a1768e
--- /dev/null
@@ -0,0 +1,461 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="hdf5"
+       ProjectGUID="{A824EA62-AF07-4F43-9036-0E63990556BD}"
+       RootNamespace="hdf5"
+       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;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCILAB_HDF5_EXPORTS;_HDF5USEDLL_;WIN32"
+                               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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scihdf5.dll %%f &gt;nul&#x0D;&#x0A;copy *.def hdf5tmp.def &gt;nul&#x0D;&#x0A;copy ..\hdf5_header.def+hdf5tmp.def  ..\hdf5.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib scilocalization.lib"
+                               OutputFile="../../../../bin/scihdf5.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="hdf5.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/scihdf5.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"
+                               CommandLine=""
+                       />
+               </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;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCILAB_HDF5_EXPORTS;_HDF5USEDLL_;WIN32"
+                               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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scihdf5.dll %%f &gt;nul&#x0D;&#x0A;copy *.def hdf5tmp.def &gt;nul&#x0D;&#x0A;copy ..\hdf5_header.def+hdf5tmp.def  ..\hdf5.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib scilocalization.lib"
+                               OutputFile="../../../../bin/scihdf5.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="hdf5.def"
+                               GenerateDebugInformation="true"
+                               SubSystem="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/scihdf5.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"
+                               CommandLine=""
+                       />
+               </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;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCILAB_HDF5_EXPORTS;_HDF5USEDLL_;WIN32"
+                               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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scihdf5.dll %%f &gt;nul&#x0D;&#x0A;copy *.def hdf5tmp.def &gt;nul&#x0D;&#x0A;copy ..\hdf5_header.def+hdf5tmp.def  ..\hdf5.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib scilocalization.lib"
+                               OutputFile="../../../../bin/scihdf5.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="hdf5.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/scihdf5.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"
+                               CommandLine=""
+                       />
+               </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;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include"
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;SCILAB_HDF5_EXPORTS;_HDF5USEDLL_;WIN32"
+                               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)localization_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scilocalization.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scihdf5.dll %%f &gt;nul&#x0D;&#x0A;copy *.def hdf5tmp.def &gt;nul&#x0D;&#x0A;copy ..\hdf5_header.def+hdf5tmp.def  ..\hdf5.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="LibScilab.lib scilocalization.lib"
+                               OutputFile="../../../../bin/scihdf5.dll"
+                               LinkIncremental="1"
+                               ModuleDefinitionFile="hdf5.def"
+                               GenerateDebugInformation="false"
+                               SubSystem="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               ImportLibrary="../../../../bin/scihdf5.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"
+                               CommandLine=""
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath=".\DllmainHdf5.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\c\gw_hdf5.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\h5_fileManagement.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\h5_readDataFromFile.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath=".\h5_writeDataToFile.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\cpp\sci_export_to_hdf5.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sci_gateway\cpp\sci_import_from_hdf5.cpp"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl"
+                       >
+                       <File
+                               RelativePath=".\resource.h"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="localization"
+                       >
+               </Filter>
+               <Filter
+                       Name="Libraries Dependencies"
+                       >
+                       <File
+                               RelativePath=".\hdf5_header.def"
+                               >
+                       </File>
+                       <Filter
+                               Name="Imports"
+                               >
+                               <File
+                                       RelativePath=".\LibScilab_Import.def"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\localization_Import.def"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="Ressources"
+                       >
+                       <File
+                               RelativePath=".\hdf5.rc"
+                               >
+                       </File>
+               </Filter>
+               <File
+                       RelativePath="..\..\hdf5.iss"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\hdf5_gateway.xml"
+                       >
+               </File>
+               <File
+                       RelativePath="..\..\Makefile.am"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/hdf5/src/c/hdf5_header.def b/scilab/modules/hdf5/src/c/hdf5_header.def
new file mode 100644 (file)
index 0000000..37973c1
--- /dev/null
@@ -0,0 +1,4 @@
+LIBRARY    scihdf5.dll
+
+
+EXPORTS
diff --git a/scilab/modules/hdf5/src/c/localization_Import.def b/scilab/modules/hdf5/src/c/localization_Import.def
new file mode 100644 (file)
index 0000000..48d53af
--- /dev/null
@@ -0,0 +1,7 @@
+LIBRARY    scilocalization.dll
+
+
+EXPORTS
+setlanguage
+getlanguage
+localeToUTF
diff --git a/scilab/modules/hdf5/src/c/resource.h b/scilab/modules/hdf5/src/c/resource.h
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/scilab/modules/hdf5/src/java/hdf5-JAVA.vcproj b/scilab/modules/hdf5/src/java/hdf5-JAVA.vcproj
new file mode 100644 (file)
index 0000000..0c4ead3
--- /dev/null
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="hdf5-Ant"
+       ProjectGUID="{9B6500B0-66F6-44F0-910D-47A1435B4E02}"
+       RootNamespace="hdf5-Ant"
+       Keyword="MakeFileProj"
+       TargetFrameworkVersion="0"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;_DEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="0"
+                       >
+                       <Tool
+                               Name="VCNMakeTool"
+                               BuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               ReBuildCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant&#x0D;&#x0A;"
+                               CleanCommandLine="set JAVA_HOME=$(SolutionDir)\java\jdk&#x0D;&#x0A;set PATH=$(SolutionDir)\java\ant\bin;%PATH%;&#x0D;&#x0A;cd ..\..&#x0D;&#x0A;call ant clean&#x0D;&#x0A;&#x0D;&#x0A;"
+                               Output=""
+                               PreprocessorDefinitions="WIN32;NDEBUG"
+                               IncludeSearchPath=""
+                               ForcedIncludes=""
+                               AssemblySearchPath=""
+                               ForcedUsingAssemblies=""
+                               CompileAsManaged=""
+                       />
+               </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}"
+                       >
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/scilab/modules/hdf5/version.xml b/scilab/modules/hdf5/version.xml
new file mode 100644 (file)
index 0000000..d4ad731
--- /dev/null
@@ -0,0 +1,21 @@
+<?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
+ *
+ -->
+
+<!-- Defines the version of a module -->
+
+<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
+
+<MODULE_VERSION name="hdf5">
+<VERSION major="5" minor="2" maintenance="0" revision="0" string="unstable-git" />
+</MODULE_VERSION>