diff options
author | lrknox <lrknox> | 2017-05-24 21:30:58 (GMT) |
---|---|---|
committer | lrknox <lrknox> | 2017-05-24 21:30:58 (GMT) |
commit | 00d423af600be0377734f0d709c9d1055446a5c6 (patch) | |
tree | de2ef3b863fd8119b3ab57a378cd5e7df627719c /c++ | |
parent | 3a43f7af3eaf807fbdf4cf26c10eadb67903b4a8 (diff) | |
download | hdf5-00d423af600be0377734f0d709c9d1055446a5c6.zip hdf5-00d423af600be0377734f0d709c9d1055446a5c6.tar.gz hdf5-00d423af600be0377734f0d709c9d1055446a5c6.tar.bz2 |
Update text in COPYING files in subdirectories to match changes to
copyright notices in source files.
Update Copyright notices in acsite.m4 and bin/yodconfigure that were
overlooked by chkcopyright.
Remove broken and unnecessary urls from comments in
hl/fortran/src/H5IMcc.c and hl/src/H5IM.c.
Commit bin/reconfigure changes to generated files.
Diffstat (limited to 'c++')
-rw-r--r-- | c++/COPYING | 11 | ||||
-rw-r--r-- | c++/examples/CMakeTests.cmake | 11 | ||||
-rw-r--r-- | c++/src/Makefile.in | 13 | ||||
-rw-r--r-- | c++/src/cpp_doc_config | 11 | ||||
-rw-r--r-- | c++/src/footer.html | 2 | ||||
-rw-r--r-- | c++/test/CMakeTests.cmake | 11 |
6 files changed, 38 insertions, 21 deletions
diff --git a/c++/COPYING b/c++/COPYING index 6903daf..6497ace 100644 --- a/c++/COPYING +++ b/c++/COPYING @@ -5,12 +5,9 @@ The files and subdirectories in this directory are part of HDF5. The full HDF5 copyright notice, including terms governing use, - modification, and redistribution, is contained in the files COPYING - and Copyright.html. COPYING can be found at the root of the source - code distribution tree; Copyright.html can be found at the root - level of an installed copy of the electronic HDF5 document set and - is linked from the top-level documents page. It can also be found - at http://www.hdfgroup.org/HDF5/doc/Copyright.html. If you do not - have access to either file, you may request a copy from + modification, and redistribution, is contained in the COPYING file + which can be found at the root of the source code distribution tree + or in https://support.hdfgroup.org/ftp/HDF5/releases. If you do + not have access to either file, you may request a copy from help@hdfgroup.org. diff --git a/c++/examples/CMakeTests.cmake b/c++/examples/CMakeTests.cmake index 8b5c6b9..8043863 100644 --- a/c++/examples/CMakeTests.cmake +++ b/c++/examples/CMakeTests.cmake @@ -1,3 +1,14 @@ +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the COPYING file, which can be found at the root of the source code +# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# If you do not have access to either file, you may request a copy from +# help@hdfgroup.org. + ############################################################################## ############################################################################## diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 9b42a14..0a6e517 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -1332,19 +1332,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \ help: @$(top_srcdir)/bin/makehelp -# Copyright by The HDF Group. -# Copyright by the Board of Trustees of the University of Illinois. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the files COPYING and Copyright.html. COPYING can be found at the root -# of the source code distribution tree; Copyright.html can be found at the -# root level of an installed copy of the electronic HDF5 document set and -# is linked from the top-level documents page. It can also be found at -# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from help@hdfgroup.org. - # Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that # holds *.ii files, which are template entity instantiations. # This entire directory should be cleaned. diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 23e853c..b94fe2a 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -1,3 +1,14 @@ +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the COPYING file, which can be found at the root of the source code +# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# If you do not have access to either file, you may request a copy from +# help@hdfgroup.org. + # Doxyfile 1.8.5 # This file describes the settings to be used by the documentation system diff --git a/c++/src/footer.html b/c++/src/footer.html index ba37ee7..248ac16 100644 --- a/c++/src/footer.html +++ b/c++/src/footer.html @@ -11,7 +11,7 @@ </address> </td><td width="5%"> </td> <td align="right"> - <a href="https://www.hdfgroup.org/HDF5/doc/Copyright.html">Copyright</a> by + <a href="https://support.hdfgroup.org/ftp/HDF5/releases/COPYING">Copyright</a> by <a href="https://www.hdfgroup.org">The HDF Group</a> <br> and the Board of Trustees of the University of Illinois diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 7ffabb2..4f5ba94 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -1,3 +1,14 @@ +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the COPYING file, which can be found at the root of the source code +# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases. +# If you do not have access to either file, you may request a copy from +# help@hdfgroup.org. + HDFTEST_COPY_FILE("${HDF5_CPP_TEST_SOURCE_DIR}/th5s.h5" "${PROJECT_BINARY_DIR}/th5s.h5" "cpp_testhdf5_files") add_custom_target(cpp_testhdf5_files ALL COMMENT "Copying files needed by cpp_testhdf5 tests" DEPENDS ${cpp_testhdf5_files_list}) |