diff options
Diffstat (limited to 'windows')
| -rwxr-xr-x | windows/hdf5bt.BAT | 26 | ||||
| -rwxr-xr-x | windows/hdf5build.BAT | 150 | ||||
| -rw-r--r-- | windows/hl/tools/gif2h5/h52giftest.bat | 4 | ||||
| -rwxr-xr-x | windows/src/H5pubconf.h | 765 | ||||
| -rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 6 | ||||
| -rw-r--r-- | windows/tools/h5jam/testh5jam.bat | 6 | ||||
| -rw-r--r-- | windows/tools/h5repack/h5repack.bat | 2 |
7 files changed, 779 insertions, 180 deletions
diff --git a/windows/hdf5bt.BAT b/windows/hdf5bt.BAT index 683b400..dd48f10 100755 --- a/windows/hdf5bt.BAT +++ b/windows/hdf5bt.BAT @@ -18,16 +18,20 @@ rem This batch file is used to build and test HDF5 Libraries and Tools. rem This batch file takes the following options:
rem . /vs7 Build HDF5 using Visual Studio .NET 2003
rem . Note: Default is Visual Studio 2005
+rem . /vs9 Build HDF5 using Visual Studio 2008
+rem . Note: Default is Visual Studio 2005
rem . /fort Build and test HDF5 with Fortran libraries
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
+rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+rem . Note: Default is Intel Visual Fortran 9.1
rem . /log Log the build and test results in files defined by
rem . environment variables HDF5BUILD_LOG and
rem . HDF5CHECK_LOG
rem . /? Help information
rem By Xuan Bai
rem Created: Aug. 16, 2004
-rem Last Updated: Scott Wegner, 5/27/08
+rem Last Updated: Scott Wegner, 7/2/08
rem This batch file makes the following assumptions:
rem - The appropriate version of Visual Studio is installed and setup
@@ -61,7 +65,11 @@ rem Print a help message echo.
echo. /vs7 Build HDF5 using Visual Studio .NET 2003
echo. Note: Default is Visual Studio 2005
+ echo. /vs9 Build HDF5 using Visual Studio 2008
+ echo. Note: Default is Visual Studio 2005
echo. /fort Build and test HDF5 with Fortran libraries
+ echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+ echo. Note: Default is Intel Visual Fortran 9.1
echo. /useenv Build HDF5 using compiler settings defined
echo. in the environment, rather than the IDE.
echo. /? Help information
@@ -77,10 +85,18 @@ rem Parse through the parameters sent to file, and set appropriate variables rem Use Visual Studio .NET to build
set hdf5_vnet=true
+ ) else if "%%a"=="/vs9" (
+ rem Use Visual Studio 2008 to build
+ set hdf5_vs2008=true
+
) else if "%%a"=="/fort" (
rem Enable Fortran
set hdf5_enablefortran=true
+ ) else if "%%a"=="/ivf101" (
+ rem Enable Fortran
+ set hdf5_ivf101=true
+
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
set hdf5_useenv=true
@@ -117,11 +133,19 @@ rem Setup our environment set hdf5build_params=%hdf5build_params% /vs7
)
+ if defined hdf5_vs2008 (
+ set hdf5build_params=%hdf5build_params% /vs9
+ )
+
if defined hdf5_enablefortran (
set hdf5build_params=%hdf5build_params% /fort
set hdf5check_params=enableall
)
+ if defined hdf5_ivf101 (
+ set hdf5build_params=%hdf5build_params% /ivf101
+ )
+
if defined hdf5_useenv (
set hdf5build_params=%hdf5build_params% /useenv
)
diff --git a/windows/hdf5build.BAT b/windows/hdf5build.BAT index 9efddd6..abb6c90 100755 --- a/windows/hdf5build.BAT +++ b/windows/hdf5build.BAT @@ -18,13 +18,17 @@ rem This batch file is used to build HDF5 Libraries and Tools. rem This batch file takes the following options:
rem . /vs7 Build HDF5 using Visual Studio .NET 2003
rem . Note: Default is Visual Studio 2005
-rem . /fort Build HDF5 with Fortran libraries
+rem . /vs9 Build HDF5 using Visual Studio 2008
+rem . Note: Default is Visual Studio 2005
+rem . /fort Build HDF5 with Fortran libraries
+rem . /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+rem . Note: Default is Intel Visual Fortran 9.1
rem . /useenv Build HDF5 using compiler settings defined
rem . in the environment, rather than the IDE.
rem . /? Help information
rem By Xuan Bai
rem Created: Aug. 16, 2004
-rem Last Updated: May 13, 2008
+rem Last Updated: Scott Wegner, 7/2/08
rem This batch file makes the following assumptions:
rem - The appropriate version of Visual Studio is installed and setup
@@ -54,12 +58,17 @@ rem Print a help message echo.
echo.Usage: %~nx0 [OPTION]
echo.
- echo. /vs7 Build HDF5 using Visual Studio .NET 2003
- echo. Note: Default is Visual Studio 2005
- echo. /fort Build HDF5 with Fortran libraries
- echo. /useenv Build HDF5 using compiler settings defined
- echo. in the environment, rather than the IDE.
- echo. /? Help information
+ echo. /vs7 Build HDF5 using Visual Studio .NET 2003
+ echo. Note: Default is Visual Studio 2005
+ echo. /vs9 Build HDF5 using Visual Studio 2008
+ echo. Note: Default is Visual Studio 2005
+ echo. /fort Build HDF5 with Fortran libraries using the
+ echo. Intel Fortran version specified, or 9.1 by default
+ echo. /ivf101 Build HDF5 Fortran using Intel Visual Fortran 10.1
+ echo. Note: Default is Intel Visual Fortran 9.1
+ echo. /useenv Build HDF5 using compiler settings defined
+ echo. in the environment, rather than the IDE.
+ echo. /? Help information
exit /b 0
@@ -71,10 +80,19 @@ rem Parse through the parameters sent to file, and set appropriate variables if "%%a"=="/vs7" (
rem Use Visual Studio .NET 2003
set hdf5_vnet=true
+
+ ) else if "%%a"=="/vs9" (
+ rem Use Visual Studio .NET 2003
+ set hdf5_vs2008=true
+
) else if "%%a"=="/fort" (
rem Enable Fortran
set hdf5_enablefortran=true
+ ) else if "%%a"=="/ivf101" (
+ rem Enable Fortran
+ set hdf5_ivf101=true
+
) else if "%%a"=="/useenv" (
rem Pass /useenv flag to devenv
set hdf5_useenv=true
@@ -113,11 +131,26 @@ rem Setup our environment exit /b 1
)
)
+ rem Make sure /vs7 and /vs9 weren't specified together
+ if "%hdf5_vnet%%hdf5_vs2008%"=="truetrue" (
+ echo.Error: /vs7 and /vs9 should not be specified together.
+ exit /b 1
+ )
rem Figure out which solution file to use based on configuration
if defined hdf5_vnet (
echo.Using Visual Studio .NET 2003
- set hdf5_sln="%CD%\windows_vnet\proj\all\all.sln"
+ set hdf5_sln="%CD%\windows_vnet\proj\all\all.sln"
+
+ ) else if defined hdf5_vs2008 (
+ echo.Using Visual Studio 2008
+ if defined hdf5_enablefortran (
+ echo.Building Fortran projects enabled
+ set hdf5_sln="%CD%\windows\proj\all_fortran\all_fortran.sln"
+ ) else (
+ set hdf5_sln="%CD%\windows\proj\all\all.sln"
+ )
+
) else (
echo.Using Visual Studio 2005
if defined hdf5_enablefortran (
@@ -154,6 +187,42 @@ rem Setup our environment echo.make sure VS71COMNTOOLS is defined in the environment.
exit /b 1
)
+
+ ) else if defined hdf5_vs2008 (
+ if not defined hdf5_enablefortran (
+ if defined vs90comntools (
+ rem This sets the Visual Studio 2005 path and environment variables
+ if %hdf5_platform%==Win32 (
+ call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86
+ ) else (
+ call "%vs90comntools%\..\..\VC\vcvarsall.bat" x86_amd64
+ )
+
+ ) else (
+ echo.Error: Cannot setup Visual Studio 2008 environment. Please
+ echo.make sure VS90COMNTOOLS is defined in the environment.
+ exit /b 1
+ )
+
+ ) else (
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 10.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
+ )
+ ) else (
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
+ )
+
) else (
rem Assume Visual Studio 2005
if not defined hdf5_enablefortran (
@@ -172,21 +241,41 @@ rem Setup our environment )
) else (
- echo.with Intel Visual Fortran 9.1
-
- if defined ifort_compiler91 (
- rem This sets the Intel Fortran 9.1 environment, as well as
- rem setting the appropriate Visual Studio environment
+ if not defined hdf5_ivf101 (
+ echo.with Intel Visual Fortran 9.1
- if %hdf5_platform%==Win32 (
- call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+ if defined ifort_compiler91 (
+ rem This sets the Intel Fortran 9.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler91%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"
+ )
) else (
- call "%ifort_compiler91%\em64t\Bin\ifortvars.bat"
+ echo.Error: Cannot setup Intel Fortran 9.1 environment. Please
+ echo.make sure IFORT_COMPILER91 is defined in the environment.
+ exit /b 1
)
+
) else (
- echo.Error: Cannot setup Intel Fortran 9.1 environment. Please
- echo.make sure IFORT_COMPILER91 is defined in the environment.
- exit /b 1
+ echo.with Intel Visual Fortran 10.1
+
+ if defined ifort_compiler10 (
+ rem This sets the Intel Fortran 10.1 environment, as well as
+ rem setting the appropriate Visual Studio environment
+
+ if %hdf5_platform%==Win32 (
+ call "%ifort_compiler10%\IA32\Bin\ifortvars.bat"
+ ) else (
+ call "%ifort_compiler10%\em64t\Bin\ifortvars.bat"
+ )
+ ) else (
+ echo.Error: Cannot setup Intel Fortran 10.1 environment. Please
+ echo.make sure IFORT_COMPILER10 is defined in the environment.
+ exit /b 1
+ )
)
)
)
@@ -201,6 +290,15 @@ rem Setup our environment exit /b 0
+rem Upgrade the project files to the latest format for Visual Studio
+:upgrade
+
+ echo.Upgrading project files
+ devenv %hdf5_sln% /Upgrade /NoLogo
+
+ exit /b
+
+
rem Build the HDF5 libraries. By default, C and C++ libraries are built.
:all
@@ -214,8 +312,7 @@ rem Build the HDF5 libraries. By default, C and C++ libraries are built. rem Build both debug and release versions
for %%a in (debug release) DO (
echo.Building %hdf5_platform% %%a libraries...
- rem Only add hdf5_platform if using Visual Studio 2005, because Visual Studio
- rem .NET doesn't like the syntax
+ rem Only add hdf5_platform if not using Visual Studio .NET, because it doesn't like the syntax
if defined hdf5_vnet (
devenv %hdf5_sln% %ccflags% /rebuild %%a
) else (
@@ -261,6 +358,15 @@ rem This is where the magic happens echo.Error setting up build environment.
goto error
)
+
+ rem Upgrade the project files if needed
+ if defined hdf5_vs2008 (
+ call :upgrade
+ if !errorlevel! neq 0 (
+ echo.Error upgrading project files!
+ goto error
+ )
+ )
echo.Building HDF5 Libraries and Tools
echo.
diff --git a/windows/hl/tools/gif2h5/h52giftest.bat b/windows/hl/tools/gif2h5/h52giftest.bat index 80a5391..742743b 100644 --- a/windows/hl/tools/gif2h5/h52giftest.bat +++ b/windows/hl/tools/gif2h5/h52giftest.bat @@ -31,8 +31,8 @@ set gif2h5=gif2h5%2 rem The path to the gif2h5 binary
set gif2h5_bin=%CD%\..\gifconv%2\%gif2h5%\%1\%gif2h5%
-set testfile1=%CD%\..\testfiles\h52giftst.h5
-set testfile2=%CD%\..\testfiles\image1.gif
+set testfile1=%CD%\testfiles\h52giftst.h5
+set testfile2=%CD%\testfiles\image1.gif
rem initialze errors variable
set errors=0
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index 2ab12a1..0ca97aa 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -1,192 +1,642 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF5. The full HDF5 copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the files COPYING and Copyright.html. COPYING can be found at the root * - * of the source code distribution tree; Copyright.html can be found at the * - * root level of an installed copy of the electronic HDF5 document set and * - * is linked from the top-level documents page. It can also be found at * - * http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have * - * access to either file, you may request a copy from help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -/* H5pubconf.h is adapted from UNIX platform and manually maintained on the windows platform. */ - -#define H5_SIZEOF___INT64 8 -#define H5_SIZEOF_CHAR 1 -#define H5_SIZEOF_DOUBLE 8 -#define H5_SIZEOF_FLOAT 4 -#define H5_SIZEOF_INT 4 -#define H5_SIZEOF_LONG 4 -#define H5_SIZEOF_LONG_DOUBLE 8 -#define H5_SIZEOF_OFF_T 4 -#define H5_SIZEOF_SHORT 2 -#ifndef _WIN64 -#define H5_SIZEOF_SIZE_T 4 -#else -#define H5_SIZEOF_SIZE_T 8 -#endif +/* windows/src/H5pubconf.h. Adapted from generated Linux src/H5pubconf.h */ +/* src/H5config.h. Generated from H5config.h.in by configure. */ +/* src/H5config.h.in. Generated from configure.in by autoheader. */ -/*#if defined __INTEL_COMPILER -#define H5_SIZEOF_LONG_DOUBLE 12 -#else*/ -/*#endif*/ +/* + * Windows Specific Definitions + */ -/*#define H5_HAVE_TM_ZONE 1 windows do not use this constant.*/ -#define H5_MALLOC_WORKS 1 -#define H5_HAVE_TIMEZONE 1 +/* Define if the Windows virtual file driver should be compiled */ +#define H5_HAVE_WINDOWS 1 -/* code warrior returns 0 in malloc(0) */ -#if defined(__MWERKS__) -#undef H5_MALLOC_WORKS -#endif +/* Define if the Windows virtual file driver should use buffered IO functions */ +/* #undef WINDOWS_USE_STDIO */ -/* -code warrior v.8 does not allow shared writing by default; -the feature can be enabled by defining -_MSL_ALLOW_SHARED_WRITING to 1 -in the file file_io.win32.c and including it on the projects -*/ -#if defined(__MWERKS__) -#define H5_NO_SHARED_WRITING -#endif +/* Define the maximum write size for the Windows file driver. Larger writes + will be split into many writes. Safe values are 1 <= WINDOWS_MAX_BUF <= 2GB-1. */ +#define WINDOWS_MAX_BUF (1024 * 1024 * 1024) +/* + * End of Windows Specific Definitions + */ + +/* Define if your system generates wrong code for log2 routine. */ +/* #undef H5_BAD_LOG2_CODE_GENERATED */ -#define H5_STDC_HEADERS 1 -/* #define H5_HAVE_ATTRIBUTE 1 */ -#undef H5_HAVE_ATTRIBUTE -#define H5_HAVE_LARGE_HSIZET 1 -#ifdef __MWERKS__ -#define H5_PRINTF_LL_WIDTH "ll" -#else -#define H5_PRINTF_LL_WIDTH "I64" -#endif +/* Define if the memory buffers being written to disk should be cleared before + writing. */ +#define H5_CLEAR_MEMORY 1 + +/* Define if your system can handle converting denormalized floating-point + values. */ +#define H5_CONVERT_DENORMAL_FLOAT 1 + +/* Define if C++ compiler recognizes offsetof */ +#define H5_CXX_HAVE_OFFSETOF 1 + +/* Define the default virtual file driver to compile */ +#define H5_DEFAULT_VFD H5FD_WINDOWS + +/* Define if `dev_t' is a scalar */ +#define H5_DEV_T_IS_SCALAR 1 + +/* Define to dummy `main' function (if any) required to link to the Fortran + libraries. */ +/* #undef H5_FC_DUMMY_MAIN */ + +/* Define if F77 and FC dummy `main' functions are identical. */ +/* #undef H5_FC_DUMMY_MAIN_EQ_F77 */ + +/* Define to a macro mangling the given C identifier (in lower and upper + case), which must not contain underscores, for linking with Fortran. */ +#define H5_FC_FUNC(name,NAME) NAME + +/* As FC_FUNC, but for C identifiers containing underscores. */ +#define H5_FC_FUNC_(name,NAME) NAME + +/* Define if your system can handle overflow converting floating-point to + integer values. */ +#define H5_FP_TO_INTEGER_OVERFLOW_WORKS 1 + +/* Define if your system roundup accurately converting floating-point to + unsigned long long values. */ +#define H5_FP_TO_ULLONG_ACCURATE 1 -#define H5_HAVE___int64 +/* Define if your system has right maximum convert floating-point to unsigned + long long values. */ +/* #undef H5_FP_TO_ULLONG_RIGHT_MAXIMUM 1 */ +/* Define if gettimeofday() populates the tz pointer passed in */ +/* #undef H5_GETTIMEOFDAY_GIVES_TZ */ +/* Define to 1 if you have the `alarm' function. */ +/* #undef H5_HAVE_ALARM */ + +/* Define if the __attribute__(()) extension is present */ +/* #undef H5_HAVE_ATTRIBUTE */ + +/* Define to 1 if you have the `BSDgettimeofday' function. */ +/* #undef H5_HAVE_BSDGETTIMEOFDAY */ + +/* Define if the function stack tracing code is to be compiled in */ +/* #undef H5_HAVE_CODESTACK */ + +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#define H5_HAVE_DECL_TZNAME 1 + +/* Define to 1 if you have the `difftime' function. */ #define H5_HAVE_DIFFTIME 1 -#define H5_HAVE_FORK 1 + +/* Define if the direct I/O virtual file driver should be compiled */ +/* #undef H5_HAVE_DIRECT */ + +/* Define to 1 if you have the <dlfcn.h> header file. */ +/* #undef H5_HAVE_DLFCN_H */ + +/* Define to 1 if you have the <dmalloc.h> header file. */ +/* #undef H5_HAVE_DMALLOC_H */ + +/* Define to 1 if you have the <features.h> header file. */ +/* #undef H5_HAVE_FEATURES_H */ + +/* Define if support for deflate (zlib) filter is enabled */ +#define H5_HAVE_FILTER_DEFLATE 1 + +/* Define if support for Fletcher32 checksum is enabled */ +#define H5_HAVE_FILTER_FLETCHER32 1 + +/* Define if support for nbit filter is enabled */ +#define H5_HAVE_FILTER_NBIT 1 + +/* Define if support for scaleoffset filter is enabled */ +#define H5_HAVE_FILTER_SCALEOFFSET 1 + +/* Define if support for shuffle filter is enabled */ +#define H5_HAVE_FILTER_SHUFFLE 1 + +/* Define if support for szip filter is enabled */ +#define H5_HAVE_FILTER_SZIP 1 + +/* Define to 1 if you have the `fork' function. */ +/* #undef H5_HAVE_FORK */ + +/* Define to 1 if you have the `frexpf' function. */ +/* #undef H5_HAVE_FREXPF */ + +/* Define to 1 if you have the `frexpl' function. */ +/* #undef H5_HAVE_FREXPL */ + +/* Define to 1 if you have the `fseek64' function. */ +/* #undef H5_HAVE_FSEEK64 */ + +/* Define to 1 if you have the `fseeko' function. */ +/* #undef H5_HAVE_FSEEKO */ + +/* Define to 1 if you have the `fstat64' function. */ +/* #undef H5_HAVE_FSTAT64 */ + +/* Define to 1 if you have the `ftello' function. */ +/* #undef H5_HAVE_FTELLO */ + +/* Define if the compiler understand the __FUNCTION__ keyword */ +#define H5_HAVE_FUNCTION 1 + +/* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */ +#define H5_HAVE_GETCONSOLESCREENBUFFERINFO 1 + +/* Define to 1 if you have the `gethostname' function. */ #define H5_HAVE_GETHOSTNAME 1 -#define H5_HAVE_IOCTL 1 + +/* Define to 1 if you have the `getpwuid' function. */ +/* #undef H5_HAVE_GETPWUID */ + +/* Define to 1 if you have the `getrusage' function. */ +/* #define H5_HAVE_GETRUSAGE 1 */ + +/* Define to 1 if you have the `gettextinfo' function. */ +/* #undef H5_HAVE_GETTEXTINFO */ + +/* Define to 1 if you have the `gettimeofday' function. */ +/* #undef H5_HAVE_GETTIMEOFDAY */ + +/* Define to 1 if you have the `get_fpc_csr' function. */ +/* #undef H5_HAVE_GET_FPC_CSR */ + +/* Define if we have GPFS support */ +/* #undef H5_HAVE_GPFS */ + +/* Define to 1 if you have the <gpfs.h> header file. */ +/* #undef H5_HAVE_GPFS_H */ + +/* Define if library will contain instrumentation to detect correct + optimization operation */ +/* #undef H5_HAVE_INSTRUMENTED_LIBRARY */ + +/* Define to 1 if you have the <inttypes.h> header file. */ +/* #undef H5_HAVE_INTTYPES_H */ + +/* Define to 1 if you have the `ioctl' function. */ +/* #undef H5_HAVE_IOCTL */ + +/* Define to 1 if you have the <io.h> header file. */ +#define H5_HAVE_IO_H + +/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ +/* #undef H5_HAVE_LIBDMALLOC */ + +/* Define to 1 if you have the `lmpe' library (-llmpe). */ +/* #undef H5_HAVE_LIBLMPE */ + +/* Define to 1 if you have the `m' library (-lm). */ +/* #undef H5_HAVE_LIBM */ + +/* Define to 1 if you have the `mpe' library (-lmpe). */ +/* #undef H5_HAVE_LIBMPE */ + +/* Define to 1 if you have the `mpi' library (-lmpi). */ +/* #undef H5_HAVE_LIBMPI */ + +/* Define to 1 if you have the `mpich' library (-lmpich). */ +/* #undef H5_HAVE_LIBMPICH */ + +/* Define to 1 if you have the `mpio' library (-lmpio). */ +/* #undef H5_HAVE_LIBMPIO */ + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* #undef H5_HAVE_LIBNSL */ + +/* Define to 1 if you have the `pthread' library (-lpthread). */ +/* #undef H5_HAVE_LIBPTHREAD */ + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef H5_HAVE_LIBSOCKET */ + +/* Define to 1 if you have the `sz' library (-lsz). */ +/* #undef H5_HAVE_LIBSZ */ + +/* Define to 1 if you have the `z' library (-lz). */ +/* #undef H5_HAVE_LIBZ */ + +/* Define to 1 if you have the `longjmp' function. */ #define H5_HAVE_LONGJMP 1 -#define H5_HAVE_SIGACTION 1 + +/* Define to 1 if you have the `lseek64' function. */ +/* #undef H5_HAVE_LSEEK64 */ + +/* Define to 1 if you have the <memory.h> header file. */ +#define H5_HAVE_MEMORY_H 1 + +/* Define if we have MPE support */ +/* #undef H5_HAVE_MPE */ + +/* Define to 1 if you have the <mpe.h> header file. */ +/* #undef H5_HAVE_MPE_H */ + +/* Define if MPI_File_get_size works correctly */ +#define H5_HAVE_MPI_GET_SIZE 1 + +/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */ +/* #undef H5_HAVE_MPI_MULTI_LANG_Comm */ + +/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */ +/* #undef H5_HAVE_MPI_MULTI_LANG_Info */ + +/* Define if we have parallel support */ +/* #undef H5_HAVE_PARALLEL */ + +/* Define to 1 if you have the <pthread.h> header file. */ +/* #undef H5_HAVE_PTHREAD_H */ + +/* Define to 1 if you have the `random' function. */ +/* #undef H5_HAVE_RANDOM */ + +/* Define to 1 if you have the `rand_r' function. */ +/* #undef H5_HAVE_RAND_R */ + +/* Define to 1 if you have the <setjmp.h> header file. */ +#define H5_HAVE_SETJMP_H 1 + +/* Define to 1 if you have the `setsysinfo' function. */ +/* #undef H5_HAVE_SETSYSINFO */ + +/* Define to 1 if you have the `sigaction' function. */ +/* #undef H5_HAVE_SIGACTION */ + +/* Define to 1 if you have the `siglongjmp' function. */ +/* #undef H5_HAVE_SIGLONGJMP */ + +/* Define to 1 if you have the `signal' function. */ #define H5_HAVE_SIGNAL 1 -#define H5_HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `snprintf' function. */ +/* #undef H5_HAVE_SNPRINTF */ + +/* Define to 1 if you have the `srandom' function. */ +/* #undef H5_HAVE_SRANDOM */ + +/* Define to 1 if you have the `stat64' function. */ +/* #undef H5_HAVE_STAT64 */ + +/* Define if `struct stat' has the `st_blocks' field */ +/* #undef H5_HAVE_STAT_ST_BLOCKS */ + +/* Define to 1 if you have the <stddef.h> header file. */ +#define H5_HAVE_STDDEF_H 1 + +/* Define to 1 if you have the <stdint.h> header file. */ +/* #undef H5_HAVE_STDINT_H */ + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define H5_HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strdup' function. */ #define H5_HAVE_STRDUP 1 + +/* Define to 1 if you have the <strings.h> header file. */ +/* #undef H5_HAVE_STRINGS_H */ + +/* Define to 1 if you have the <string.h> header file. */ +#define H5_HAVE_STRING_H 1 + +/* Define if `struct text_info' is defined */ +/* #undef H5_HAVE_STRUCT_TEXT_INFO */ + +/* Define if `struct timezone' is defined */ +/* #undef H5_HAVE_STRUCT_TIMEZONE */ + +/* Define to 1 if `tm_zone' is member of `struct tm'. */ +/* #undef H5_HAVE_STRUCT_TM_TM_ZONE */ + +/* Define if `struct videoconfig' is defined */ +/* #undef H5_HAVE_STRUCT_VIDEOCONFIG */ + +/* Define to 1 if you have the `system' function. */ #define H5_HAVE_SYSTEM 1 -#define H5_HAVE_VSNPRINTF 1 -#define H5_HAVE_IO_H 1 -#define H5_HAVE_SETJMP_H 1 -#define H5_HAVE_STDDEF_H 1 + +/* Define to 1 if you have the <sys/fpu.h> header file. */ +/* #undef H5_HAVE_SYS_FPU_H */ + +/* Define to 1 if you have the <sys/ioctl.h> header file. */ +/* #undef H5_HAVE_SYS_IOCTL_H */ + +/* Define to 1 if you have the <sys/proc.h> header file. */ +/* #undef H5_HAVE_SYS_PROC_H */ + +/* Define to 1 if you have the <sys/resource.h> header file. */ +/* #undef H5_HAVE_SYS_RESOURCE_H */ + +/* Define to 1 if you have the <sys/socket.h> header file. */ +/* #undef H5_HAVE_SYS_SOCKET_H */ + +/* Define to 1 if you have the <sys/stat.h> header file. */ #define H5_HAVE_SYS_STAT_H 1 -#define H5_HAVE_SYS_TIMEB 1 + +/* Define to 1 if you have the <sys/sysinfo.h> header file. */ +/* #undef H5_HAVE_SYS_SYSINFO_H */ + +/* Define to 1 if you have the <sys/timeb.h> header file. */ +#define H5_HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the <sys/time.h> header file. */ +/* #undef H5_HAVE_SYS_TIME_H */ + +/* Define to 1 if you have the <sys/types.h> header file. */ #define H5_HAVE_SYS_TYPES_H 1 -#define H5_HAVE_WINSOCK_H 1 -#define H5_HAVE_STATI64 1 - /* These 64-bit functions are only supported in .NET Framework 2.0 or later */ - #if _MSC_VER >= 1400 - #define H5_HAVE_FSEEKI64 1 - #define H5_HAVE_CHSIZE_S 1 - #define H5_HAVE_FTELLI64 1 - #endif /* _MSC_VER >= 1400 */ +/* Define to 1 if you have the <szlib.h> header file. */ +#define H5_HAVE_SZLIB_H 1 -/* comment the following line out if the memory buffers being written to - disk should not be cleared before writing. */ -#define H5_CLEAR_MEMORY 1 +/* Define if we have thread safe support */ +/* #undef H5_HAVE_THREADSAFE */ -/* comment the following line out if you are not using check sum filter*/ -#define H5_HAVE_FILTER_FLETCHER32 1 +/* Define if `timezone' is a global variable */ +#define H5_HAVE_TIMEZONE 1 -/* comment the following line out if you are not using shuffle filter*/ -#define H5_HAVE_FILTER_SHUFFLE 1 +/* Define if the ioctl TIOCGETD is defined */ +/* #undef H5_HAVE_TIOCGETD */ -/* comment the following line out if you are not using N-bit filter*/ -#define H5_HAVE_FILTER_NBIT 1 +/* Define if the ioctl TIOGWINSZ is defined */ +/* #undef H5_HAVE_TIOCGWINSZ */ -/* comment the following line out if you are not using N-bit filter*/ -#define H5_HAVE_FILTER_SCALEOFFSET 1 +/* Define to 1 if you have the `tmpfile' function. */ +#define H5_HAVE_TMPFILE 1 -/* comment the following two lines out if you are not using deflate(gzip) filter*/ -#define H5_HAVE_FILTER_DEFLATE 1 +/* Define if `tm_gmtoff' is a member of `struct tm' */ +/* #undef H5_HAVE_TM_GMTOFF */ + +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +/* #undef H5_HAVE_TM_ZONE */ + +/* Define to 1 if you don't have `tm_zone' but do have the external array + `tzname'. */ +#define H5_HAVE_TZNAME 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +/* #undef H5_HAVE_UNISTD_H */ + +/* Define to 1 if you have the `vasprintf' function. */ +/* #undef H5_HAVE_VASPRINTF */ + +/* Define to 1 if you have the `vsnprintf' function. */ +/* #undef H5_HAVE_VSNPRINTF */ + +/* Define to 1 if you have the `waitpid' function. */ +/* #undef H5_HAVE_WAITPID */ + +/* Define if your system has window style path name. */ +#define H5_HAVE_WINDOW_PATH 1 + +/* Define to 1 if you have the <winsock.h> header file. */ +#define H5_HAVE_WINSOCK_H 1 + +/* Define to 1 if you have the <zlib.h> header file. */ #define H5_HAVE_ZLIB_H 1 -/* comment the following two lines out if you are not using szip filter*/ -#define H5_HAVE_SZLIB_H 1 -#define H5_HAVE_FILTER_SZIP 1 +/* Define to 1 if you have the `_getvideoconfig' function. */ +/* #undef H5_HAVE__GETVIDEOCONFIG */ -/* change the following line if you would like to change the default file driver */ -#define H5_DEFAULT_VFD H5FD_WINDOWS +/* Define to 1 if you have the `_scrsize' function. */ +/* #undef H5_HAVE__SCRSIZE */ -/* comment the following line out if you don't want to build the windows file - driver */ -#define H5_HAVE_WINDOWS 1 +/* Define if `__tm_gmtoff' is a member of `struct tm' */ +/* #undef H5_HAVE___TM_GMTOFF */ -#ifdef H5_HAVE_WINDOWS +/* Define if your system can't handle converting floating-point values to long + long. */ +/* #undef H5_HW_FP_TO_LLONG_NOT_WORKS */ -/* uncomment the following line if you would like to use the buffered stdio - functions in the Windows file driver. */ -// #define WINDOWS_USE_STDIO 1 +/* Define if HDF5's high-level library headers should be included in hdf5.h */ +#define H5_INCLUDE_HL 1 -/* this value controls the maximum data written in one write call in the - * Windows file driver. Safe values are between 1 <= IO_BUF_SIZE <= 2GB-1. - * The default is 1GB. */ -#define WINDOWS_MAX_BUF 1073741824 +/* Define if your system can accurately convert from integers to long double + values. */ +#define H5_INTEGER_TO_LDOUBLE_ACCURATE 1 -#endif /* H5_HAVE_WINDOWS */ +/* Define if your system can convert long double to integers accurately. */ +#define H5_LDOUBLE_TO_INTEGER_ACCURATE 1 -/* This definition is used for alterative handelling and testing of Windows -paths. This shouldn't need to be commented or removed. */ -#define H5_HAVE_WINDOW_PATH 1 +/* Define if your system can convert from long double to integer values. */ +#define H5_LDOUBLE_TO_INTEGER_WORKS 1 + +/* Define if your system can convert long double to (unsigned) long long + values correctly. */ +#define H5_LDOUBLE_TO_LLONG_ACCURATE 1 + +/* Define if your system can convert long double to unsigned int values + correctly. */ +#define H5_LDOUBLE_TO_UINT_ACCURATE 1 + +/* Define if your system can compile long long to floating-point casts. */ +#define H5_LLONG_TO_FP_CAST_WORKS 1 + +/* Define if your system can convert (unsigned) long long to long double + values correctly. */ +#define H5_LLONG_TO_LDOUBLE_CORRECT 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define H5_LT_OBJDIR ".libs/" + +/* Define if the metadata trace file code is to be compiled in */ +/* #undef H5_METADATA_TRACE_FILE */ + +/* Define if your system can handle complicated MPI derived datatype + correctly. */ +#define H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS 1 + +/* Define if your system's `MPI_File_set_size' function works for files over + 2GB. */ +#define H5_MPI_FILE_SET_SIZE_BIG 1 + +/* Define if your system can handle special collective IO properly. */ +#define H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS 1 -/* comment the following line out if you are not using N-bit filter*/ -/* #define H5_HAVE_FILTER_NBIT 1*/ +/* Define if deprecated public API symbols are disabled */ +/* #undef H5_NO_DEPRECATED_SYMBOLS */ -#if defined(__MWERKS__) || defined(__cplusplus) -#define H5_inline inline +/* Define if shared writing must be disabled (CodeWarrior only) */ +/* #undef H5_NO_SHARED_WRITING */ + +/* Name of package */ +#define H5_PACKAGE "hdf5" + +/* Define to the address where bug reports for this package should be sent. */ +#define H5_PACKAGE_BUGREPORT "help@hdfgroup.org" + +/* Define to the full name of this package. */ +#define H5_PACKAGE_NAME "HDF5" + +/* Define to the full name and version of this package. */ +#define H5_PACKAGE_STRING "HDF5 1.9.14" + +/* Define to the one symbol short name of this package. */ +#define H5_PACKAGE_TARNAME "hdf5" + +/* Define to the version of this package. */ +#define H5_PACKAGE_VERSION "1.9.14" + +/* Width for printf() for type `long long' or `__int64', use `ll' */ +#define H5_PRINTF_LL_WIDTH "I64" + +/* The size of `char', as computed by sizeof. */ +#define H5_SIZEOF_CHAR 1 + +/* The size of `double', as computed by sizeof. */ +#define H5_SIZEOF_DOUBLE 8 + +/* The size of `float', as computed by sizeof. */ +#define H5_SIZEOF_FLOAT 4 + +/* The size of `int', as computed by sizeof. */ +#define H5_SIZEOF_INT 4 + +/* The size of `int16_t', as computed by sizeof. */ +#define H5_SIZEOF_INT16_T 0 + +/* The size of `int32_t', as computed by sizeof. */ +#define H5_SIZEOF_INT32_T 0 + +/* The size of `int64_t', as computed by sizeof. */ +#define H5_SIZEOF_INT64_T 0 + +/* The size of `int8_t', as computed by sizeof. */ +#define H5_SIZEOF_INT8_T 0 + +/* The size of `int_fast16_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_FAST16_T 0 + +/* The size of `int_fast32_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_FAST32_T 0 + +/* The size of `int_fast64_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_FAST64_T 0 + +/* The size of `int_fast8_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_FAST8_T 0 + +/* The size of `int_least16_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_LEAST16_T 0 + +/* The size of `int_least32_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_LEAST32_T 0 + +/* The size of `int_least64_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_LEAST64_T 0 + +/* The size of `int_least8_t', as computed by sizeof. */ +#define H5_SIZEOF_INT_LEAST8_T 0 + +/* The size of `long', as computed by sizeof. */ +#define H5_SIZEOF_LONG 4 + +/* The size of `long double', as computed by sizeof. */ +#define H5_SIZEOF_LONG_DOUBLE 8 + +/* The size of `long long', as computed by sizeof. */ +#define H5_SIZEOF_LONG_LONG 8 + +/* The size of `off64_t', as computed by sizeof. */ +#define H5_SIZEOF_OFF64_T 0 + +/* The size of `off_t', as computed by sizeof. */ +#define H5_SIZEOF_OFF_T 4 + +/* The size of `short', as computed by sizeof. */ +#define H5_SIZEOF_SHORT 2 + +/* The size of `size_t', as computed by sizeof. */ +#ifndef _WIN64 +#define H5_SIZEOF_SIZE_T 4 #else -#define H5_inline __inline -#endif +#define H5_SIZEOF_SIZE_T 8 +#endif /* _WIN64 */ -#if _MSC_VER >= 1300 /* .Net supports FUNCTION */ -#define H5_HAVE_FUNCTION 1 +/* The size of `ssize_t', as computed by sizeof. */ +#define H5_SIZEOF_SSIZE_T 0 + +/* The size of `uint16_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT16_T 0 + +/* The size of `uint32_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT32_T 0 + +/* The size of `uint64_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT64_T 0 + +/* The size of `uint8_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT8_T 0 + +/* The size of `uint_fast16_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_FAST16_T 0 + +/* The size of `uint_fast32_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_FAST32_T 0 + +/* The size of `uint_fast64_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_FAST64_T 0 + +/* The size of `uint_fast8_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_FAST8_T 0 + +/* The size of `uint_least16_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_LEAST16_T 0 + +/* The size of `uint_least32_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_LEAST32_T 0 + +/* The size of `uint_least64_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_LEAST64_T 0 + +/* The size of `uint_least8_t', as computed by sizeof. */ +#define H5_SIZEOF_UINT_LEAST8_T 0 + +/* The size of `__int64', as computed by sizeof. */ +#define H5_SIZEOF___INT64 8 + +/* Define to 1 if you have the ANSI C header files. */ +#define H5_STDC_HEADERS 1 + +/* Define if strict file format checks are enabled */ +/* #undef H5_STRICT_FORMAT_CHECKS */ + +/* Define if your system supports pthread_attr_setscope(&attribute, + PTHREAD_SCOPE_SYSTEM) call. */ +#define H5_SYSTEM_SCOPE_THREADS 1 + +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ +/* #undef H5_TIME_WITH_SYS_TIME */ + +/* Define to 1 if your <sys/time.h> declares `struct tm'. */ +/* #undef H5_TM_IN_SYS_TIME */ + +/* Define if your system can compile unsigned long long to floating-point + casts. */ #define H5_ULLONG_TO_FP_CAST_WORKS 1 -#define H5_HW_FP_TO_LLONG_NOT_WORKS 1 -#if defined __INTEL_COMPILER -#undef H5_LLONG_TO_FP_CAST_WORKS -#else -/*#define H5_LLONG_TO_FP_CAST_WORKS*/ -#endif -#else -#undef H5_HAVE_FUNCTION -#undef H5_ULLONG_TO_FP_CAST_WORKS -#define H5_LLONG_TO_FP_CAST_WORKS -#endif +/* Define if your system can convert unsigned long long to long double with + correct precision. */ +#define H5_ULLONG_TO_LDOUBLE_PRECISION 1 -#define H5_FC_FUNC_(name, NAME) NAME -#define FC_FUNC_(name, NAME) NAME +/* Define if your system can accurately convert unsigned (long) long values to + floating-point values. */ +/* #undef H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE */ -#define H5_HAVE_TMPFILE 1 +/* Define using v1.6 public API symbols by default */ +/* #undef H5_USE_16_API */ -/*Users want to build and test hdf5 library with thread safe enabled, - Make the following block active -*/ +/* Define if a memory checking tool will be used on the library, to cause + library to be very picky about memory operations and also disable the + internal free list manager code. */ +/* #undef H5_USING_MEMCHECKER */ -/* (Remove the comment signs to enable thread safe on windows) -#if defined _DLL -#define H5_HAVE_THREADSAFE 1 -#define H5_HAVE_SYSTEM_SCOPE_THREADS 1 -#if defined TTSAFE_H -#define sleep Sleep -#endif -#endif -*/ +/* Version number of package */ +#define H5_VERSION "1.9.14" +/* Define if vsnprintf() returns the correct value for formatted strings that + don't fit into size allowed */ +/* #undef H5_VSNPRINTF_WORKS */ /* Data accuracy is prefered to speed during data conversions */ #define H5_WANT_DATA_ACCURACY 1 @@ -194,11 +644,24 @@ paths. This shouldn't need to be commented or removed. */ /* Check exception handling functions during data conversions */ #define H5_WANT_DCONV_EXCEPTION 1 +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +/* #undef H5_WORDS_BIGENDIAN */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef H5_const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#define H5_inline __inline +#endif + +/* Define to `long int' if <sys/types.h> does not define. */ +/* #undef H5_off_t */ -/* uncomment the following line if we want parallel HDF5 support */ -/* #define H5_HAVE_PARALLEL */ +/* Define to `unsigned long' if <sys/types.h> does not define. */ +/* #undef H5_size_t */ -/* uncomment the following line if you need the library to perform "strict" - memory operations, which is useful when debugging with a memory checking - tool like Purify, etc. */ -/* #define H5_USING_MEMCHECKER 1 */ +/* Define to `long' if <sys/types.h> does not define. */ +#define H5_ssize_t long diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index 2ae5b10..cf178b1 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -38,6 +38,7 @@ set srcfile7=h5diff_dset1.h5 set srcfile8=h5diff_dset2.h5
set srcfile9=h5diff_hyper1.h5
set srcfile10=h5diff_hyper2.h5
+set srcfile11=h5diff_empty.h5
set file1=%indir%\h5diff_basic1.h5
set file2=%indir%\h5diff_basic2.h5
@@ -49,6 +50,7 @@ set file7=%indir%\h5diff_dset1.h5 set file8=%indir%\h5diff_dset2.h5
set file9=%indir%\h5diff_hyper1.h5
set file10=%indir%\h5diff_hyper2.h5
+set file11=%indir%\h5diff_empty.h5
rem The tool name
@@ -247,6 +249,10 @@ rem ############################################################################ call :testing %h5diff% -q %srcfile1% %srcfile2%
call :tooltest h5diff_18.txt -q %file1% %file2%
+ rem 1.9 contents mode
+ call :testing %h5diff% -v -c %srcfile1% %srcfile11%
+ call :tooltest h5diff_19.txt -v -c %file1% %file11%
+
rem ##############################################################################
rem # not comparable types
rem ##############################################################################
diff --git a/windows/tools/h5jam/testh5jam.bat b/windows/tools/h5jam/testh5jam.bat index 9a9c5d4..aaefe23 100644 --- a/windows/tools/h5jam/testh5jam.bat +++ b/windows/tools/h5jam/testh5jam.bat @@ -13,13 +13,13 @@ rem is linked from the top-level documents page. It can also be found at rem http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have
rem access to either file, you may request a copy from help@hdfgroup.org.
rem
-rem Tests for the h5jam tool
+rem Tests for the h5jam/h5unjam tools
rem
rem Created: Scott Wegner, 8/27/07
rem Modified:
rem
-rem We currently don't build DLL version os h5jam / h5unjam, but the test script
+rem We currently don't build DLL version of h5jam / h5unjam, but the test script
rem is setup to handle it if we ever decide to. --SJW 8/27/07
setlocal enabledelayedexpansion
@@ -61,7 +61,7 @@ set getub_bin=%CD%\%getub% set nerrors=0
set verbose=yes
-set testfiles=%CD%\..\testfiles
+set testfiles=%CD%\testfiles
goto main
diff --git a/windows/tools/h5repack/h5repack.bat b/windows/tools/h5repack/h5repack.bat index a91dcb9..30ddaab 100644 --- a/windows/tools/h5repack/h5repack.bat +++ b/windows/tools/h5repack/h5repack.bat @@ -114,7 +114,7 @@ rem was unavailable) rem Call the h5diff tool
rem
:difftest
- %h5diff_bin% -q %*
+ %h5diff_bin% -q -c %*
if %errorlevel% neq 0 (
call :verify *FAILED* %*
set /a nerrors=!nerrors!+1
|