diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-08 15:30:10 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-08 15:30:10 (GMT) |
| commit | 13d61651f8bfba0739aac1cad17d4b11affb59ae (patch) | |
| tree | 78dd33346cc19aa02ade365659e2ba37b62c0d17 /windows | |
| parent | 42efc1c2b591e4cd45ec6cb3bdf32044343118d2 (diff) | |
| download | hdf5-13d61651f8bfba0739aac1cad17d4b11affb59ae.zip hdf5-13d61651f8bfba0739aac1cad17d4b11affb59ae.tar.gz hdf5-13d61651f8bfba0739aac1cad17d4b11affb59ae.tar.bz2 | |
[svn-r18534] Description:
Bring r18446:18533 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/misc/typegen/h5libsettings/h5libsettings.vcproj | 12 | ||||
| -rw-r--r-- | windows/proj/hdf5/hdf5.vcproj | 4 | ||||
| -rw-r--r-- | windows/proj/hdf5dll/hdf5dll.vcproj | 4 | ||||
| -rwxr-xr-x | windows/src/H5pubconf.h | 6 |
4 files changed, 17 insertions, 9 deletions
diff --git a/windows/misc/typegen/h5libsettings/h5libsettings.vcproj b/windows/misc/typegen/h5libsettings/h5libsettings.vcproj index 0077340..6f19395 100644 --- a/windows/misc/typegen/h5libsettings/h5libsettings.vcproj +++ b/windows/misc/typegen/h5libsettings/h5libsettings.vcproj @@ -195,8 +195,8 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Generating H5lib_settings.h"
- CommandLine="if not exist "$(TargetDir)..\..\H5lib_settings.h" "$(TargetPath)" > "$(TargetDir)..\..\H5lib_settings.h""
+ Description="Generating H5lib_settings.c"
+ CommandLine="if not exist "$(TargetDir)..\..\H5lib_settings.c" "$(TargetPath)" > "$(TargetDir)..\..\H5lib_settings.c""
/>
</Configuration>
<Configuration
@@ -285,8 +285,8 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Generating H5lib_settings.h"
- CommandLine="if not exist "$(TargetDir)..\..\H5lib_settings.h" "$(TargetPath)" > "$(TargetDir)..\..\H5lib_settings.h""
+ Description="Generating H5lib_settings.c"
+ CommandLine="if not exist "$(TargetDir)..\..\H5lib_settings.c" "$(TargetPath)" > "$(TargetDir)..\..\H5lib_settings.c""
/>
</Configuration>
<Configuration
@@ -376,8 +376,8 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Generating H5lib_settings.h"
- CommandLine="if not exist "$(TargetDir)..\..\H5lib_settings.h" "$(TargetPath)" > "$(TargetDir)..\..\H5lib_settings.h""
+ Description="Generating H5lib_settings.c"
+ CommandLine="if not exist "$(TargetDir)..\..\H5lib_settings.c" "$(TargetPath)" > "$(TargetDir)..\..\H5lib_settings.c""
/>
</Configuration>
</Configurations>
diff --git a/windows/proj/hdf5/hdf5.vcproj b/windows/proj/hdf5/hdf5.vcproj index 4112451..2bc2d64 100644 --- a/windows/proj/hdf5/hdf5.vcproj +++ b/windows/proj/hdf5/hdf5.vcproj @@ -866,6 +866,10 @@ >
</File>
<File
+ RelativePath="..\..\..\src\H5lib_settings.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\H5MF.c"
>
</File>
diff --git a/windows/proj/hdf5dll/hdf5dll.vcproj b/windows/proj/hdf5dll/hdf5dll.vcproj index e2ed985..c755e83 100644 --- a/windows/proj/hdf5dll/hdf5dll.vcproj +++ b/windows/proj/hdf5dll/hdf5dll.vcproj @@ -953,6 +953,10 @@ >
</File>
<File
+ RelativePath="..\..\..\src\H5lib_settings.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\H5MF.c"
>
</File>
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h index c1f2a8c..8b3eb55 100755 --- a/windows/src/H5pubconf.h +++ b/windows/src/H5pubconf.h @@ -479,13 +479,13 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.9.64-FA_a4" +#define H5_PACKAGE_STRING "HDF5 1.9.66-FA_a4" /* 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.64-FA_a4" +#define H5_PACKAGE_VERSION "1.9.66-FA_a4" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "I64" @@ -642,7 +642,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.9.64-FA_a4" +#define H5_VERSION "1.9.66-FA_a4" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ |