Skip to content

Commit

Permalink
Merge pull request #617 from derobins/vfd_swmr/thg_standards
Browse files Browse the repository at this point in the history
Update top-level COPYING file and remove COPYING files from subdirect…
  • Loading branch information
derobins authored May 3, 2021
2 parents 3de0b0a + a588815 commit 383be26
Show file tree
Hide file tree
Showing 20 changed files with 9 additions and 253 deletions.
6 changes: 6 additions & 0 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ under Prime Contract No. DE-AC02-05CH11231.

-----------------------------------------------------------------------------

Portions of HDF5 were developed with support from Lawrence Livermore
National Laboratory and the United States Department of Energy under
Prime Contract No. DE-AC52-07NA27344.

-----------------------------------------------------------------------------

Portions of HDF5 were developed with support from the University of
California, Lawrence Livermore National Laboratory (UC LLNL).
The following statement applies to those portions of the product and must
Expand Down
23 changes: 3 additions & 20 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
./m4/ax_try_compile_java.m4
./m4/ax_try_run_java.m4

./bin/COPYING
./bin/bbrelease _DO_NOT_DISTRIBUTE_
./bin/buildhdf5
./bin/checkapi _DO_NOT_DISTRIBUTE_
Expand Down Expand Up @@ -117,7 +116,6 @@
./bin/pkgscrpts/makeInternalREADME.pl _DO_NOT_DISTRIBUTE_
./bin/pkgscrpts/makeOuterREADME.pl _DO_NOT_DISTRIBUTE_

./config/COPYING
./config/BlankForm
./config/apple
./config/cce-fflags
Expand Down Expand Up @@ -263,7 +261,6 @@
#
#------------------------------------------------------------------------------

./fortran/COPYING
./fortran/Makefile.am
./fortran/robodoc.rc

Expand Down Expand Up @@ -395,7 +392,6 @@
#
#------------------------------------------------------------------------------

./c++/COPYING
./c++/Makefile.am

./c++/examples/chunks.cpp
Expand Down Expand Up @@ -526,7 +522,6 @@
#
#------------------------------------------------------------------------------

./release_docs/COPYING
./release_docs/HISTORY-1_0-1_8_0_rc3.txt
./release_docs/HISTORY-1_8_0-1_10_0.txt
./release_docs/HISTORY-1_10_0-1_12_0.txt
Expand All @@ -549,7 +544,6 @@
./src/hdf5.lnt _DO_NOT_DISTRIBUTE_
./src/hdf5-win.lnt _DO_NOT_DISTRIBUTE_
./src/hdf5-lin.lnt _DO_NOT_DISTRIBUTE_
./src/COPYING
./src/H5.c
./src/H5checksum.c
./src/H5dbg.c
Expand Down Expand Up @@ -1061,7 +1055,6 @@
./src/libhdf5.settings.in

./test/AtomicWriterReader.txt
./test/COPYING
./test/H5srcdir.h
./test/H5srcdir_str.h.in
./test/Makefile.am
Expand Down Expand Up @@ -1319,11 +1312,12 @@
./test/vds_swmr_reader.c
./test/vds_swmr_writer.c
./test/vfd_swmr.c
./test/vfd_swmr_addrem_writer.c
./test/vfd_swmr_attrdset_writer.c
./test/vfd_swmr_bigset_writer.c
./test/vfd_swmr_common.c
./test/vfd_swmr_common.h
./test/vfd_swmr_generator.c
./test/vfd_swmr_addrem_writer.c
./test/vfd_swmr_bigset_writer.c
./test/vfd_swmr_group_writer.c
./test/vfd_swmr_reader.c
./test/vfd_swmr_remove_reader.c
Expand Down Expand Up @@ -1440,7 +1434,6 @@
./test/testfiles/plist_files/strcpl_64be
./test/testfiles/plist_files/strcpl_64le

./testpar/COPYING
./testpar/Makefile.am
./testpar/t_bigio.c
./testpar/t_cache.c
Expand Down Expand Up @@ -1472,7 +1465,6 @@
./testpar/testphdf5.c
./testpar/testphdf5.h

./tools/COPYING
./tools/Makefile.am
./tools/src/Makefile.am
./tools/test/Makefile.am
Expand Down Expand Up @@ -2859,7 +2851,6 @@
./tools/testfiles/h5mkgrp_single_p.ls
./tools/testfiles/h5mkgrp_single_l.ls

./tools/test/perform/COPYING
./tools/test/perform/Makefile.am
./tools/test/perform/build_h5perf_alone.sh
./tools/test/perform/build_h5perf_serial_alone.sh
Expand All @@ -2884,7 +2875,6 @@
./tools/test/perform/zip_perf.c

# Utils directory
./utils/COPYING
./utils/Makefile.am

# Mirror VFD utilities
Expand All @@ -2896,7 +2886,6 @@
./utils/mirror_vfd/mirror_writer.c

# high level libraries
./hl/COPYING
./hl/Makefile.am
./hl/examples/Makefile.am
./hl/examples/ex_ds1.c
Expand All @@ -2923,7 +2912,6 @@
./hl/examples/ptExampleFL.c
./hl/examples/run-hl-ex.sh
./hl/examples/run-hlc-ex.sh.in
./hl/src/COPYING
./hl/src/Makefile.am
./hl/src/H5DO.c
./hl/src/H5DOpublic.h
Expand Down Expand Up @@ -2952,7 +2940,6 @@
./hl/src/H5TBprivate.h
./hl/src/H5TBpublic.h
./hl/src/hdf5_hl.h
./hl/test/COPYING
./hl/test/H5srcdir_str.h.in
./hl/test/Makefile.am
./hl/test/dsdata.txt
Expand Down Expand Up @@ -2988,7 +2975,6 @@
./hl/test/usa.wri

# tools
./hl/tools/COPYING
./hl/tools/Makefile.am
./hl/tools/gif2h5/Makefile.am
./hl/tools/gif2h5/decompress.c
Expand Down Expand Up @@ -3053,7 +3039,6 @@
./hl/tools/testfiles/w-help1.ddl

# hl fortran
./hl/fortran/COPYING
./hl/fortran/Makefile.am
./hl/fortran/examples/Makefile.am
./hl/fortran/examples/run-hlfortran-ex.sh.in
Expand All @@ -3078,7 +3063,6 @@
./hl/fortran/test/tsttable.F90

# hl c++
./hl/c++/COPYING
./hl/c++/Makefile.am
./hl/c++/examples/Makefile.am
./hl/c++/examples/ptExampleFL.cpp
Expand All @@ -3091,7 +3075,6 @@
./hl/c++/test/Makefile.am

# java
./java/COPYING
./java/Makefile.am
./java/CMakeLists.txt

Expand Down
13 changes: 0 additions & 13 deletions bin/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions c++/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions config/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions fortran/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions hl/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions hl/c++/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions hl/fortran/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions hl/src/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions hl/test/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions hl/tools/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions java/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions release_docs/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions src/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions test/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions testpar/COPYING

This file was deleted.

13 changes: 0 additions & 13 deletions tools/COPYING

This file was deleted.

Loading

0 comments on commit 383be26

Please sign in to comment.