[svn-r26344] Bring revisions #25870 - #25902 from trunk to revise_chunks.

h5committested.

56 files changed, 151 insertions, 194 deletions

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 651382c..095fb4b 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -4,7 +4,8 @@ include (${HDF_RESOURCES_DIR}/CMakePackageConfigHelpers.cmake)
 # Check for Installation Utilities
 #-----------------------------------------------------------------------------
 if (WIN32)
-  find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles(x86)}\\NSIS")
+  set (PF_ENV_EXT "(x86)")
+  find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles${PF_ENV_EXT}}\\NSIS")
   if(NOT CPACK_WIX_ROOT)
     file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT)
   endif()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6877b6a..8edffdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,7 +145,7 @@ set (HDF5_CPP_TST_DIR        ${HDF5_SOURCE_DIR}/c++/test)
 set (HDF5_HL_SRC_DIR         ${HDF5_SOURCE_DIR}/hl)
 set (HDF5_HL_CPP_SRC_DIR     ${HDF5_SOURCE_DIR}/hl/c++)
 set (HDF5_TOOLS_SRC_DIR      ${HDF5_SOURCE_DIR}/tools)
-set (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/perform)
+set (HDF5_PERFORM_SRC_DIR    ${HDF5_SOURCE_DIR}/tools/perform)
 set (HDF5_F90_SRC_DIR        ${HDF5_SOURCE_DIR}/fortran)
 
 if (NOT HDF5_INSTALL_BIN_DIR)
@@ -773,9 +773,9 @@ if (BUILD_TESTING)
       add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib)
       add_subdirectory (${HDF5_SOURCE_DIR}/test      ${PROJECT_BINARY_DIR}/test)
     endif (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test")
-    if (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
-      add_subdirectory (${HDF5_SOURCE_DIR}/perform   ${PROJECT_BINARY_DIR}/perform)
-    endif (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
+#    if (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
+#      add_subdirectory (${HDF5_SOURCE_DIR}/perform   ${PROJECT_BINARY_DIR}/perform)
+#    endif (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform")
     if (H5_HAVE_PARALLEL)
       if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar")
         add_subdirectory (${HDF5_SOURCE_DIR}/testpar ${PROJECT_BINARY_DIR}/testpar)
diff --git a/MANIFEST b/MANIFEST
index 8324d1b..48c5732 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -525,34 +525,6 @@
 #
 #------------------------------------------------------------------------------
 
-./perform/COPYING
-./perform/Makefile.am
-./perform/Makefile.in
-./perform/benchpar.c
-./perform/build_h5perf_alone.sh
-./perform/build_h5perf_serial_alone.sh
-./perform/chunk.c
-./perform/gen_report.pl
-./perform/iopipe.c
-./perform/overhead.c
-./perform/perf.c
-./perform/perf_meta.c
-./perform/pio_engine.c
-./perform/pio_perf.c
-./perform/pio_perf.h
-./perform/pio_standalone.c
-./perform/pio_standalone.h
-./perform/pio_timer.c
-./perform/pio_timer.h
-./perform/sio_engine.c
-./perform/sio_perf.c
-./perform/sio_perf.h
-./perform/sio_standalone.c
-./perform/sio_standalone.h
-./perform/sio_timer.c
-./perform/sio_timer.h
-./perform/zip_perf.c
-
 ./release_docs/COPYING
 ./release_docs/HISTORY-1_0-1_8_0_rc3.txt
 ./release_docs/HISTORY-1_9.txt
@@ -2284,6 +2256,34 @@
 ./tools/testfiles/h5mkgrp_single_p.ls
 ./tools/testfiles/h5mkgrp_single_l.ls
 
+./tools/perform/COPYING
+./tools/perform/Makefile.am
+./tools/perform/Makefile.in
+./tools/perform/benchpar.c
+./tools/perform/build_h5perf_alone.sh
+./tools/perform/build_h5perf_serial_alone.sh
+./tools/perform/chunk.c
+./tools/perform/gen_report.pl
+./tools/perform/iopipe.c
+./tools/perform/overhead.c
+./tools/perform/perf.c
+./tools/perform/perf_meta.c
+./tools/perform/pio_engine.c
+./tools/perform/pio_perf.c
+./tools/perform/pio_perf.h
+./tools/perform/pio_standalone.c
+./tools/perform/pio_standalone.h
+./tools/perform/pio_timer.c
+./tools/perform/pio_timer.h
+./tools/perform/sio_engine.c
+./tools/perform/sio_perf.c
+./tools/perform/sio_perf.h
+./tools/perform/sio_standalone.c
+./tools/perform/sio_standalone.h
+./tools/perform/sio_timer.c
+./tools/perform/sio_timer.h
+./tools/perform/zip_perf.c
+
 
 # high level libraries
 ./hl/COPYING
@@ -2646,8 +2646,6 @@
 ./hl/test/CMakeTests.cmake
 ./hl/tools/CMakeLists.txt
 ./hl/tools/CMakeTests.cmake
-./perform/CMakeLists.txt
-./perform/CMakeTests.cmake
 ./src/CMakeLists.txt
 ./test/CMakeLists.txt
 ./test/CMakeTests.cmake
@@ -2675,3 +2673,5 @@
 ./tools/lib/CMakeLists.txt
 ./tools/misc/CMakeLists.txt
 ./tools/misc/CMakeTests.cmake
+./tools/perform/CMakeLists.txt
+./tools/perform/CMakeTests.cmake
diff --git a/Makefile.am b/Makefile.am
index 640fdcb..aaa3b9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,13 +73,13 @@ else
 endif
 
 SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
-          $(HDF5_HL_DIR) perform
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
+          $(HDF5_HL_DIR)
+DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples
 
 # Some files generated during configure that should be cleaned
 DISTCLEANFILES=config/stamp1 config/stamp2
 
-# Some files/directories generated during check that should be cleaned
+# Some files/directories generated during checkperform  that should be cleaned
 CHECK_CLEANFILES+=*-tmp
 
 # Define rules for lib, progs, check, and tests.
@@ -93,25 +93,17 @@ lib progs check-p check-s:
 	  fi;                                                           \
 	done
 
-# Make all, tests, and (un)install also recurse into perform directory
-all-local:
-	@cd perform && $(MAKE) $(AM_MAKEFLAGS) all
-
+# Make all, tests, and (un)install also recurse into directory
 tests:
-	@@SETX@; for d in $(SUBDIRS) perform; do                        \
+	@@SETX@; for d in $(SUBDIRS); do                        \
 	  if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
 	  fi;                                                           \
-	done
-
-install-exec-local:
-	@cd perform && $(MAKE) $(AM_MAKEFLAGS) install
-uninstall-local:
-	@cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+	  done
 
 # Check-clean also recurses into examples directory
 check-clean:
-	@@SETX@; for d in $(SUBDIRS) examples perform; do               \
+	@@SETX@; for d in $(SUBDIRS) examples; do               \
 	  if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
 	  fi;                                                           \
@@ -201,4 +193,4 @@ check-vfd:
 $(top_builddir)/config.status:
 
 # Don't include conclude.am in root Makefile; tests target needs to
-# recurse into perform directory as well as reguar subdirs.
+# recurse into reguar subdirs.
diff --git a/Makefile.in b/Makefile.in
index 05e2d73..10793bb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -503,7 +503,7 @@ TRACE = perl $(top_srcdir)/bin/trace
 # .chklog files are output from those tests.
 # *.clog are from the MPE option.
 
-# Some files/directories generated during check that should be cleaned
+# Some files/directories generated during checkperform  that should be cleaned
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp
 @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = 
 
@@ -525,9 +525,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp
 @BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR = 
 @BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl
 SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \
-          $(HDF5_HL_DIR) perform
+          $(HDF5_HL_DIR)
 
-DIST_SUBDIRS = src test testpar tools . c++ fortran hl perform examples
+DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples
 
 # Some files generated during configure that should be cleaned
 DISTCLEANFILES = config/stamp1 config/stamp2
@@ -872,7 +872,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile all-local
+all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install-exec: install-exec-recursive
@@ -932,7 +932,7 @@ install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
-install-exec-am: install-exec-local
+install-exec-am:
 
 install-html: install-html-recursive
 
@@ -973,11 +973,11 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
@@ -985,14 +985,14 @@ uninstall-am: uninstall-local
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-local \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installcheck-local installdirs installdirs-am maintainer-clean \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installcheck-local \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
-	tags-am uninstall uninstall-am uninstall-local
+	tags-am uninstall uninstall-am
 
 
 # List all build rules defined by HDF5 Makefiles as "PHONY" targets here.
@@ -1017,25 +1017,17 @@ lib progs check-p check-s:
 	  fi;                                                           \
 	done
 
-# Make all, tests, and (un)install also recurse into perform directory
-all-local:
-	@cd perform && $(MAKE) $(AM_MAKEFLAGS) all
-
+# Make all, tests, and (un)install also recurse into directory
 tests:
-	@@SETX@; for d in $(SUBDIRS) perform; do                        \
+	@@SETX@; for d in $(SUBDIRS); do                        \
 	  if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
 	  fi;                                                           \
-	done
-
-install-exec-local:
-	@cd perform && $(MAKE) $(AM_MAKEFLAGS) install
-uninstall-local:
-	@cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+	  done
 
 # Check-clean also recurses into examples directory
 check-clean:
-	@@SETX@; for d in $(SUBDIRS) examples perform; do               \
+	@@SETX@; for d in $(SUBDIRS) examples; do               \
 	  if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
 	  fi;                                                           \
@@ -1125,7 +1117,7 @@ check-vfd:
 $(top_builddir)/config.status:
 
 # Don't include conclude.am in root Makefile; tests target needs to
-# recurse into perform directory as well as reguar subdirs.
+# recurse into reguar subdirs.
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/README.txt b/README.txt
index 594a021..977e5b0 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.206-swmr0 currently under development
+HDF5 version 1.9.207-swmr0 currently under development
 Please refer to the release_docs/INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index 58fd355..ec6357f 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -23,12 +23,26 @@ makelog="#${progname}_2build.log"
 testlog="#${progname}_3test.log"
 packlog="#${progname}_4pack.log"
 installlog="#${progname}_5install.log"
-srcdir="../hdf5"	# expected source directory
 exit_code=0
 
+# This command should be in the source directory's bin/
+# and should have invoked as "$srcdir/bin/$progname" or
+# "bin/$progname". So, by striping bin/$program from $0,
+# we can find $srcdir.
+if [ $0 == bin/$progname ]; then
+    srcdir="."		# current directory
+else
+    # $0 is $srdir/bin/$progname
+    srcdir=`echo $0 | sed -e s%/bin/$progname\$%%`
+fi
+# Sanity check
+if [ ! -r $srcdir/bin/$progname ]; then
+    echo "encountered error while trying to find srcdir($srdir)"
+    exit 1
+fi
+
 # Cmake build options
-hdf5_src=../hdf5
-cacheinit=$hdf5_src/config/cmake/cacheinit.cmake
+cacheinit=$srcdir/config/cmake/cacheinit.cmake
 build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF	# C++ interface default off
 build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF	# Fortran interface default off
 build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON	# High Level interface default on
@@ -189,7 +203,7 @@ STEP "Configure..." "cmake \
     $build_hl_lib \
     $build_testing \
     $build_tools \
-    $hdf5_src" $configlog
+    $srcdir" $configlog
       
 #      5. Build the C library, tools and tests with this command:
 STEP "Build the library, tools and tests, ..." "cmake --build . --config Release" $makelog
diff --git a/bin/release b/bin/release
index 68745ec..d771db6 100755
--- a/bin/release
+++ b/bin/release
@@ -40,12 +40,11 @@
 USAGE()
 {
 cat << EOF
-Usage: $0 [--nocheck] [-d <dir>] [-h] <methods> ...
+Usage: $0 -d <dir> [-h] [--nocheck] [--private] <methods> ...
    -d DIR	The name of the directory where the releas(es) should be
                 placed.
-
+   -h           print the help page.
    --nocheck	Ignore errors in MANIFEST file.
-         
    --private	Make a private release with today's date in version information.
          
 This must be run at the top level of the source directory.
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 67f87f4..953e808 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -683,7 +683,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 
 # This is our main target
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index 5ebb9cd..78c8d9b 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -12,7 +12,7 @@ set(CTEST_SOURCE_NAME ${CTEST_SCRIPT_ARG})
 set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
 set(CTEST_BUILD_CONFIGURATION "Release")
 #set(NO_MAC_FORTRAN "true")
-#set(BUILD_OPTIONS ""${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
+#set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
 #set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_ENABLE_F2003:BOOL=ON)
 set(CTEST_USE_TAR_SOURCE "true")
 
@@ -68,9 +68,8 @@ if(CTEST_USE_TAR_SOURCE)
   ## Uncompress source if tar or zip file provided
   ## --------------------------
   if(WIN32)
-    set(CTEST_7Z_COMMAND "C:/Program Files/7-Zip/7z.exe")
-    message(STATUS "extracting... [${CTEST_7Z_COMMAND} x ${CTEST_SOURCE_NAME}.zip]")
-    execute_process(COMMAND ${CTEST_7Z_COMMAND} x ${CTEST_SOURCE_NAME}.zip RESULT_VARIABLE rv)
+    message(STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip]")
+    execute_process(COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
   else(WIN32)
     message(STATUS "extracting... [${CTEST_CMAKE_COMMAND} -E tar -xvf ${CTEST_SOURCE_NAME}.tar.gz]")
     execute_process(COMMAND tar -xvf ${CTEST_SOURCE_NAME}.tar.gz RESULT_VARIABLE rv)
@@ -87,8 +86,11 @@ endif(CTEST_USE_TAR_SOURCE)
 ## Clear the build directory
 ## --------------------------
 set(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
-file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
-ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
+if (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+  ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
+else (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+  file(MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+endif (EXISTS "${CTEST_BINARY_DIRECTORY}" AND IS_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
 
 # Use multiple CPU cores to build
 include(ProcessorCount)
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 705d5f5..d86ce38 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -19,7 +19,7 @@
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/configure b/configure
index 782762c..8a885e0 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for HDF5 1.9.206-swmr0.
+# Generated by GNU Autoconf 2.69 for HDF5 1.9.207-swmr0.
 #
 # Report bugs to <help@hdfgroup.org>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='HDF5'
 PACKAGE_TARNAME='hdf5'
-PACKAGE_VERSION='1.9.206-swmr0'
-PACKAGE_STRING='HDF5 1.9.206-swmr0'
+PACKAGE_VERSION='1.9.207-swmr0'
+PACKAGE_STRING='HDF5 1.9.207-swmr0'
 PACKAGE_BUGREPORT='help@hdfgroup.org'
 PACKAGE_URL=''
 
@@ -1489,7 +1489,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures HDF5 1.9.206-swmr0 to adapt to many kinds of systems.
+\`configure' configures HDF5 1.9.207-swmr0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1559,7 +1559,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of HDF5 1.9.206-swmr0:";;
+     short | recursive ) echo "Configuration of HDF5 1.9.207-swmr0:";;
    esac
   cat <<\_ACEOF
 
@@ -1752,7 +1752,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-HDF5 configure 1.9.206-swmr0
+HDF5 configure 1.9.207-swmr0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2846,7 +2846,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by HDF5 $as_me 1.9.206-swmr0, which was
+It was created by HDF5 $as_me 1.9.207-swmr0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3717,7 +3717,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='hdf5'
- VERSION='1.9.206-swmr0'
+ VERSION='1.9.207-swmr0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -31736,7 +31736,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-HDF5 config.lt 1.9.206-swmr0
+HDF5 config.lt 1.9.207-swmr0
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -33272,7 +33272,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/testflushrefresh.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/testswmr.sh test/test_plugin.sh test/test_usecases.sh testpar/Makefile perform/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/test/test_ld.sh hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/tools/h5watch/Makefile hl/tools/h5watch/testh5watch.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh"
+ac_config_files="$ac_config_files src/libhdf5.settings Makefile src/Makefile test/Makefile test/testcheck_version.sh test/testerror.sh test/testflushrefresh.sh test/H5srcdir_str.h test/testlibinfo.sh test/testlinks_env.sh test/testswmr.sh test/test_plugin.sh test/test_usecases.sh testpar/Makefile tools/Makefile tools/h5dump/Makefile tools/h5dump/testh5dump.sh tools/h5dump/testh5dumppbits.sh tools/h5dump/testh5dumpxml.sh tools/h5ls/testh5ls.sh tools/h5import/Makefile tools/h5import/h5importtestutil.sh tools/h5diff/Makefile tools/h5diff/testh5diff.sh tools/h5diff/testph5diff.sh tools/h5jam/Makefile tools/h5jam/testh5jam.sh tools/h5repack/Makefile tools/h5repack/h5repack.sh tools/h5repack/h5repack_plugin.sh tools/h5ls/Makefile tools/h5copy/Makefile tools/h5copy/testh5copy.sh tools/lib/Makefile tools/misc/Makefile tools/misc/h5cc tools/misc/testh5mkgrp.sh tools/misc/testh5repart.sh tools/h5stat/testh5stat.sh tools/h5stat/Makefile tools/perform/Makefile examples/Makefile examples/run-c-ex.sh examples/testh5cc.sh c++/Makefile c++/src/Makefile c++/src/h5c++ c++/test/Makefile c++/test/H5srcdir_str.h c++/examples/Makefile c++/examples/run-c++-ex.sh c++/examples/testh5c++.sh fortran/Makefile fortran/src/h5fc fortran/src/Makefile fortran/test/Makefile fortran/testpar/Makefile fortran/examples/Makefile fortran/examples/run-fortran-ex.sh fortran/examples/testh5fc.sh hl/Makefile hl/src/Makefile hl/test/Makefile hl/test/H5srcdir_str.h hl/test/test_ld.sh hl/tools/Makefile hl/tools/gif2h5/Makefile hl/tools/gif2h5/h52giftest.sh hl/tools/h5watch/Makefile hl/tools/h5watch/testh5watch.sh hl/examples/Makefile hl/examples/run-hlc-ex.sh hl/c++/Makefile hl/c++/src/Makefile hl/c++/test/Makefile hl/c++/examples/Makefile hl/c++/examples/run-hlc++-ex.sh hl/fortran/Makefile hl/fortran/src/Makefile hl/fortran/test/Makefile hl/fortran/examples/Makefile hl/fortran/examples/run-hlfortran-ex.sh"
 
 
 cat >confcache <<\_ACEOF
@@ -33878,7 +33878,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by HDF5 $as_me 1.9.206-swmr0, which was
+This file was extended by HDF5 $as_me 1.9.207-swmr0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -33944,7 +33944,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-HDF5 config.status 1.9.206-swmr0
+HDF5 config.status 1.9.207-swmr0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -34555,7 +34555,6 @@ do
     "test/test_plugin.sh") CONFIG_FILES="$CONFIG_FILES test/test_plugin.sh" ;;
     "test/test_usecases.sh") CONFIG_FILES="$CONFIG_FILES test/test_usecases.sh" ;;
     "testpar/Makefile") CONFIG_FILES="$CONFIG_FILES testpar/Makefile" ;;
-    "perform/Makefile") CONFIG_FILES="$CONFIG_FILES perform/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/h5dump/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5dump/Makefile" ;;
     "tools/h5dump/testh5dump.sh") CONFIG_FILES="$CONFIG_FILES tools/h5dump/testh5dump.sh" ;;
@@ -34582,6 +34581,7 @@ do
     "tools/misc/testh5repart.sh") CONFIG_FILES="$CONFIG_FILES tools/misc/testh5repart.sh" ;;
     "tools/h5stat/testh5stat.sh") CONFIG_FILES="$CONFIG_FILES tools/h5stat/testh5stat.sh" ;;
     "tools/h5stat/Makefile") CONFIG_FILES="$CONFIG_FILES tools/h5stat/Makefile" ;;
+    "tools/perform/Makefile") CONFIG_FILES="$CONFIG_FILES tools/perform/Makefile" ;;
     "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
     "examples/run-c-ex.sh") CONFIG_FILES="$CONFIG_FILES examples/run-c-ex.sh" ;;
     "examples/testh5cc.sh") CONFIG_FILES="$CONFIG_FILES examples/testh5cc.sh" ;;
diff --git a/configure.ac b/configure.ac
index 3b1936a..e99f5f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PREREQ([2.69])
 ## NOTE: Do not forget to change the version number here when we do a
 ## release!!!
 ##
-AC_INIT([HDF5], [1.9.206-swmr0], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.9.207-swmr0], [help@hdfgroup.org])
 AC_CONFIG_SRCDIR([src/H5.c])
 AC_CONFIG_HEADER([src/H5config.h])
 
@@ -4487,7 +4487,6 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  test/test_plugin.sh
                  test/test_usecases.sh
                  testpar/Makefile
-                 perform/Makefile
                  tools/Makefile
                  tools/h5dump/Makefile
                  tools/h5dump/testh5dump.sh
@@ -4514,6 +4513,7 @@ AC_CONFIG_FILES([src/libhdf5.settings
                  tools/misc/testh5repart.sh
                  tools/h5stat/testh5stat.sh
                  tools/h5stat/Makefile
+                 tools/perform/Makefile
                  examples/Makefile
                  examples/run-c-ex.sh
                  examples/testh5cc.sh
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 11712e6..a1435be 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -734,7 +734,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 AM_FCLIBS = $(LIBHDF5)
 
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 720f3f0..fa0c332 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -675,7 +675,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 
 # This is our main target
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index bae56a5..401b637 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -690,7 +690,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 
 # Our main target, the high-level fortran library
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 54d34fe..4aa2bc8 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -671,7 +671,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 
 # This library is our main target.
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index c428136..511c56a 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.206-swmr0 currently under development
+HDF5 version 1.9.207-swmr0 currently under development
 
 
 INTRODUCTION
@@ -40,6 +40,9 @@ New Features
 
     Configuration:
     -------------
+    - cmakehdf5: configure options added to enable or disable the building of
+      different API's and testings. See "cmakehdf5 --help" for details.
+      (AKC - 2014/12/09 HDFFV-8932)
     - Autotools: Automake updated to 1.14.1 (ADB - 2014/04/08)
     - CMake: Moved minimum CMake version to 2.8.11 which enables better library
       include processing. (ADB - 2014/03/26)
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 38097c8..b7caa68 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -196,8 +196,6 @@ static const H5FD_class_t H5FD_multi_g = {
  * Programmer:	Robb Matzke
  *              Friday, August 13, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static char *
@@ -230,8 +228,6 @@ my_strdup(const char *s)
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 hid_t
@@ -283,14 +279,6 @@ H5FD_multi_term(void)
  * Programmer:	Robb Matzke
  *              Wednesday, August 11, 1999
  *
- * Modifications:
- *	Albert Cheng, Sep 17, 2001
- *	Added feature that if the raw or meta extension string contains
- *	a "%s", it will be substituted by the filename given for H5Fopen
- *	or H5Fcreate.  This is same as the multi-file syntax.  If no %s
- *	is found, one is inserted at the beginning.  This is the previous
- *	behavior.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -440,11 +428,6 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
- *		Raymond Lu, 2001-10-25
- *		Use new generic property list for argument checking.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -547,11 +530,6 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
- *              Raymond Lu, 2001-10-25
- *              Use new generic property list for argument checking.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -616,8 +594,6 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
  * Programmer:	Robb Matzke
  *              Monday, August 16, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static hsize_t
@@ -669,8 +645,6 @@ H5FD_multi_sb_size(H5FD_t *_file)
  * Programmer:	Robb Matzke
  *              Monday, August 16, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -908,8 +882,6 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf)
  * Programmer:	Robb Matzke
  *              Friday, August 13, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void *
@@ -936,8 +908,6 @@ H5FD_multi_fapl_get(H5FD_t *_file)
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void *
@@ -992,8 +962,6 @@ H5FD_multi_fapl_copy(const void *_old_fa)
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1032,8 +1000,6 @@ H5FD_multi_fapl_free(void *_fa)
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
@@ -1132,8 +1098,6 @@ error:
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1197,8 +1161,6 @@ H5FD_multi_close(H5FD_t *_file)
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1240,8 +1202,6 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  * Programmer:	Quincey Koziol
  *              Tuesday, September 26, 2000
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1315,7 +1275,6 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
 {
     const H5FD_multi_t	*file = (const H5FD_multi_t*)_file;
     haddr_t eoa = 0;
-    haddr_t memb_eoa = 0;
     static const char *func="H5FD_multi_get_eoa";  /* Function Name for error reporting */
 
     /* Clear the error stack */
@@ -1329,21 +1288,25 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
      */
     if(H5FD_MEM_DEFAULT == type) {
         UNIQUE_MEMBERS(file->fa.memb_map, mt) {
+            haddr_t memb_eoa;
+
 	    if (file->memb[mt]) {
                 /* Retrieve EOA */
 	        H5E_BEGIN_TRY {
                     memb_eoa = H5FDget_eoa(file->memb[mt], mt);
 	        } H5E_END_TRY;
 
-	        if (HADDR_UNDEF==memb_eoa)
+	        if(HADDR_UNDEF == memb_eoa)
                     H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa", HADDR_UNDEF)
-	    } else if (file->fa.relax) {
+                if(memb_eoa>0)
+                    memb_eoa += file->fa.memb_addr[mt];
+	    } else if(file->fa.relax) {
 	        /*
 	         * The member is not open yet (maybe it doesn't exist). Make the
 	         * best guess about the end-of-file.
 	         */
 	        memb_eoa = file->memb_next[mt];
-	        assert(HADDR_UNDEF!=memb_eoa);
+	        assert(HADDR_UNDEF != memb_eoa);
 	    } else {
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF)
 	    }
@@ -1353,23 +1316,26 @@ H5FD_multi_get_eoa(const H5FD_t *_file, H5FD_mem_t type)
         } END_MEMBERS;
     } else {
         H5FD_mem_t mmt = file->fa.memb_map[type];
-        if (H5FD_MEM_DEFAULT==mmt) mmt = type;
 
-	if (file->memb[mmt]) {
+        if(H5FD_MEM_DEFAULT==mmt)
+            mmt = type;
+
+	if(file->memb[mmt]) {
             H5E_BEGIN_TRY {
 	        eoa = H5FDget_eoa(file->memb[mmt], mmt);
             } H5E_END_TRY;
 
-	    if (HADDR_UNDEF==eoa)
+	    if(HADDR_UNDEF == eoa)
                 H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "member file has unknown eoa", HADDR_UNDEF)
-	    if (eoa>0) eoa += file->fa.memb_addr[mmt];
-	} else if (file->fa.relax) {
+	    if(eoa > 0)
+                eoa += file->fa.memb_addr[mmt];
+	} else if(file->fa.relax) {
 	    /*
 	     * The member is not open yet (maybe it doesn't exist). Make the
 	     * best guess about the end-of-file.
 	     */
 	    eoa = file->memb_next[mmt];
-	    assert(HADDR_UNDEF!=eoa);
+	    assert(HADDR_UNDEF != eoa);
 	 } else {
             H5Epush_ret(func, H5E_ERR_CLS, H5E_INTERNAL, H5E_BADVALUE, "bad eoa", HADDR_UNDEF)
 	 }
@@ -1461,12 +1427,6 @@ H5FD_multi_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t eoa)
  * Programmer:	Robb Matzke
  *              Wednesday, August  4, 1999
  *
- * Modifications:
- *              Raymond Lu
- *              5 January 2007
- *              Multi driver no longer has EOA for the whole file.  Calculate
- *              it in the same way as EOF instead.
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -1531,8 +1491,6 @@ H5FD_multi_get_eof(const H5FD_t *_file)
  * Programmer:     Raymond Lu
  *                 Sept. 16, 2002
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1566,8 +1524,6 @@ H5FD_multi_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
  * Programmer:	Robb Matzke
  *              Thursday, August 12, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static haddr_t
@@ -1615,8 +1571,6 @@ H5FD_multi_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
  * Programmer:	Robb Matzke
  *              Thursday, August 12, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1867,8 +1821,6 @@ H5FD_multi_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
  * Programmer:	Robb Matzke
  *              Monday, August 23, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -1910,8 +1862,6 @@ compute_next(H5FD_multi_t *file)
  * Programmer:	Robb Matzke
  *              Monday, August 23, 1999
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index dd239b0..ddcc680 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -121,7 +121,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata)
     H5F_file_t         *shared;             /* shared part of `file'        */
     H5FD_t             *lf;                 /* file driver part of `shared' */
     haddr_t             stored_eoa;         /*relative end-of-addr in file  */
-    haddr_t             eof;                /*end of file address           */
+    haddr_t             eof;                /* end of file address           */
     uint8_t             sizeof_addr;        /* Size of offsets in the file (in bytes) */
     uint8_t             sizeof_size;        /* Size of lengths in the file (in bytes) */
     const size_t        fixed_size = H5F_SUPERBLOCK_FIXED_SIZE; /*fixed sizeof superblock   */
diff --git a/src/H5public.h b/src/H5public.h
index 6661534..1e768fe 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -94,10 +94,10 @@ extern "C" {
 /* Version numbers */
 #define H5_VERS_MAJOR	1	/* For major interface/format changes  	     */
 #define H5_VERS_MINOR	9	/* For minor interface/format changes  	     */
-#define H5_VERS_RELEASE	206	/* For tweaks, bug-fixes, or development     */
+#define H5_VERS_RELEASE	207	/* For tweaks, bug-fixes, or development     */
 #define H5_VERS_SUBRELEASE "swmr0"	/* For pre-releases like snap0       */
 				/* Empty string for real releases.           */
-#define H5_VERS_INFO    "HDF5 library version: 1.9.206-swmr0"      /* Full version string */
+#define H5_VERS_INFO    "HDF5 library version: 1.9.207-swmr0"      /* Full version string */
 
 #define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				        H5_VERS_RELEASE)
diff --git a/src/Makefile.in b/src/Makefile.in
index de78249..10d52cb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -736,7 +736,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 # After making changes, run bin/reconfigure to update other configure related
 # files like Makefile.in.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 196
+LT_VERS_REVISION = 197
 LT_VERS_AGE = 0
 
 # Our main target, the HDF5 library
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 080112c..7fa88c1 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -5717,7 +5717,6 @@ smoke_check_3(int metadata_write_strategy)
 {
     const char * fcn_name = "smoke_check_3()";
     hbool_t success = TRUE;
-    hbool_t verbose = FALSE;
     int cp = 0;
     int i;
     int max_nerrors;
@@ -6402,7 +6401,6 @@ smoke_check_5(int metadata_write_strategy)
 {
     const char * fcn_name = "smoke_check_5()";
     hbool_t success = TRUE;
-    hbool_t verbose = FALSE;
     int cp = 0;
     int i;
     int max_nerrors;
@@ -7126,7 +7124,7 @@ main(int argc, char **argv)
      * calls.  By then, MPI calls may not work.
      */
     if (H5dont_atexit() < 0){
-	printf("Failed to turn off atexit processing. Continue.\n", mpi_rank);
+	printf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a9a8c49..2365326 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -44,3 +44,6 @@ add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5stat)
 
 #-- Add the h5dump and test executables
 add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/h5dump)
+
+#-- Add the perform and test executables
+add_subdirectory (${HDF5_TOOLS_SOURCE_DIR}/perform)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 76b32d2..095cc30 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,6 +24,7 @@ include $(top_srcdir)/config/commence.am
 CONFIG=ordered
 
 # All subdirectories
-SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat
+SUBDIRS=lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
+    perform
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 0b0e2d0..c4bf941 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -667,7 +667,9 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 CONFIG = ordered
 
 # All subdirectories
-SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat
+SUBDIRS = lib h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
+    perform
+
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
diff --git a/perform/CMakeLists.txt b/tools/perform/CMakeLists.txt
index 6887c60..6887c60 100644
--- a/perform/CMakeLists.txt
+++ b/tools/perform/CMakeLists.txt
diff --git a/perform/CMakeTests.cmake b/tools/perform/CMakeTests.cmake
index 74055d5..74055d5 100644
--- a/perform/CMakeTests.cmake
+++ b/tools/perform/CMakeTests.cmake
diff --git a/perform/COPYING b/tools/perform/COPYING
index 6903daf..6903daf 100644
--- a/perform/COPYING
+++ b/tools/perform/COPYING
diff --git a/perform/Makefile.am b/tools/perform/Makefile.am
index 59c598a..59c598a 100644
--- a/perform/Makefile.am
+++ b/tools/perform/Makefile.am
diff --git a/perform/Makefile.in b/tools/perform/Makefile.in
index 8db63de..1244e27 100644
--- a/perform/Makefile.in
+++ b/tools/perform/Makefile.in
@@ -109,7 +109,7 @@ check_PROGRAMS = iopipe$(EXEEXT) chunk$(EXEEXT) overhead$(EXEEXT) \
 	zip_perf$(EXEEXT) perf_meta$(EXEEXT) $(am__EXEEXT_2) \
 	perf$(EXEEXT)
 TESTS = $(am__EXEEXT_3)
-subdir = perform
+subdir = tools/perform
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -772,9 +772,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign perform/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tools/perform/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign perform/Makefile
+	  $(AUTOMAKE) --foreign tools/perform/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/perform/benchpar.c b/tools/perform/benchpar.c
index b75006a..b75006a 100644
--- a/perform/benchpar.c
+++ b/tools/perform/benchpar.c
diff --git a/perform/build_h5perf_alone.sh b/tools/perform/build_h5perf_alone.sh
index b65e863..b65e863 100755
--- a/perform/build_h5perf_alone.sh
+++ b/tools/perform/build_h5perf_alone.sh
diff --git a/perform/build_h5perf_serial_alone.sh b/tools/perform/build_h5perf_serial_alone.sh
index 2566609..2566609 100755
--- a/perform/build_h5perf_serial_alone.sh
+++ b/tools/perform/build_h5perf_serial_alone.sh
diff --git a/perform/chunk.c b/tools/perform/chunk.c
index a3c11c1..a3c11c1 100644
--- a/perform/chunk.c
+++ b/tools/perform/chunk.c
diff --git a/perform/gen_report.pl b/tools/perform/gen_report.pl
index 285f5d7..285f5d7 100755
--- a/perform/gen_report.pl
+++ b/tools/perform/gen_report.pl
diff --git a/perform/iopipe.c b/tools/perform/iopipe.c
index 85063fa..85063fa 100644
--- a/perform/iopipe.c
+++ b/tools/perform/iopipe.c
diff --git a/perform/overhead.c b/tools/perform/overhead.c
index 9341e64..9341e64 100644
--- a/perform/overhead.c
+++ b/tools/perform/overhead.c
diff --git a/perform/perf.c b/tools/perform/perf.c
index 7d329f0..7d329f0 100644
--- a/perform/perf.c
+++ b/tools/perform/perf.c
diff --git a/perform/perf_meta.c b/tools/perform/perf_meta.c
index b52871e..b52871e 100644
--- a/perform/perf_meta.c
+++ b/tools/perform/perf_meta.c
diff --git a/perform/pio_engine.c b/tools/perform/pio_engine.c
index 3535fb4..3535fb4 100644
--- a/perform/pio_engine.c
+++ b/tools/perform/pio_engine.c
diff --git a/perform/pio_perf.c b/tools/perform/pio_perf.c
index cf41cbe..cf41cbe 100644
--- a/perform/pio_perf.c
+++ b/tools/perform/pio_perf.c
diff --git a/perform/pio_perf.h b/tools/perform/pio_perf.h
index 3295e2b..3295e2b 100644
--- a/perform/pio_perf.h
+++ b/tools/perform/pio_perf.h
diff --git a/perform/pio_standalone.c b/tools/perform/pio_standalone.c
index e404274..e404274 100644
--- a/perform/pio_standalone.c
+++ b/tools/perform/pio_standalone.c
diff --git a/perform/pio_standalone.h b/tools/perform/pio_standalone.h
index 584a057..584a057 100644
--- a/perform/pio_standalone.h
+++ b/tools/perform/pio_standalone.h
diff --git a/perform/pio_timer.c b/tools/perform/pio_timer.c
index aba219e..aba219e 100644
--- a/perform/pio_timer.c
+++ b/tools/perform/pio_timer.c
diff --git a/perform/pio_timer.h b/tools/perform/pio_timer.h
index a5ee6d7..a5ee6d7 100644
--- a/perform/pio_timer.h
+++ b/tools/perform/pio_timer.h
diff --git a/perform/sio_engine.c b/tools/perform/sio_engine.c
index 07e6b16c..07e6b16c 100644
--- a/perform/sio_engine.c
+++ b/tools/perform/sio_engine.c
diff --git a/perform/sio_perf.c b/tools/perform/sio_perf.c
index 26cec6d..26cec6d 100644
--- a/perform/sio_perf.c
+++ b/tools/perform/sio_perf.c
diff --git a/perform/sio_perf.h b/tools/perform/sio_perf.h
index b40fed3..b40fed3 100644
--- a/perform/sio_perf.h
+++ b/tools/perform/sio_perf.h
diff --git a/perform/sio_standalone.c b/tools/perform/sio_standalone.c
index d92ed30..d92ed30 100644
--- a/perform/sio_standalone.c
+++ b/tools/perform/sio_standalone.c
diff --git a/perform/sio_standalone.h b/tools/perform/sio_standalone.h
index b2f8220..b2f8220 100644
--- a/perform/sio_standalone.h
+++ b/tools/perform/sio_standalone.h
diff --git a/perform/sio_timer.c b/tools/perform/sio_timer.c
index 4e42ee6..4e42ee6 100644
--- a/perform/sio_timer.c
+++ b/tools/perform/sio_timer.c
diff --git a/perform/sio_timer.h b/tools/perform/sio_timer.h
index 46702c3..46702c3 100644
--- a/perform/sio_timer.h
+++ b/tools/perform/sio_timer.h
diff --git a/perform/zip_perf.c b/tools/perform/zip_perf.c
index edd5b0f..edd5b0f 100644
--- a/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 146be54..b4d36f1 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -501,7 +501,7 @@
 #define H5_PACKAGE_NAME "HDF5"
 
 /* Define to the full name and version of this package. */
-#define H5_PACKAGE_STRING "HDF5 1.9.206-swmr0"
+#define H5_PACKAGE_STRING "HDF5 1.9.207-swmr0"
 
 /* Define to the one symbol short name of this package. */
 #define H5_PACKAGE_TARNAME "hdf5"
@@ -510,7 +510,7 @@
 #define H5_PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define H5_PACKAGE_VERSION "1.9.206-swmr0"
+#define H5_PACKAGE_VERSION "1.9.207-swmr0"
 
 /* Width for printf() for type `long long' or `__int64', use `ll' */
 #define H5_PRINTF_LL_WIDTH "ll"
@@ -673,7 +673,7 @@
 /* #undef H5_USING_MEMCHECKER */
 
 /* Version number of package */
-#define H5_VERSION "1.9.206-swmr0"
+#define H5_VERSION "1.9.207-swmr0"
 
 /* Define if vsnprintf() returns the correct value for formatted strings that
    don't fit into size allowed */