[svn-r29412] HDFFV-9717: add overview section to javadocs

Add Java and update options to CMake/Windows docs

13 files changed, 315 insertions, 122 deletions

diff --git a/MANIFEST b/MANIFEST
index d97f93c..75cf9cf 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2666,6 +2666,7 @@
 ./java/src/jni/h5zImp.h
 
 ./java/src/hdf/CMakeLists.txt
+./java/src/hdf/overview.html
 ./java/src/hdf/hdf5lib/CMakeLists.txt
 
 ./java/src/hdf/hdf5lib/callbacks/Callbacks.java
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index 1be5c65..135dcfc 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -37,9 +37,13 @@ if(NOT DEFINED CTEST_SOURCE_NAME)
 endif()
 if(NOT DEFINED STATIC_LIBRARIES)
     set(STATICLIBRARIES "YES")
+else(NOT DEFINED STATIC_LIBRARIES)
+    set(STATICLIBRARIES "NO")
 endif()
 if(NOT DEFINED FORTRAN_LIBRARIES)
     set(FORTRANLIBRARIES "NO")
+else(NOT DEFINED FORTRAN_LIBRARIES)
+    set(FORTRANLIBRARIES "YES")
 endif()
 
 #TAR_SOURCE - name of tarfile
diff --git a/config/cmake/UseJava.cmake b/config/cmake/UseJava.cmake
index d694517..9b2b1e0 100644
--- a/config/cmake/UseJava.cmake
+++ b/config/cmake/UseJava.cmake
@@ -184,7 +184,7 @@
 #                       This is used by install_jni_symlink().
 #    JAR_FILE           The location of the jar file so that you can include
 #                       it.
-#    CLASS_DIR          The directory where the class files can be found. For
+#    CLASSDIR           The directory where the class files can be found. For
 #                       example to use them with javah.
 #
 # ::
@@ -444,7 +444,7 @@ function(add_jar _TARGET_NAME)
 
     if (_add_jar_MANIFEST)
         set(_MANIFEST_OPTION m)
-        set(_MANIFEST_VALUE ${_add_jar_MANIFEST})
+        get_filename_component (_MANIFEST_VALUE "${_add_jar_MANIFEST}" ABSOLUTE)
     endif ()
 
     if (LIBRARY_OUTPUT_PATH)
@@ -865,6 +865,7 @@ endfunction ()
 function(create_javadoc _target)
     set(_javadoc_packages)
     set(_javadoc_files)
+    set(_javadoc_overview)
     set(_javadoc_sourcepath)
     set(_javadoc_classpath)
     set(_javadoc_installpath "${CMAKE_INSTALL_PREFIX}/share/javadoc")
@@ -884,6 +885,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -907,6 +910,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -929,6 +934,8 @@ function(create_javadoc _target)
                 set(_state "packages")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -951,6 +958,8 @@ function(create_javadoc _target)
                 set(_state "packages")
             elseif (${arg} STREQUAL "FILES")
                 set(_state "files")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -975,6 +984,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "INSTALLPATH")
                 set(_state "installpath")
             elseif (${arg} STREQUAL "DOCTITLE")
@@ -997,6 +1008,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "DOCTITLE")
                 set(_state "doctitle")
             elseif (${arg} STREQUAL "WINDOWTITLE")
@@ -1017,6 +1030,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "INSTALLPATH")
                 set(_state "installpath")
             elseif (${arg} STREQUAL "CLASSPATH")
@@ -1039,6 +1054,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -1061,6 +1078,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -1085,6 +1104,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -1109,6 +1130,8 @@ function(create_javadoc _target)
                 set(_state "files")
             elseif (${arg} STREQUAL "SOURCEPATH")
                 set(_state "sourcepath")
+            elseif (${arg} STREQUAL "OVERVIEW")
+                set(_state "overview")
             elseif (${arg} STREQUAL "CLASSPATH")
                 set(_state "classpath")
             elseif (${arg} STREQUAL "INSTALLPATH")
@@ -1126,6 +1149,30 @@ function(create_javadoc _target)
             else ()
                 set(_javadoc_version ${arg})
             endif ()
+        elseif (${_state} STREQUAL "overview")
+            if (${arg} STREQUAL "PACKAGES")
+                set(_state "packages")
+            elseif (${arg} STREQUAL "FILES")
+                set(_state "files")
+            elseif (${arg} STREQUAL "SOURCEPATH")
+                set(_state "sourcepath")
+            elseif (${arg} STREQUAL "CLASSPATH")
+                set(_state "classpath")
+            elseif (${arg} STREQUAL "INSTALLPATH")
+                set(_state "installpath")
+            elseif (${arg} STREQUAL "DOCTITLE")
+                set(_state "doctitle")
+            elseif (${arg} STREQUAL "WINDOWTITLE")
+                set(_state "windowtitle")
+            elseif (${arg} STREQUAL "AUTHOR")
+                set(_state "author")
+            elseif (${arg} STREQUAL "USE")
+                set(_state "use")
+            elseif (${arg} STREQUAL "VERSION")
+                set(_state "version")
+            else ()
+                list(APPEND _javadoc_overview ${arg})
+            endif ()
         endif ()
     endforeach ()
 
@@ -1145,6 +1192,19 @@ function(create_javadoc _target)
         set(_javadoc_options ${_javadoc_options} -sourcepath ${_sourcepath})
     endif ()
 
+    if (_javadoc_overview)
+        set(_start TRUE)
+        foreach(_path ${_javadoc_overview})
+            if (_start)
+                set(_overview ${_path})
+                set(_start FALSE)
+            else ()
+                set(_overview ${_overview}:${_path})
+            endif ()
+        endforeach()
+        set(_javadoc_options ${_javadoc_options} -overview ${_overview})
+    endif ()
+
     if (_javadoc_classpath)
         set(_start TRUE)
         foreach(_path ${_javadoc_classpath})
