diff options
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | COPYING | 29 | ||||
| -rw-r--r-- | CTestConfig.cmake | 21 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 1 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 10 | ||||
| -rw-r--r-- | src/H5config.h.in | 3 |
9 files changed, 64 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb860d2..a99ba33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -443,9 +443,14 @@ endif () #----------------------------------------------------------------------------- option (HDF5_ENABLE_COVERAGE "Enable code coverage for Libraries and Programs" OFF) if (HDF5_ENABLE_COVERAGE) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") - set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 --coverage -fprofile-arcs -ftest-coverage") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0 -fprofile-arcs -ftest-coverage") + if (CMAKE_C_COMPILER_ID STREQUAL "GNU") + set (LDFLAGS "${LDFLAGS} -fprofile-arcs -ftest-coverage") + link_libraries (gcov) + else () + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage") + endif () endif () #----------------------------------------------------------------------------- @@ -615,6 +620,16 @@ if (HDF5_USE_18_API_DEFAULT) endif () #----------------------------------------------------------------------------- +# Option to use 1.10.x API +#----------------------------------------------------------------------------- +option (HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" ON) +set (H5_USE_110_API_DEFAULT 0) +if (HDF5_USE_110_API_DEFAULT) + set (H5_USE_110_API_DEFAULT 1) + set (DEFAULT_API_VERSION "v110") +endif () + +#----------------------------------------------------------------------------- # Include user macros #----------------------------------------------------------------------------- include (UserMacros.cmake) @@ -3,7 +3,7 @@ HDF5 (Hierarchical Data Format 5) Software Library and Utilities ----------------------------------------------------------------------------- HDF5 (Hierarchical Data Format 5) Software Library and Utilities -Copyright (c) 2006, The HDF Group. +Copyright (c) 2006-2018, The HDF Group. NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities Copyright (c) 1998-2006, The Board of Trustees of the University of Illinois. @@ -21,27 +21,16 @@ provided that the following conditions are met: this list of conditions, and the following disclaimer in the documentation and/or materials provided with the distribution. -3. In addition, redistributions of modified forms of the source or binary - code must carry prominent notices stating that the original code was - changed and the date of the change. - -4. All publications or advertising materials mentioning features or use of - this software are asked, but not required, to acknowledge that it was - developed by The HDF Group and by the National Center for Supercomputing - Applications at the University of Illinois at Urbana-Champaign and - credit the contributors. - -5. Neither the name of The HDF Group, the name of the University, nor the +3. Neither the name of The HDF Group, the name of the University, nor the name of any Contributor may be used to endorse or promote products derived from this software without specific prior written permission from The HDF Group, the University, or the Contributor, respectively. DISCLAIMER: THIS SOFTWARE IS PROVIDED BY THE HDF GROUP AND THE CONTRIBUTORS -"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. In no -event shall The HDF Group or the Contributors be liable for any damages -suffered by the users arising out of the use of this software, even if -advised of the possibility of such damage. +"AS IS" WITH NO WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED. IN NO EVENT SHALL THE HDF GROUP OR THE CONTRIBUTORS BE LIABLE FOR ANY DAMAGES SUFFERED BY THE USERS ARISING OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the features, functionality or performance of the source code ("Enhancements") to anyone; however, if you choose to make your Enhancements available either publicly, or directly to The HDF Group, without imposing a separate written license agreement for such Enhancements, then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to install, use, modify, prepare derivative works, incorporate into other computer software, distribute, and sublicense such enhancements or derivative works thereof, in binary and source code form. ----------------------------------------------------------------------------- ----------------------------------------------------------------------------- @@ -55,9 +44,7 @@ http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5. ----------------------------------------------------------------------------- Contributors: National Center for Supercomputing Applications (NCSA) at -the University of Illinois, Fortner Software, Unidata Program Center (netCDF), -The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), -and Digital Equipment Corporation (DEC). +the University of Illinois, Fortner Software, Unidata Program Center (netCDF), The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip), and Digital Equipment Corporation (DEC). ----------------------------------------------------------------------------- @@ -98,8 +85,8 @@ and/or accompanying materials: ----------------------------------------------------------------------------- HDF5 is available with the SZIP compression library but SZIP is not part -of HDF5 and has separate copyright and license terms. See “Szip Compression -in HDF Products” (https://support.hdfgroup.org/doc_resource/SZIP/) for further details. +of HDF5 and has separate copyright and license terms. See SZIP Compression +in HDF Products (www.hdfgroup.org/doc_resource/SZIP/) for further details. ----------------------------------------------------------------------------- diff --git a/CTestConfig.cmake b/CTestConfig.cmake index 4a59b0d..b741bec 100644 --- a/CTestConfig.cmake +++ b/CTestConfig.cmake @@ -19,12 +19,23 @@ set (CTEST_PROJECT_NAME "HDF5") set (CTEST_NIGHTLY_START_TIME "18:00:00 CST") set (CTEST_DROP_METHOD "http") -if (CDASH_LOCAL) - set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org") - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110") +if (CTEST_DROP_SITE_INIT) + set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}") else () - set (CTEST_DROP_SITE "cdash.hdfgroup.org") - set (CTEST_DROP_LOCATION "/submit.php?project=HDF5") + if (CDASH_LOCAL) + set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org") + else () + set (CTEST_DROP_SITE "cdash.hdfgroup.org") + endif () +endif () +if (CTEST_DROP_LOCATION_INIT) + set (CTEST_DROP_LOCATION "${CTEST_DROP_LOCATION_INIT}") +else () + if (CDASH_LOCAL) + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5110") + else () + set (CTEST_DROP_LOCATION "/submit.php?project=HDF5") + endif () endif () set (CTEST_DROP_SITE_CDASH TRUE) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index ccfe581..1d73bba 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -669,6 +669,9 @@ /* Define using v1.8 public API symbols by default */ #cmakedefine H5_USE_18_API_DEFAULT @H5_USE_18_API_DEFAULT@ +/* Define using v1.10 public API symbols by default */ +#cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@ + /* Define if a memory checking tool will be used on the library, to cause library to be very picky about memory operations and also disable the internal free list manager code. */ @@ -30714,6 +30714,9 @@ elif test "X$withval" = "Xv110"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: v110" >&5 $as_echo "v110" >&6; } DEFAULT_API_VERSION=v110 + +$as_echo "#define USE_110_API_DEFAULT 1" >>confdefs.h + else as_fn_error $? "invalid version of public symbols given" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 71b7cf1..c3e6aee 100644 --- a/configure.ac +++ b/configure.ac @@ -3210,6 +3210,8 @@ elif test "X$withval" = "Xv18"; then elif test "X$withval" = "Xv110"; then AC_MSG_RESULT([v110]) DEFAULT_API_VERSION=v110 + AC_DEFINE([USE_110_API_DEFAULT], [1], + [Define using v1.10 public API symbols by default]) else AC_MSG_ERROR([invalid version of public symbols given]) fi diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 708e713..3a69022 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -618,6 +618,7 @@ HDF_TEST_EXPRESS "Control testing framework (0-3)" 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_110_API_DEFAULT "Use the HDF5 1.10.x API by default" ON HDF5_USE_FOLDERS "Enable folder grouping of projects in IDEs." ON 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 diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 8e4652d..fbcf917 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -79,6 +79,16 @@ New Features Configuration: ------------- + - Add missing USE_110_API_DEFAULT option. + + Option USE_110_API_DEFAULT sets the default version of + versioned APIs. The bin/makevers perl script did not set + the maxidx variable correctly when the 1.10 branch was + created. This caused the versioning process to always use + the latest version of any API. + + (ADB - 2018/08/17, HDFFV-10552) + - Added configuration checks for the following MPI functions: MPI_Mprobe - Used for the Parallel Compression feature diff --git a/src/H5config.h.in b/src/H5config.h.in index 36139cc..ce444ed 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -603,6 +603,9 @@ /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME +/* Define using v1.10 public API symbols by default */ +#undef USE_110_API_DEFAULT + /* Define using v1.6 public API symbols by default */ #undef USE_16_API_DEFAULT |