Updating files to refer to the top-level COPYRIGHT file.

magnusuMET · Dec 4, 2018 · 3c59fb8 · 3c59fb8
1 parent 991dbab
commit 3c59fb8
Show file tree

Hide file tree

Showing 39 changed files with 328 additions and 168 deletions.
diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 SET(abs_top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
 
 remove_definitions(-DDLL_EXPORT)

diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am
@@ -1,5 +1,5 @@
 ## This is a automake file, part of Unidata's netCDF package.
-# Copyright 2011, see the COPYRIGHT file for more information.
+# Copyright 2018, see the COPYRIGHT file for more information.
 
 # This file builds and runs DAP4 tests.
 

diff --git a/dap4_test/baseline/CMakeLists.txt b/dap4_test/baseline/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/baselineraw/CMakeLists.txt b/dap4_test/baselineraw/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/baselineremote/CMakeLists.txt b/dap4_test/baselineremote/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/cdltestfiles/CMakeLists.txt b/dap4_test/cdltestfiles/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/daptestfiles/CMakeLists.txt b/dap4_test/daptestfiles/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/dmrtestfiles/CMakeLists.txt b/dap4_test/dmrtestfiles/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/misctestfiles/CMakeLists.txt b/dap4_test/misctestfiles/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/dap4_test/nctestfiles/CMakeLists.txt b/dap4_test/nctestfiles/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*)
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
 

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 #####
 # Build doxygen documentation, if need be.
 #####

diff --git a/docs/COPYRIGHT.dox b/docs/COPYRIGHT.dox
diff --git a/docs/COPYRIGHT.md b/docs/COPYRIGHT.md
@@ -0,0 +1,16 @@
+COPYRIGHT {#copyright}
+=====================
+
+Copyright 2018 Unidata
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in
@@ -761,7 +761,7 @@ INPUT = \
     @abs_top_srcdir@/docs/all-error-codes.md \
     @abs_top_srcdir@/docs/FAQ.md \
     @abs_top_srcdir@/docs/known_problems.md \
-    @abs_top_srcdir@/docs/COPYRIGHT.dox \
+    @abs_top_srcdir@/docs/COPYRIGHT.md \
     @abs_top_srcdir@/docs/credits.md \
     @abs_top_srcdir@/docs/bestpractices.md \
     @abs_top_srcdir@/docs/tutorial.dox \

diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -1,6 +1,10 @@
 ## This is a automake file, part of Unidata's netCDF package.
-# Copyright 2005-2011, see the COPYRIGHT file for more information.
-# This file builds the netcdf documentation.
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
 
 # These files will be included with the dist.
 EXTRA_DIST = netcdf.m4 DoxygenLayout.xml Doxyfile.in footer.html	\

diff --git a/docs/images/Makefile.am b/docs/images/Makefile.am
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 EXTRA_DIST = aqua.jpg chunking2.png compatibility3.png compression.png	\
 groups.png nc4-model.png ncatts.png nc-classic-uml.png nccoords.png	\
 ncfile.png pnetcdf.png terra.jpg netcdf_architecture.png \

diff --git a/docs/user_defined_formats.md b/docs/user_defined_formats.md
@@ -111,4 +111,3 @@ user-defined format. (This is unnecessary if you just want to read
 HDF4 SD files, since the netCDF C library already includes an HDF4 SD
 file reader. This user-defined format library uses the same code. It
 is repackaged as a user-defined library to provide a working sample.)
-
diff --git a/examples/C/CMakeLists.txt b/examples/C/CMakeLists.txt
@@ -1,3 +1,10 @@
+# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+# 2015, 2016, 2017, 2018
+# University Corporation for Atmospheric Research/Unidata.
+
+# See netcdf-c/COPYRIGHT file for more info.
+
 SET(exam_C_tests simple_xy_wr simple_xy_rd sfc_pres_temp_wr sfc_pres_temp_rd pres_temp_4D_wr pres_temp_4D_rd)
 SET(exam_C_tests_source "")
 FOREACH(F ${exam_C_tests})

diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am
@@ -1,5 +1,5 @@
 # This is a automake file, part of Unidata's netCDF package.
-# Copyright 2006, see the COPYRIGHT file for more information.
+# Copyright 2018, see the COPYRIGHT file for more information.
 
 # This file builds the C examples.
 

diff --git a/examples/C/file.c b/examples/C/file.c
@@ -1,5 +1,17 @@
+/*! \file
+
+Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+2015, 2016, 2017, 2018
+University Corporation for Atmospheric Research/Unidata.
+
+See \ref copyright file for more info.
+
+*/
+
+
 /* This example program is part of Unidata's netCDF library for
-   scientific data access. 
+   scientific data access.
 
    This program demonstrates various ways to create a netCDF file,
    open an existing file, and close a file.
@@ -18,7 +30,7 @@
 printf("Bailing out in file %s, line %d, error:%s.\n", \
 __FILE__, __LINE__, nc_strerror(e)); \
 return e; \
-} while (0) 
+} while (0)
 
 #define FILENAME "test.nc"
 #define VARNAME "var1"
@@ -31,7 +43,7 @@ int
 main()
 {
    /* These are netCDF IDs for file, dimension, and variable. */
-   int ncid, dimid, varid;   
+   int ncid, dimid, varid;
 
    /* This array will hold one ID for each dimension in the
       variable, in this case, one. */
@@ -41,7 +53,7 @@ main()
    int data_out[] = {0,1,2,3,4,5,6,7,8,9};
    int data_in[DIMLEN];
 
-   int i, res; 
+   int i, res;
 
    /* Create a classic format netCDF file, overwritting any file of
       this name that may already exist. */
@@ -99,11 +111,10 @@ main()
 	 fprintf(stderr, "Unexpected value!\n");
 	 return ERROR;
       }
