From 0c5b0158dc303ec8e731628acd907f5b0b9a99eb Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 21 Oct 2024 08:00:22 -0500 Subject: [PATCH 1/3] Replace COPYING with LICENSE in workflows --- .autom4te.cfg | 2 +- .gitattributes | 1 - .github/workflows/autotools.yml | 2 +- .github/workflows/cmake-ctest.yml | 24 ++++++++++++------------ .github/workflows/cmake.yml | 2 +- .github/workflows/cve.yml | 2 +- .github/workflows/hdfeos5.yml | 2 +- .github/workflows/netcdf.yml | 2 +- .h5chkright.ini | 6 +++--- release_docs/HISTORY-1_10_0-1_12_0.txt | 2 +- release_docs/HISTORY-1_12_0-1_14_0.txt | 10 +++++----- release_docs/HISTORY-1_14_0-1_16_0.txt | 12 ++++++------ release_docs/RELEASE.txt | 4 ++-- 13 files changed, 35 insertions(+), 36 deletions(-) diff --git a/.autom4te.cfg b/.autom4te.cfg index 3872ddb4400..d386cef175a 100644 --- a/.autom4te.cfg +++ b/.autom4te.cfg @@ -3,7 +3,7 @@ # # 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 +# the LICENSE file, which can be found at the root of the source code # distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. diff --git a/.gitattributes b/.gitattributes index b03dddfc95d..7e37bf00fee 100644 --- a/.gitattributes +++ b/.gitattributes @@ -72,7 +72,6 @@ hl/tools/gif2h5/testfiles/ex_image2.h5 -text hl/tools/gif2h5/testfiles/h52giftst.h5 -text hl/tools/gif2h5/testfiles/image1.gif -text java/CMakeLists.txt -text -java/COPYING -text java/Makefile.am -text java/examples/CMakeLists.txt -text java/examples/Makefile.am -text diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml index a202076005a..6bf5a8813cf 100644 --- a/.github/workflows/autotools.yml +++ b/.github/workflows/autotools.yml @@ -12,7 +12,7 @@ on: - 'doc/**' - 'release_docs/**' - 'ACKNOWLEDGEMENTS' - - 'COPYING**' + - 'LICENSE**' - '**.md' # Using concurrency to cancel any in-progress job or run diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml index b927b3ce403..77e490269fc 100644 --- a/.github/workflows/cmake-ctest.yml +++ b/.github/workflows/cmake-ctest.yml @@ -169,8 +169,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" mkdir "${{ runner.workspace }}/build/hdf5" - Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING -Destination ${{ runner.workspace }}/build/hdf5/ - Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/ + Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE -Destination ${{ runner.workspace }}/build/hdf5/ + Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/ Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-MSVC/README.md -Destination ${{ runner.workspace }}/build/hdf5/ Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-MSVC/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip cd "${{ runner.workspace }}/build" @@ -261,8 +261,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" mkdir "${{ runner.workspace }}/build/hdf5" - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING ${{ runner.workspace }}/build/hdf5 - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC/README.md ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC/*.tar.gz ${{ runner.workspace }}/build/hdf5 cd "${{ runner.workspace }}/build" @@ -498,8 +498,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" mkdir "${{ runner.workspace }}/build/hdf5" - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING ${{ runner.workspace }}/build/hdf5 - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-macos-Clang/README.md ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-macos-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5 cd "${{ runner.workspace }}/build" @@ -584,8 +584,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" mkdir "${{ runner.workspace }}/build/hdf5" - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING ${{ runner.workspace }}/build/hdf5 - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC-S3/README.md ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC-S3/*.tar.gz ${{ runner.workspace }}/build/hdf5 cd "${{ runner.workspace }}/build" @@ -709,8 +709,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" mkdir "${{ runner.workspace }}/build/hdf5" - Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING -Destination ${{ runner.workspace }}/build/hdf5/ - Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/ + Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE -Destination ${{ runner.workspace }}/build/hdf5/ + Copy-Item -Path ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/ Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/README.md -Destination ${{ runner.workspace }}/build/hdf5/ Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip cd "${{ runner.workspace }}/build" @@ -807,8 +807,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/build" mkdir "${{ runner.workspace }}/build/hdf5" - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING ${{ runner.workspace }}/build/hdf5 - cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE ${{ runner.workspace }}/build/hdf5 + cp ${{ runner.workspace }}/hdf5/${{ steps.set-file-base.outputs.SOURCE_BASE }}/LICENSE_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/README.md ${{ runner.workspace }}/build/hdf5 cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/*.tar.gz ${{ runner.workspace }}/build/hdf5 cd "${{ runner.workspace }}/build" diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7fe99c2f3cb..b15205f38ae 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -12,7 +12,7 @@ on: - 'doc/**' - 'release_docs/**' - 'ACKNOWLEDGEMENTS' - - 'COPYING**' + - 'LICENSE**' - '**.md' # Using concurrency to cancel any in-progress job or run diff --git a/.github/workflows/cve.yml b/.github/workflows/cve.yml index a3abb664897..8562bce6d66 100644 --- a/.github/workflows/cve.yml +++ b/.github/workflows/cve.yml @@ -12,7 +12,7 @@ on: - 'doc/**' - 'release_docs/**' - 'ACKNOWLEDGEMENTS' - - 'COPYING**' + - 'LICENSE**' - '**.md' # Using concurrency to cancel any in-progress job or run diff --git a/.github/workflows/hdfeos5.yml b/.github/workflows/hdfeos5.yml index 0d5cf969382..2f766ce36bb 100644 --- a/.github/workflows/hdfeos5.yml +++ b/.github/workflows/hdfeos5.yml @@ -12,7 +12,7 @@ on: - 'doc/**' - 'release_docs/**' - 'ACKNOWLEDGEMENTS' - - 'COPYING**' + - 'LICENSE**' - '**.md' # Using concurrency to cancel any in-progress job or run diff --git a/.github/workflows/netcdf.yml b/.github/workflows/netcdf.yml index 963f9dce673..080160d086d 100644 --- a/.github/workflows/netcdf.yml +++ b/.github/workflows/netcdf.yml @@ -12,7 +12,7 @@ on: - 'doc/**' - 'release_docs/**' - 'ACKNOWLEDGEMENTS' - - 'COPYING**' + - 'LICENSE**' - '**.md' permissions: diff --git a/.h5chkright.ini b/.h5chkright.ini index 02d3cadd48f..77eb740cfff 100644 --- a/.h5chkright.ini +++ b/.h5chkright.ini @@ -3,7 +3,7 @@ # # 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 +# the LICENSE file, which can be found at the root of the source code # distribution tree, or in https://www.hdfgroup.org/licenses. # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. @@ -17,8 +17,8 @@ # with the same name. E.g., # "prune test" skips test, fortran/test, c++/test, ... -# Skip COPYING since it is the detail Copyright notice. -skip COPYING +# Skip LICENSE since it is the detail Copyright notice. +skip LICENSE # Sort of strange to have a copyright notice in README skip README diff --git a/release_docs/HISTORY-1_10_0-1_12_0.txt b/release_docs/HISTORY-1_10_0-1_12_0.txt index 4649a319523..bd7c748402f 100644 --- a/release_docs/HISTORY-1_10_0-1_12_0.txt +++ b/release_docs/HISTORY-1_10_0-1_12_0.txt @@ -1152,7 +1152,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake diff --git a/release_docs/HISTORY-1_12_0-1_14_0.txt b/release_docs/HISTORY-1_12_0-1_14_0.txt index c48517c7c75..690f6968f9b 100644 --- a/release_docs/HISTORY-1_12_0-1_14_0.txt +++ b/release_docs/HISTORY-1_12_0-1_14_0.txt @@ -727,7 +727,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -1194,7 +1194,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -1749,7 +1749,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -2150,7 +2150,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -3907,7 +3907,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake diff --git a/release_docs/HISTORY-1_14_0-1_16_0.txt b/release_docs/HISTORY-1_14_0-1_16_0.txt index 815dbfa8fe3..fddc7923e8d 100644 --- a/release_docs/HISTORY-1_14_0-1_16_0.txt +++ b/release_docs/HISTORY-1_14_0-1_16_0.txt @@ -675,7 +675,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on Linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -2083,7 +2083,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on Linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -2785,7 +2785,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -3307,7 +3307,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -4040,7 +4040,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -6348,7 +6348,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -COPYING and RELEASE.txt file in the root folder, CMake places them in +LICENSE and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 066d5a6ec2c..e6c0f632728 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -168,10 +168,10 @@ New Features Documentation: -------------- - - The COPYING file has been renamed to LICENSE + - The LICENSE file has been renamed to LICENSE This is where most people will expect to find license information. The - COPYING_LBNL_HDF5 file has also been renamed to LICENSE_LBNL_HDF5. + LICENSE_LBNL_HDF5 file has also been renamed to LICENSE_LBNL_HDF5. The licenses are unchanged. From 9410a4933fb284671381d46f466f7cfa20f7433b Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 22 Oct 2024 08:06:56 -0500 Subject: [PATCH 2/3] revert history files --- release_docs/HISTORY-1_10_0-1_12_0.txt | 2 +- release_docs/HISTORY-1_12_0-1_14_0.txt | 10 +++++----- release_docs/HISTORY-1_14_0-1_16_0.txt | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/release_docs/HISTORY-1_10_0-1_12_0.txt b/release_docs/HISTORY-1_10_0-1_12_0.txt index bd7c748402f..4649a319523 100644 --- a/release_docs/HISTORY-1_10_0-1_12_0.txt +++ b/release_docs/HISTORY-1_10_0-1_12_0.txt @@ -1152,7 +1152,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake diff --git a/release_docs/HISTORY-1_12_0-1_14_0.txt b/release_docs/HISTORY-1_12_0-1_14_0.txt index 690f6968f9b..c48517c7c75 100644 --- a/release_docs/HISTORY-1_12_0-1_14_0.txt +++ b/release_docs/HISTORY-1_12_0-1_14_0.txt @@ -727,7 +727,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -1194,7 +1194,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -1749,7 +1749,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -2150,7 +2150,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -3907,7 +3907,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake diff --git a/release_docs/HISTORY-1_14_0-1_16_0.txt b/release_docs/HISTORY-1_14_0-1_16_0.txt index fddc7923e8d..815dbfa8fe3 100644 --- a/release_docs/HISTORY-1_14_0-1_16_0.txt +++ b/release_docs/HISTORY-1_14_0-1_16_0.txt @@ -675,7 +675,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on Linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -2083,7 +2083,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on Linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -2785,7 +2785,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -3307,7 +3307,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -4040,7 +4040,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake @@ -6348,7 +6348,7 @@ CMake vs. Autotools installations While both build systems produce similar results, there are differences. Each system produces the same set of folders on linux (only CMake works on standard Windows); bin, include, lib and share. Autotools places the -LICENSE and RELEASE.txt file in the root folder, CMake places them in +COPYING and RELEASE.txt file in the root folder, CMake places them in the share folder. The bin folder contains the tools and the build scripts. Additionally, CMake From 0d38d87dc1d3d91bbca7a5aab2157ecdb59605c8 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 22 Oct 2024 16:09:59 -0500 Subject: [PATCH 3/3] Undo overzealous cut-n-paste --- release_docs/RELEASE.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index e6c0f632728..066d5a6ec2c 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -168,10 +168,10 @@ New Features Documentation: -------------- - - The LICENSE file has been renamed to LICENSE + - The COPYING file has been renamed to LICENSE This is where most people will expect to find license information. The - LICENSE_LBNL_HDF5 file has also been renamed to LICENSE_LBNL_HDF5. + COPYING_LBNL_HDF5 file has also been renamed to LICENSE_LBNL_HDF5. The licenses are unchanged.