@@ -1212,7 +1272,7 @@ function (create_javah)
 
     set (_output_files)
     if (WIN32 AND NOT CYGWIN AND CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
-      set(_classpath_sep ";")
+      set(_classpath_sep "$<SEMICOLON>")
     else ()
       set(_classpath_sep ":")
     endif()
@@ -1242,7 +1302,7 @@ function (create_javah)
         endif()
       endforeach()
       string (REPLACE ";" "${_classpath_sep}" _classpath "${_classpath}")
-      list (APPEND _javah_options -classpath ${_classpath})
+      list (APPEND _javah_options -classpath "${_classpath}")
     endif()
 
     if (_create_javah_OUTPUT_DIR)
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index 8bcc56b..cdbbbf5 100755
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -1,13 +1,13 @@
 #############################################################################################

 ### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###

 ### BUILD_GENERATOR required [Unix, VS2015, VS201564, VS2013, VS201364, VS2012, VS201264] ###

-### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf519.log        ###

+### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf5.log          ###

 #############################################################################################

 

 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)

 ############################################################################

 # Usage:

-#     ctest -S HDF518config.cmake,OPTION=VALUE -C Release -VV -O test.log

+#     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log

 # where valid options for OPTION are:

 #     BUILD_GENERATOR - The cmake build generator:

 #            Unix    * Unix Makefiles

@@ -23,20 +23,22 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 #     CTEST_SOURCE_NAME  -  source folder

 #     STATIC_LIBRARIES  -  Build/use static libraries

 #     FORTRAN_LIBRARIES -  Build/use fortran libraries

+#     JAVA_LIBRARIES -  Build/use java libraries

 #     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac

 ##############################################################################

 

-set(CTEST_SOURCE_VERSION 1.9)

-set(CTEST_SOURCE_VERSEXT "")

+set(CTEST_SOURCE_VERSION 1.10.0)

+set(CTEST_SOURCE_VERSEXT "-pre1")

 

 ##############################################################################

 # handle input parameters to script.

 #BUILD_GENERATOR - which CMake generator to use, required

-#INSTALLDIR - HDF5-1.9 root folder

+#INSTALLDIR - HDF5-1.10.0 root folder

 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo

-#CTEST_SOURCE_NAME - name of source folder; HDF5-1.9

+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0

 #STATIC_LIBRARIES - Default is YES

 #FORTRAN_LIBRARIES - Default is NO

+#JAVA_LIBRARIES - Default is NO

 #NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac

 if(DEFINED CTEST_SCRIPT_ARG)

     # transform ctest script arguments of the form

@@ -88,9 +90,18 @@ if(NOT DEFINED CTEST_SOURCE_NAME)
 endif()

 if(NOT DEFINED STATIC_LIBRARIES)

     set(STATICLIBRARIES "YES")

+else()

+    set(STATICLIBRARIES "NO")

 endif()

 if(NOT DEFINED FORTRAN_LIBRARIES)

     set(FORTRANLIBRARIES "NO")

+else()

+    set(FORTRANLIBRARIES "YES")

+endif()

+if(NOT DEFINED JAVA_LIBRARIES)

+    set(JAVALIBRARIES "NO")

+else()

+    set(JAVALIBRARIES "YES")

 endif()

 

 set(CTEST_BINARY_NAME "build")

@@ -200,6 +211,12 @@ if(${FORTRANLIBRARIES})
 else()

   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")

 endif()

+####      java       ####

+if(${JAVALIBRARIES})

+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=ON")

+else()

+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=OFF")

+endif()

 

 ### disable test program builds

 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF")

diff --git a/java/src/Makefile.am b/java/src/Makefile.am
index 6a33724..ff8b01a 100644
--- a/java/src/Makefile.am
+++ b/java/src/Makefile.am
@@ -123,7 +123,7 @@ DOCTITLE = '<h1>HDF5 Java Wrapper</h1>'
 SRCDIR = '$(pkgpath)'
 
 docs:
-	$(JAVADOC) -sourcepath $(srcdir) -d javadoc -use -splitIndex -windowtitle $(WINDOWTITLE) -doctitle $(DOCTITLE) -J-Xmx180m -verbose -classpath $(CLASSPATH_ENV) hdf.hdf5lib
+	$(JAVADOC) -sourcepath $(srcdir) -d javadoc -use -splitIndex -windowtitle $(WINDOWTITLE) -doctitle $(DOCTITLE) -J-Xmx180m -verbose -overview $(top_srcdir)/java/src/hdf/overview.html -classpath $(CLASSPATH_ENV) hdf.hdf5lib
 
 CLEANFILES = classhdf5_java.stamp $(jarfile) $(JAVAROOT)/$(pkgpath)/callbacks/*.class $(JAVAROOT)/$(pkgpath)/exceptions/*.class $(JAVAROOT)/$(pkgpath)/structs/*.class $(JAVAROOT)/$(pkgpath)/*.class
 
diff --git a/java/src/Makefile.in b/java/src/Makefile.in
index 8fdb72d..5d7667d 100644
--- a/java/src/Makefile.in
+++ b/java/src/Makefile.in
@@ -1033,7 +1033,7 @@ $(jarfile): classhdf5_java.stamp classes docs
 .PHONY: docs classes
 
 docs:
-	$(JAVADOC) -sourcepath $(srcdir) -d javadoc -use -splitIndex -windowtitle $(WINDOWTITLE) -doctitle $(DOCTITLE) -J-Xmx180m -verbose -classpath $(CLASSPATH_ENV) hdf.hdf5lib
+	$(JAVADOC) -sourcepath $(srcdir) -d javadoc -use -splitIndex -windowtitle $(WINDOWTITLE) -doctitle $(DOCTITLE) -J-Xmx180m -verbose -overview $(top_srcdir)/java/src/hdf/overview.html -classpath $(CLASSPATH_ENV) hdf.hdf5lib
 
 clean:
 	rm -rf $(JAVAROOT)
diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt
index ab4b6a3..3f70bce 100644
--- a/java/src/hdf/hdf5lib/CMakeLists.txt
+++ b/java/src/hdf/hdf5lib/CMakeLists.txt
@@ -116,6 +116,7 @@ set_target_properties (${HDF5_JAVA_HDF5_LIB_TARGET} PROPERTIES FOLDER libraries/
 
 create_javadoc(hdf5_java_doc
     FILES ${HDF5_JAVA_HDF_HDF5_CALLBACKS_SRCS} ${HDF5_JAVA_HDF_HDF5_EXCEPTIONS_SRCS} ${HDF5_JAVA_HDF_HDF5_STRUCTS_SRCS} ${HDF5_JAVA_HDF_HDF5_SRCS}
+    OVERVIEW ${HDF5_JAVA_HDF5_SRC_DIR}/overview.html
     CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
     WINDOWTITLE "HDF5 Java"
     DOCTITLE "<h1>HDF5 Java Wrapper</h1>"
diff --git a/java/src/hdf/overview.html b/java/src/hdf/overview.html
new file mode 100644
index 0000000..39d75b7
--- /dev/null
+++ b/java/src/hdf/overview.html
@@ -0,0 +1,96 @@
+<body>
+
+<h1>Java HDF5 Interface (JHI5)</h1>
+
+<h2><u>What it is</u></h2>
+The <b>Java HD5 Interface (JHI5)</b> is a Java package
+(<a href="../../hdf-java-html/javadocs/hdf/hdf5lib/package-summary.html">hdf.hdf5lib</a>)
+that ``wraps around'' the HDF5 library.
+<p />There are a large number of functions in the HDF5
+library (version 1.10). Some of the functions are not supported in JHI5. Most
+of the unsupported functions have C function pointers, which is not currently
+implemented in JHI5.
+
+<center><table BORDER=1 COLS=1 WIDTH="71%" BGCOLOR="#dbeaf5" >
+<tr>
+<td>
+<center>Note: The JHI5 does not support HDF4 or earlier.</center>
+</td>
+</tr>
+</table></center>
+
+<p>The JHI5 may be used by any Java application that needs to access HDF5
+files. It is extremely important to emphasize that <i>this package is not
+a pure Java implementation of the HDF5 library.</i> The JHI5 calls the
+same HDF5 library that is used by C or FORTRAN programs. (Note that this
+product cannot be used in most network browsers because it accesses the
+local disk using native code.)
+<p>The Java HDF5 Interface consists of Java classes and a dynamically
+linked native library. The Java classes declare native methods, and the
+library contains C functions which implement the native methods. The C
+functions call the standard HDF5 library, which is linked as part of the
+same library on most platforms.
+<p>The central part of the JHI5 is the Java class <i>
+<a href="../../hdf-java-html/javadocs/hdf/hdf5lib/H5.html">hdf.hdf5lib.H5</a></i>.
+The <i>H5 </i>class calls the standard (<i>i.e.</i>, `native' code) HDF5
+library, with native methods for most of the HDF5 functions.
+
+<h3>
+<u>How to use it</u></h3>
+The JHI5 is used by Java classes to call the HDF5 library, in order to
+create HDF5 files, and read and write data in existing HDF5 files.
+<p>For example, the HDF5 library has the function <b>H5Fopen</b> to open
+an HDF5 file. The Java interface is the class <i>
+<a href="../../hdf-java-html/javadocs/hdf/hdf5lib/H5.html">hdf.hdf5lib.H5</a></i>,
+which has a method:
+<pre><b>static native int H5Fopen(String filename, int flags, int access );</b></pre>
+The native method is implemented in C using the
+<a href="http://java.sun.com/javase/6/docs/technotes/guides/jni/index.html">Java
+Native Method Interface </a>(JNI). This is written something like the following:
+<pre><b>JNIEXPORT jint
+JNICALL Java_hdf_hdf5lib_H5_H5Fopen
+(
+&nbsp;JNIEnv *env,
+&nbsp;jclass class,
+&nbsp;jstring hdfFile,
+&nbsp;jint flags,
+&nbsp;jint access)
+&nbsp;{
+
+&nbsp;/* ...convert Java String to (char *) */
+
+&nbsp;/* call the HDF library */
+&nbsp;retVal = H5Fopen((char *)file, (unsigned)flags, (hid_t)access );
+
+&nbsp;/* ... */
+}</b></pre>
+This C function calls the HDF5 library and returns the result appropriately.
+<p>There is one native method for each HDF entry point (several hundred
+in all), which are compiled with the HDF library into a dynamically loaded
+library (<i>libhdf5_java</i>). Note that this library must be built for each
+platform.
+<p>To call the HDF `<b><i>H5Fopen</i></b>' function, a Java program would
+import the package '<i><b>hdf.hdf5lib.*</b>'</i>, and invoke the method
+on the class '<b><i>H5</i></b>'. The Java program would look something
+like this:
+<pre><b>import hdf.hdf5lib.*;
+
+{
+&nbsp;/* ... */
+
+&nbsp;try {
+&nbsp;file = H5.Hopen("myFile.hdf", flags, access );
+&nbsp;} catch (HDF5Exception ex) {
+&nbsp;//...
+&nbsp;}
+
+&nbsp;/* ... */
+}</b></pre>
+The <i><b>H5</b> </i>class automatically loads the native method implementations
+and the HDF5 library.
+
+<h3>
+<a NAME="DOWNLOAD"></a>To Obtain</h3>
+The JHI5 is included with the <a href="http://www.hdfgroup.org/HDF5/index.html">HDF5</a> library.
+
+</body>
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 37326ed..b49b3a6 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -26,11 +26,11 @@ Obtaining HDF5 source code
    2. Obtain compressed (*.tar or *.zip) HDF5 source from
         http://www.hdfgroup.org/ftp/HDF5/current/src/
       and put it in "myhdfstuff".
-      Uncompress the file. There should be a hdf5-1.8."X" folder.
+      Uncompress the file. There should be a hdf5-1.10."X" folder.
 
 CMake version
    1. We suggest you obtain the latest CMake from the Kitware web site.
-      The HDF5 1.8."X" product requires a minimum CMake version 3.1.0,
+      The HDF5 1.10."X" product requires a minimum CMake version 3.1.0,
       where "X" is the current HDF5 release version.
 
 Note:
@@ -51,7 +51,7 @@ The following files referenced below are available at the HDF web site:
     http://www.hdfgroup.org/HDF5/release/cmakebuild.html
 
 Single compressed file with all the files needed, including source:
-    hdf5-1.8.16-CMake.zip or hdf5-1.8.16-CMake.tar.gz
+    hdf5-1.10.0-CMake.zip or hdf5-1.10.0-CMake.tar.gz
 
 Individual files
 -----------------------------------------------
@@ -84,19 +84,19 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
       following options:
 
       On 32-bit Windows with Visual Studio 2012, execute:
-         ctest -S HDF518config.cmake,BUILD_GENERATOR=VS2012 -C Release -VV -O hdf5.log
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2012 -C Release -VV -O hdf5.log
       On 64-bit Windows with Visual Studio 2012, execute:
-         ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf5.log
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -VV -O hdf5.log
       On 32-bit Windows with Visual Studio 2013, execute:
-         ctest -S HDF518config.cmake,BUILD_GENERATOR=VS2013 -C Release -VV -O hdf5.log
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=VS2013 -C Release -VV -O hdf5.log
       On 64-bit Windows with Visual Studio 2013, execute:
-         ctest -S HDF518config.cmake,BUILD_GENERATOR=VS201364 -C Release -VV -O hdf5.log
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201364 -C Release -VV -O hdf5.log
       On Linux and Mac, execute:
-         ctest -S HDF518config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
+         ctest -S HDF5config.cmake,BUILD_GENERATOR=Unix -C Release -VV -O hdf5.log
 
       The command above will configure, build, test, and create an install
       package in the myhdfstuff folder. It will have the format:
-          HDF5-1.8.NN-<platform>.<zip or tar.gz>
+          HDF5-1.10.NN-<platform>.<zip or tar.gz>
 
           On Unix, <platform> will be "Linux". A similar .sh file will also be created.
           On Windows, <platform> will be "win64" or "win32". If you have an
@@ -116,13 +116,13 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
    6. To install, "X" is the current release version
 
       On Windows, execute:
-                HDF5-1.8."X"-win32.msi or HDF5-1.8."X"-win64.msi
+                HDF5-1.10."X"-win32.msi or HDF5-1.10."X"-win64.msi
       By default this program will install the hdf5 library into the
       "C:\Program Files" directory and will create the following
       directory structure:
          HDF_Group
          --HDF5
-         ----1.8."X"
+         ----1.10."X"
          ------bin
          ------include
          ------lib
@@ -130,35 +130,35 @@ To build HDF5 with the SZIP and ZLIB external libraries you will need to:
 
       On Linux, change to the install destination directory
       (create it if doesn't exist) and execute:
-                <path-to>/myhdfstuff/HDF5-1.8."X"-Linux.sh
+                <path-to>/myhdfstuff/HDF5-1.10."X"-Linux.sh
       After accepting the license, the script will prompt:
         By default the HDF5 will be installed in:
-        "<current directory>/HDF5-1.8."X"-Linux"
-        Do you want to include the subdirectory HDF5-1.8."X"-Linux?
+        "<current directory>/HDF5-1.10."X"-Linux"
+        Do you want to include the subdirectory HDF5-1.10."X"-Linux?
         Saying no will install in: "<current directory>" [Yn]:
       Note that the script will create the following directory structure
       relative to the install point:
          HDF_Group
          --HDF5
-         ----1.8."X"
+         ----1.10."X"
          ------bin
          ------include
          ------lib
          ------share
 
-      On Mac you will find HDF5-1.8."X"-Darwin.dmg in the myhdfstuff folder. Click
+      On Mac you will find HDF5-1.10."X"-Darwin.dmg in the myhdfstuff folder. Click
       on the dmg file to proceed with installation. After accepting the license,
       there will be a folder with the following structure:
          HDF_Group
          --HDF5
-         ----1.8."X"
+         ----1.10."X"
          ------bin
          ------include
          ------lib
          ------share
 
       By default the installation will create the bin, include, lib and cmake
-      folders in the <install destination directory>/HDF_Group/HDF5/1.8."X"
+      folders in the <install destination directory>/HDF_Group/HDF5/1.10."X"
 
 
 ========================================================================
@@ -181,13 +181,13 @@ Notes: This short set of instructions is written for users who want to
       5. Configure the C library, tools and tests with one of the following commands:
 
          On Windows 32 bit
-           cmake -G "Visual Studio 12 2013" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.8."X"
+           cmake -G "Visual Studio 12 2013" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.10."X"
 
          On Windows 64 bit
-           cmake -G "Visual Studio 12 2013 Win64" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.8."X"
+           cmake -G "Visual Studio 12 2013 Win64" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ..\hdf5-1.10."X"
 
          On Linux and Mac
-           cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ../hdf5-1.8."X"
+           cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTING:BOOL=ON -DHDF5_BUILD_TOOLS:BOOL=ON ../hdf5-1.10."X"
 
          where "X" is the current release version.
 
@@ -202,13 +202,13 @@ Notes: This short set of instructions is written for users who want to
 
       9. To install
          On Windows, execute:
-                HDF5-1.8."X"-win32.msi or HDF5-1.8."X"-win64.msi
+                HDF5-1.10."X"-win32.msi or HDF5-1.10."X"-win64.msi
          By default this program will install the hdf5 library into the
          "C:\Program Files" directory and will create the following
          directory structure:
             HDF_Group
             --HDF5
-            ----1.8."X"
+            ----1.10."X"
             ------bin
             ------include
             ------lib
@@ -216,28 +216,28 @@ Notes: This short set of instructions is written for users who want to
 
          On Linux, change to the install destination directory
          (create if doesn't exist) and execute:
-                <path-to>/myhdfstuff/build/HDF5-1.8."X"-Linux.sh
+                <path-to>/myhdfstuff/build/HDF5-1.10."X"-Linux.sh
          After accepting the license, the script will prompt:
            By default the HDF5 will be installed in:
-           "<current directory>/HDF5-1.8."X"-Linux"
-           Do you want to include the subdirectory HDF5-1.8."X"-Linux?
+           "<current directory>/HDF5-1.10."X"-Linux"
+           Do you want to include the subdirectory HDF5-1.10."X"-Linux?
            Saying no will install in: "<current directory>" [Yn]:
          Note that the script will create the following directory structure
          relative to the install point:
             HDF_Group
             --HDF5
-            ----1.8."X"
+            ----1.10."X"
             ------bin
             ------include
             ------lib
             ------share
 
-         On Mac you will find HDF5-1.8."X"-Darwin.dmg in the build folder. Click
+         On Mac you will find HDF5-1.10."X"-Darwin.dmg in the build folder. Click
          on the dmg file to proceed with installation. After accepting the license,
          there will be a folder with the following structure:
             HDF_Group
             --HDF5
-            ----1.8."X"
+            ----1.10."X"
             ------bin
             ------include
             ------lib
@@ -249,7 +249,7 @@ IV. Further considerations
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5 1.8."X" product requires a minimum CMake version 3.1.0.
+      web site. The HDF5 1.10."X" product requires a minimum CMake version 3.1.0.
 
    2. If you plan to use Zlib or Szip:
       A. Download the binary packages and install them in a central location.
@@ -380,8 +380,8 @@ These five steps are described in detail below.
             * Visual Studio 12 2013 Win64
             * Visual Studio 11 2012
             * Visual Studio 11 2012 Win64
-            * Visual Studio 10 2010
-            * Visual Studio 10 2010 Win64
+            * Visual Studio 14 2015
+            * Visual Studio 14 2015 Win64
 
         <options> is:
             * SZIP_INCLUDE_DIR:PATH=<path to szip includes directory>
@@ -570,35 +570,43 @@ BUILD_TESTING      "Build HDF5 Unit Testing"   ON
 HDF5_BUILD_CPP_LIB  "Build HDF5 C++ Library"         ON
 HDF5_BUILD_EXAMPLES "Build HDF5 Library Examples"    ON
 HDF5_BUILD_FORTRAN  "Build FORTRAN support"          OFF
+HDF5_BUILD_JAVA     "Build JAVA support"             OFF
 HDF5_BUILD_HL_LIB   "Build HIGH Level HDF5 Library"  ON
 HDF5_BUILD_TOOLS    "Build HDF5 Tools"               ON
-if (HDF5_BUILD_FORTRAN)
-    HDF5_ENABLE_F2003 "Enable FORTRAN 2003 Standard" ON
 
 ---------------- HDF5 Advanced Options ---------------------
+ALLOW_UNSUPPORTED              "Allow unsupported combinations of configure options"          OFF
 HDF5_DISABLE_COMPILER_WARNINGS "Disable compiler warnings"                                    OFF
-HDF5_Enable_Clear_File_Buffers "Securely clear file buffers before writing to file"           ON
-HDF5_Enable_Instrument         "Instrument The library"                                       OFF
+HDF5_ENABLE_INSTRUMENT         "Instrument The library"                                       OFF
 HDF5_ENABLE_CODESTACK          "Enable the function stack tracing (for developer debugging)." OFF
 HDF5_ENABLE_COVERAGE           "Enable code coverage for Libraries and Programs"              OFF
+HDF5_ENABLE_DEBUG_APIS         "Turn on extra debug output in all packages"                   OFF
 HDF5_ENABLE_DEPRECATED_SYMBOLS "Enable deprecated public API symbols"                         ON
+HDF5_ENABLE_DIRECT_VFD         "Build the Direct I/O Virtual File Driver"                     OFF
 HDF5_ENABLE_EMBEDDED_LIBINFO   "embed library info into executables"                          ON
 HDF5_ENABLE_HSIZET             "Enable datasets larger than memory"                           ON
 HDF5_ENABLE_LARGE_FILE         "Enable support for large (64-bit) files on Linux."            ON
 HDF5_ENABLE_PARALLEL           "Enable parallel build (requires MPI)"                         OFF
 HDF5_ENABLE_TRACE              "Enable API tracing capability"                                OFF
 HDF5_ENABLE_USING_MEMCHECKER   "Indicate that a memory checker is used"                       OFF
+HDF5_GENERATE_HEADERS          "Rebuild Generated Files"                                      OFF
+HDF5_JAVA_PACK_JRE             "Package a JRE installer directory"                            OFF
 HDF5_MEMORY_ALLOC_SANITY_CHECK "Indicate that internal memory allocation sanity checks are enabled" OFF
 HDF5_METADATA_TRACE_FILE       "Enable metadata trace file collection"                        OFF
 HDF5_NO_PACKAGES               "Do not include CPack Packaging"                               OFF
+HDF5_PACK_EXAMPLES             "Package the HDF5 Library Examples Compressed File"            OFF
+HDF5_PACK_MACOSX_FRAMEWORK     "Package the HDF5 Library in a Frameworks"                     OFF
 HDF5_PACKAGE_EXTLIBS           "CPACK - include external libraries"                           OFF
 HDF5_STRICT_FORMAT_CHECKS      "Whether to perform strict file format checks"                 OFF
+HDF_TEST_EXPRESS               "Control testing framework (0-3)"                              "0"
 HDF5_TEST_VFD                  "Execute tests with different VFDs"                            OFF
 HDF5_USE_16_API_DEFAULT        "Use the HDF5 1.6.x API by default"                            OFF
+HDF5_USE_18_API_DEFAULT        "Use the HDF5 1.8.x API by default"                            OFF
 HDF5_USE_FOLDERS               "Enable folder grouping of projects in IDEs."                  OFF
 HDF5_WANT_DATA_ACCURACY        "IF data accuracy is guaranteed during data conversions"       ON
 HDF5_WANT_DCONV_EXCEPTION      "exception handling functions is checked during data conversions" ON
 HDF5_ENABLE_THREADSAFE         "Enable Threadsafety"                                          OFF
+SKIP_HDF5_FORTRAN_SHARED       "Do not build the fortran shared libraries"                    OFF
 if (APPLE)
     HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path"  OFF
 if (CMAKE_BUILD_TYPE MATCHES Debug)
@@ -649,13 +657,13 @@ adding an option (${CTEST_SCRIPT_ARG}) to the platform configuration script.
 #############################################################################################
 ### ${CTEST_SCRIPT_ARG} is of the form OPTION=VALUE                                       ###
 ### BUILD_GENERATOR required [Unix, VS2015, VS201564, VS2013, VS201364, VS2012, VS201264] ###
-### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf519.log        ###
+### ctest -S HDF5config.cmake,BUILD_GENERATOR=VS201264 -C Release -V -O hdf5.log          ###
 #############################################################################################
 
 cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 ############################################################################
 # Usage:
-#     ctest -S HDF518config.cmake,OPTION=VALUE -C Release -VV -O test.log
+#     ctest -S HDF5config.cmake,OPTION=VALUE -C Release -VV -O test.log
 # where valid options for OPTION are:
 #     BUILD_GENERATOR - The cmake build generator:
 #            Unix    * Unix Makefiles
@@ -671,20 +679,22 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 #     CTEST_SOURCE_NAME  -  source folder
 #     STATIC_LIBRARIES  -  Build/use static libraries
 #     FORTRAN_LIBRARIES -  Build/use fortran libraries
+#     JAVA_LIBRARIES -  Build/use java libraries
 #     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac
 ##############################################################################
 
-set(CTEST_SOURCE_VERSION 1.9)
-set(CTEST_SOURCE_VERSEXT "")
+set(CTEST_SOURCE_VERSION 1.10.0)
+set(CTEST_SOURCE_VERSEXT "-pre1")
 
 ##############################################################################
 # handle input parameters to script.
 #BUILD_GENERATOR - which CMake generator to use, required
-#INSTALLDIR - HDF5-1.9 root folder
+#INSTALLDIR - HDF5-1.10.0 root folder
 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo
-#CTEST_SOURCE_NAME - name of source folder; HDF5-1.9
+#CTEST_SOURCE_NAME - name of source folder; HDF5-1.10.0
 #STATIC_LIBRARIES - Default is YES
 #FORTRAN_LIBRARIES - Default is NO
+#JAVA_LIBRARIES - Default is NO
 #NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac
 if(DEFINED CTEST_SCRIPT_ARG)
     # transform ctest script arguments of the form
@@ -722,10 +732,10 @@ else()
 endif()
 
 if(NOT DEFINED INSTALLDIR)
-  if(NOT WIN32)
-    set(INSTALLDIR "/usr/local/myhdf5")
-  else()
+  if(WIN32)
     set(INSTALLDIR "C:\\Program\ Files\\myhdf5")
+  else()
+    set(INSTALLDIR "/usr/local/myhdf5")
   endif()
 endif()
 if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
@@ -736,9 +746,18 @@ if(NOT DEFINED CTEST_SOURCE_NAME)
 endif()
 if(NOT DEFINED STATIC_LIBRARIES)
     set(STATICLIBRARIES "YES")
+else()
+    set(STATICLIBRARIES "NO")
 endif()
 if(NOT DEFINED FORTRAN_LIBRARIES)
     set(FORTRANLIBRARIES "NO")
+else()
+    set(FORTRANLIBRARIES "YES")
+endif()
+if(NOT DEFINED JAVA_LIBRARIES)
+    set(JAVALIBRARIES "NO")
+else()
+    set(JAVALIBRARIES "YES")
 endif()
 
 set(CTEST_BINARY_NAME "build")
@@ -756,7 +775,15 @@ endif()
 if(WIN32)
   set(SITE_OS_NAME "Windows")
   set(SITE_OS_VERSION "WIN7")
-  if(${BUILD_GENERATOR} STREQUAL "VS201364")
+  if(${BUILD_GENERATOR} STREQUAL "VS201564")
+    set(SITE_OS_BITS "64")
+    set(SITE_COMPILER_NAME "vs2015")
+    set(SITE_COMPILER_VERSION "14")
+  elseif(${BUILD_GENERATOR} STREQUAL "VS2015")
+    set(SITE_OS_BITS "32")
+    set(SITE_COMPILER_NAME "vs2015")
+    set(SITE_COMPILER_VERSION "14")
+  elseif(${BUILD_GENERATOR} STREQUAL "VS201364")
     set(SITE_OS_BITS "64")
     set(SITE_COMPILER_NAME "vs2013")
     set(SITE_COMPILER_VERSION "12")
@@ -804,7 +831,7 @@ set(MODEL "Experimental")
 #set(LOCAL_UPDATE "TRUE")
 set(REPOSITORY_URL "http://svn.hdfgroup.uiuc.edu/hdf5/trunk")
 #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows
-#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}${CTEST_SOURCE_VERSEXT}")
+#set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}")
 ###################################################################
 
 ###################################################################
@@ -840,6 +867,12 @@ if(${FORTRANLIBRARIES})
 else()
   set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
 endif()
+####      java       ####
+if(${JAVALIBRARIES})
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=ON")
+else()
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=OFF")
+endif()
 
 ### disable test program builds
 #set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DBUILD_TESTING:BOOL=OFF")
diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt
index 26d3cb9..ddffcf1 100644
--- a/release_docs/INSTALL_Cygwin.txt
+++ b/release_docs/INSTALL_Cygwin.txt
@@ -99,19 +99,19 @@ Build, Test and Install HDF5 on Cygwin
 
    The HDF5 source code is distributed in a variety of formats which
    can be unpacked with the following commands, each of which creates 
-   an `hdf5-1.8.x' directory.
+   an `hdf5-1.10.x' directory.
 
    2.1 Non-compressed tar archive (*.tar)
 
-            $ tar xf hdf5-1.8.x.tar
+            $ tar xf hdf5-1.10.x.tar
 
    2.2 Gzip'd tar archive (*.tar.gz)
 
-            $ gunzip < hdf5-1.8.x.tar.gz | tar xf -
+            $ gunzip < hdf5-1.10.x.tar.gz | tar xf -
 
    2.3 Bzip'd tar archive (*.tar.bz2)
 
-            $ bunzip2 < hdf5-1.8.x.tar.bz2 | tar xf - 
+            $ bunzip2 < hdf5-1.10.x.tar.bz2 | tar xf - 
 
 2. Setup Environment
 
diff --git a/release_docs/USING_CMake_Examples.txt b/release_docs/USING_CMake_Examples.txt
index 12c499e..d8940a5 100644
--- a/release_docs/USING_CMake_Examples.txt
+++ b/release_docs/USING_CMake_Examples.txt
@@ -21,7 +21,7 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5 1.8.x product requires a minimum CMake version
+      web site. The HDF5 1.10.x product requires a minimum CMake version
       of 3.1.0.
 
    2. You have installed the HDF5 library built with CMake, by executing
diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt
index 2cdf798..64d1a2a 100644
--- a/release_docs/USING_HDF5_CMake.txt
+++ b/release_docs/USING_HDF5_CMake.txt
@@ -36,7 +36,7 @@ I. Preconditions
 ========================================================================
 
    1. We suggest you obtain the latest CMake for windows from the Kitware
-      web site. The HDF5 1.8.x product requires a minimum CMake version
+      web site. The HDF5 1.10.x product requires a minimum CMake version
       of 3.1.0.
 
    2. You have installed the HDF5 library built with CMake, by executing
@@ -47,7 +47,7 @@ I. Preconditions
 
    3. Set the environment variable HDF5_DIR to the installed location of
       the config files for HDF5. On Windows:
-            HDF5_DIR=C:/Program Files/HDF_Group/HDF5/1.8.x/cmake
+            HDF5_DIR=C:/Program Files/HDF_Group/HDF5/1.10.x/cmake
 
       (Note there are no quote characters used on Windows and all platforms
       use forward slashes)
@@ -103,8 +103,8 @@ These steps are described in more detail below.
             * Visual Studio 12 2013 Win64
             * Visual Studio 11 2012
             * Visual Studio 11 2012 Win64
-            * Visual Studio 10 2010
-            * Visual Studio 10 2010 Win64
+            * Visual Studio 14 2015
+            * Visual Studio 14 2015 Win64
 
         <options> is:
             * BUILD_TESTING:BOOL=ON
@@ -132,7 +132,7 @@ These steps are described in more detail below.
 
       2.2  Alternative command line example on Windows in c:\MyHDFstuff\hdf5\build directory:
 
-           cmake -G "Visual Studio 11" -DBUILD_TESTING:BOOL=ON ..
+           cmake -G "Visual Studio 12 2013" -DBUILD_TESTING:BOOL=ON ..
 
    3. Build HDF5 Applications
 
@@ -228,30 +228,18 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
 # This script will build and run the examples from a folder
 # Execute from a command line:
 #     ctest -S HDF5_Examples.cmake,OPTION=VALUE -C Release -V -O test.log
-# where valid options for OPTION are:
-#     BUILD_GENERATOR - The cmake build generator:
-#            Unix    * Unix Makefiles
-#            VS2015    * Visual Studio 14 2015
-#            VS201564 * Visual Studio 14 2015 Win64
-#            VS2013    * Visual Studio 12 2013
-#            VS201364 * Visual Studio 12 2013 Win64
-#            VS2012    * Visual Studio 11 2012
-#            VS201264 * Visual Studio 11 2012 Win64
-#
-#     INSTALLDIR  -  root folder where hdf5 is installed
-#     CTEST_BUILD_CONFIGURATION  - Release, Debug, etc
-#     CTEST_SOURCE_NAME  -  source folder
-#     STATIC_LIBRARIES  -  Build/use static libraries
-#     FORTRAN_LIBRARIES -  Build/use fortran libraries
-#     NO_MAC_FORTRAN  - Yes to be SHARED on a Mac
-##############################################################################
+###############################################################################################################
+
+set(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
+set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
+
 # handle input parameters to script.
-#BUILD_GENERATOR - which CMake generator to use, required
 #INSTALLDIR - HDF5 root folder
 #CTEST_BUILD_CONFIGURATION - Release, Debug, RelWithDebInfo
 #CTEST_SOURCE_NAME - name of source folder; HDF4Examples
 #STATIC_LIBRARIES - Default is YES
 #FORTRAN_LIBRARIES - Default is NO
+#JAVA_LIBRARIES - Default is NO
 ##NO_MAC_FORTRAN - set to TRUE to allow shared libs on a Mac)
 if(DEFINED CTEST_SCRIPT_ARG)
     # transform ctest script arguments of the form
@@ -264,38 +252,8 @@ if(DEFINED CTEST_SCRIPT_ARG)
         endif()
     endforeach()
 endif()
-
-# build generator must be defined
-if(NOT DEFINED BUILD_GENERATOR)
-  message(FATAL_ERROR "BUILD_GENERATOR must be defined - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")
-else()
-  if(${BUILD_GENERATOR} STREQUAL "Unix")
-    set(CMAKE_GENERATOR "Unix Makefiles")
-  elseif(${BUILD_GENERATOR} STREQUAL "VS2015")
-    set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015")
-  elseif(${BUILD_GENERATOR} STREQUAL "VS201564")
-    set(CTEST_CMAKE_GENERATOR "Visual Studio 14 2015 Win64")
-  elseif(${BUILD_GENERATOR} STREQUAL "VS2013")
-    set(CMAKE_GENERATOR "Visual Studio 12 2013")
-  elseif(${BUILD_GENERATOR} STREQUAL "VS201364")
-    set(CMAKE_GENERATOR "Visual Studio 12 2013 Win64")
-  elseif(${BUILD_GENERATOR} STREQUAL "VS2012")
-    set(CMAKE_GENERATOR "Visual Studio 11 2012")
-  elseif(${BUILD_GENERATOR} STREQUAL "VS201264")
-    set(CMAKE_GENERATOR "Visual Studio 11 2012 Win64")
-  else()
-    message(FATAL_ERROR "Invalid BUILD_GENERATOR must be - Unix, VS2015, VS201564, VS2013, VS201364, VS2012, or VS201264")
-  endif()
-endif()
-set(CTEST_CMAKE_GENERATOR "${CMAKE_GENERATOR}")
-set(CTEST_DASHBOARD_ROOT ${CTEST_SCRIPT_DIRECTORY})
-
 if(NOT DEFINED INSTALLDIR)
-  if(WIN32)
-    set(INSTALLDIR "C:\\Program\ Files\\myhdf5")
-  else()
-    set(INSTALLDIR "/usr/local/myhdf5")
-  endif()
+    set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@")
 endif()
 if(NOT DEFINED CTEST_BUILD_CONFIGURATION)
     set(CTEST_BUILD_CONFIGURATION "Release")
@@ -305,9 +263,18 @@ if(NOT DEFINED CTEST_SOURCE_NAME)
 endif()
 if(NOT DEFINED STATIC_LIBRARIES)
     set(STATICLIBRARIES "YES")
+else(NOT DEFINED STATIC_LIBRARIES)
+    set(STATICLIBRARIES "NO")
 endif()
 if(NOT DEFINED FORTRAN_LIBRARIES)
     set(FORTRANLIBRARIES "NO")
+else(NOT DEFINED FORTRAN_LIBRARIES)
+    set(FORTRANLIBRARIES "YES")
+endif()
+if(NOT DEFINED JAVA_LIBRARIES)
+    set(JAVALIBRARIES "NO")
+else(NOT DEFINED JAVA_LIBRARIES)
+    set(JAVALIBRARIES "YES")
 endif()
 
 #TAR_SOURCE - name of tarfile
@@ -337,9 +304,14 @@ else(WIN32)
   set(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_BINARY_NAME}")
 endif(WIN32)
 if(${FORTRANLIBRARIES})
-  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=ON")
 else()
-  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_FORTRAN:BOOL=OFF")
+endif()
+if(${JAVALIBRARIES})
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=ON")
+else()
+  set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF_BUILD_JAVA:BOOL=OFF")
 endif()
 set(BUILD_OPTIONS "${BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@")
 
@@ -421,8 +393,17 @@ ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
 ## --------------------------
 ctest_start (Experimental)
 ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}")
+if(LOCAL_SUBMIT)
+  ctest_submit (PARTS Configure Notes)
+endif()
 ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
+if(LOCAL_SUBMIT)
+  ctest_submit (PARTS Build)
+endif()
 ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
+if(LOCAL_SUBMIT)
+  ctest_submit (PARTS Test)
+endif()
 if(res GREATER 0)
   message (FATAL_ERROR "tests FAILED")
 endif()
diff --git a/release_docs/USING_HDF5_VS.txt b/release_docs/USING_HDF5_VS.txt
index 146782a..3aaa56d 100644
--- a/release_docs/USING_HDF5_VS.txt
+++ b/release_docs/USING_HDF5_VS.txt
@@ -54,11 +54,11 @@ Using Visual Studio 2008 with HDF5 Libraries built with Visual Studio 2008
           and select "x64".
 
       2.2 Find the box "Show directories for", choose "Include files", add the
-          header path (i.e. c:\Program Files\HDF_Group\HDF5\1.8.x\include)
+          header path (i.e. c:\Program Files\HDF_Group\HDF5\1.10.x\include)
           to the included directories.
 
       2.3 Find the box "Show directories for", choose "Library files", add the
-          library path (i.e. c:\Program Files\HDF_Group\HDF5\1.8.x\lib)
+          library path (i.e. c:\Program Files\HDF_Group\HDF5\1.10.x\lib)
           to the library directories.
 
       2.4 If using Fortran libraries, you will also need to setup the path