-   
+
    /* Close the file again. */
    if ((res = nc_close(ncid)))
       BAIL(res);
 
    return 0;
 }
-
diff --git a/examples/C/format.c b/examples/C/format.c
@@ -1,5 +1,17 @@
+/*! \file
+
+Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+2015, 2016, 2017, 2018
+University Corporation for Atmospheric Research/Unidata.
+
+See \ref copyright file for more info.
+
+*/
+
+
 /* This example program is part of Unidata's netCDF library for
-   scientific data access. 
+   scientific data access.
 
    This example shows how to create and deal with files of different
    netcdf formats (i.e. classic vs. 64-bit-offset).
@@ -19,7 +31,7 @@
 printf("Bailing out in file %s, line %d, error:%s.\n", \
 __FILE__, __LINE__, nc_strerror(e)); \
 return NC_EXAMPLE_ERROR; \
-} while (0) 
+} while (0)
 
 #define NUMDIMS 2
 #define NUMVARS 1
@@ -33,7 +45,7 @@ main()
    float temp[LAT_LEN][LON_LEN], *fp;
    char classic_file[] = "classic.nc", offset64_file[] = "offset.nc";
    char *file = classic_file;
-   int i, res; 
+   int i, res;
 
    /* Create a bunch of phoney data so we have something to write in
       the example file. */
@@ -59,12 +71,12 @@ main()
 	   BAIL(res);
        if ((res = nc_def_dim(ncid, "longitude", LON_LEN, &dimids[1])))
 	   BAIL(res);
-       
+
        /* Define the variable. */
-       if ((res = nc_def_var(ncid, "sfc_temp", NC_FLOAT, NUMDIMS, 
+       if ((res = nc_def_var(ncid, "sfc_temp", NC_FLOAT, NUMDIMS,
 			     dimids, &temp_varid)))
 	   BAIL(res);
-   
+
        /* We're finished defining metadata. */
        if ((res = nc_enddef(ncid)))
 	   BAIL(res);
@@ -79,4 +91,3 @@ main()
 
    return 0;
 }
-
diff --git a/examples/C/large_files.c b/examples/C/large_files.c
@@ -1,3 +1,14 @@
+/*! \file
+
+Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
+2015, 2016, 2017, 2018
+University Corporation for Atmospheric Research/Unidata.
+
+See \ref copyright file for more info.
+
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <netcdf.h>
@@ -135,7 +146,7 @@ main() {			/* create rec2Gp.nc */
 	       for(j=0; j<J_LEN; j++) {
 		   for (k=0; k<K_LEN; k++) {
 		       if (var1[j][k] != (signed char) n) {
-			   printf("Error on read, var1[%d, %d, %d, %d] = %d wrong, should be %d !\n", rec, i, j, k, var1[j][k], (signed char) n); 
+			   printf("Error on read, var1[%d, %d, %d, %d] = %d wrong, should be %d !\n", rec, i, j, k, var1[j][k], (signed char) n);
 			   return 1;
 		       }
 		       n++;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,4 +111,3 @@ user-defined format. (This is unnecessary if you just want to read
		HDF4 SD files, since the netCDF C library already includes an HDF4 SD
		file reader. This user-defined format library uses the same code. It
		is repackaged as a user-defined library to provide a working sample.)