summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2008-11-19 19:22:27 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2008-11-19 19:22:27 (GMT)
commit2f03768888ed1922105f1e5c818e545d2ebfa13e (patch)
tree31ead7dc377b7ce089496588e2121ceab611272f
parent96fd960606d61d61205dd51f14d50273583fbe6f (diff)
downloadhdf5-2f03768888ed1922105f1e5c818e545d2ebfa13e.zip
hdf5-2f03768888ed1922105f1e5c818e545d2ebfa13e.tar.gz
hdf5-2f03768888ed1922105f1e5c818e545d2ebfa13e.tar.bz2
[svn-r16104] Bug fix:
h5vers script overwrote the value for windows file; fixed
-rwxr-xr-xbin/h5vers10
-rwxr-xr-xwindows/src/H5pubconf.h6
2 files changed, 10 insertions, 6 deletions
diff --git a/bin/h5vers b/bin/h5vers
index 1cb2072..23e8185 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -192,9 +192,9 @@ my $H5PUBCONF = $file;
$H5PUBCONF =~ s/[^\/]*$/..\/windows\/src\/H5pubconf.h/;
die "unable to read file: $H5PUBCONF\n" unless -r $file;
# vms/src/h5pubconf.h
-my $H5PUBCONF = $file;
-$H5PUBCONF =~ s/[^\/]*$/..\/vms\/src\/h5pubconf.h/;
-die "unable to read file: $H5PUBCONF\n" unless -r $file;
+my $H5VMSPUBCONF = $file;
+$H5VMSPUBCONF =~ s/[^\/]*$/..\/vms\/src\/h5pubconf.h/;
+die "unable to read file: $H5VMSPUBCONF\n" unless -r $file;
# Get the current version number.
open FILE, $file or die "unable to open $file: $!\n";
@@ -243,6 +243,7 @@ if ($set) {
$RELEASE = "";
$CONFIGURE = "";
$H5PUBCONF = "";
+ $H5VMSPUBCONF = "";
$LT_VERS = "";
@newver = @curver;
}
@@ -394,6 +395,9 @@ sub gen_h5pubconf {
# Update the Windows-maintained H5pubconf.h file
gen_h5pubconf("HDF5", $H5PUBCONF, @newver) if $H5PUBCONF;
+# Update the VMS-maintained h5pubconf.h file
+gen_h5pubconf("HDF5", $H5VMSPUBCONF, @newver) if $H5VMSPUBCONF;
+
# Print the new version number
if ($verbose) {
printf("version %d.%d release %d%s\n", @newver[0,1,2],
diff --git a/windows/src/H5pubconf.h b/windows/src/H5pubconf.h
index 7bcf96d..9d1dbf5 100755
--- a/windows/src/H5pubconf.h
+++ b/windows/src/H5pubconf.h
@@ -472,13 +472,13 @@
#define H5_PACKAGE_NAME "HDF5"
/* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.8.2-snap0"
+#define H5_PACKAGE_STRING "HDF5 1.8.2-post0"
/* 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.8.2-snap0"
+#define H5_PACKAGE_VERSION "1.8.2-post0"
/* Width for printf() for type `long long' or `__int64', use `ll' */
#define H5_PRINTF_LL_WIDTH "I64"
@@ -635,7 +635,7 @@
/* #undef H5_USING_MEMCHECKER */
/* Version number of package */
-#define H5_VERSION "1.8.2-snap0"
+#define H5_VERSION "1.8.2-post0"
/* Define if vsnprintf() returns the correct value for formatted strings that
don't fit into size allowed */