From 05818ac990eb284f8476cf379d05bdd878696665 Mon Sep 17 00:00:00 2001 From: Ward Fisher Date: Thu, 6 Dec 2018 15:51:35 -0700 Subject: [PATCH] Misc. files updated with copyright stanza. --- CMakeInstallation.cmake | 10 ++++++++-- CTestConfig.cmake.in | 8 +++++++- CTestCustom.cmake | 6 ++++++ FixBundle.cmake.in | 6 ++++++ cmake_uninstall.cmake.in | 6 ++++++ config.h.cmake.in | 10 ++++++++++ lib_flags.am | 14 +++++--------- plugins/CMakeLists.txt | 6 ++++++ test_common.in | 7 +++++++ test_prog.c | 4 ++-- 10 files changed, 63 insertions(+), 14 deletions(-) diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 4ee9df9920..80714b8b1f 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -1,3 +1,9 @@ +# 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. ##### # Contains variables and settings used # by the CMake build system in order to @@ -72,7 +78,7 @@ IF(NC_DPKG) ENDMACRO(getdpkg_arch) getdpkg_arch(dpkg_arch) - SET(CPACK_DEBIAN_PACKAGE_NAME "netcdf4-dev") + SET(CPACK_DEBIAN_PACKAGE_NAME "netcdf4-dev") SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "${dpkg_arch}") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "zlib1g (>= 1:1.2.3.4), libhdf5-7 (>= 1.8.11), libcurl4-openssl-dev (>= 7.22.0)") ENDIF() @@ -127,4 +133,4 @@ set(CPACK_COMPONENT_DEPENDENCIES_DESCRIPTION set(CPACK_COMPONENT_DOCUMENTATION_DESCRIPTION "The NetCDF-C user documentation.") -INCLUDE(CPack) \ No newline at end of file +INCLUDE(CPack) diff --git a/CTestConfig.cmake.in b/CTestConfig.cmake.in index 6c992f34c7..fd83217684 100644 --- a/CTestConfig.cmake.in +++ b/CTestConfig.cmake.in @@ -1,4 +1,10 @@ -## This file should be placed in the root directory of your project. +# 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. +# This file should be placed in the root directory of your project. ## Then modify the CMakeLists.txt file in the root directory of your ## project to incorporate the testing dashboard. ## diff --git a/CTestCustom.cmake b/CTestCustom.cmake index 4909748ece..7483a775f0 100644 --- a/CTestCustom.cmake +++ b/CTestCustom.cmake @@ -1,3 +1,9 @@ +# 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. ## This file is used to customize CTest. ## See: ## diff --git a/FixBundle.cmake.in b/FixBundle.cmake.in index 02d43428e8..d22728a014 100644 --- a/FixBundle.cmake.in +++ b/FixBundle.cmake.in @@ -1,3 +1,9 @@ +# 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. INCLUDE(BundleUtilities) # Set bundle to the full path name of the executable diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in index ace1e7122d..9dc757d1a4 100644 --- a/cmake_uninstall.cmake.in +++ b/cmake_uninstall.cmake.in @@ -1,3 +1,9 @@ +# 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. CMAKE_POLICY(SET CMP0007 OLD) if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") diff --git a/config.h.cmake.in b/config.h.cmake.in index 912495581e..a806a9b000 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -1,3 +1,13 @@ +/*! \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. + +*/ #ifndef CONFIG_H #define CONFIG_H diff --git a/lib_flags.am b/lib_flags.am index 58accdf60f..72f45e5978 100644 --- a/lib_flags.am +++ b/lib_flags.am @@ -1,20 +1,16 @@ # This is part of the netCDF package. -# Copyright 2005 University Corporation for Atmospheric Research/Unidata +# Copyright 2018 University Corporation for Atmospheric Research/Unidata # See COPYRIGHT file for conditions of use. -# +# # Assemble the CPPFLAGS and LDFLAGS that point to all the needed # libraries for netCDF-4. # -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_LDFLAGS = +AM_CPPFLAGS = -I$(top_srcdir)/include +AM_LDFLAGS = if USE_DAP AM_CPPFLAGS += -I${top_srcdir}/oc2 endif -AM_TESTS_ENVIRONMENT = export TOPSRCDIR=${abs_top_srcdir}; export TOPBUILDDIR=${abs_top_builddir}; - - - - +AM_TESTS_ENVIRONMENT = export TOPSRCDIR=${abs_top_srcdir}; export TOPBUILDDIR=${abs_top_builddir}; diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index e5ba4e21d7..9b5d30ce44 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,3 +1,9 @@ +# 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(CMAKE_BUILD_TYPE "") SET(libbzip2_SOURCES blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c H5Zbzip2.c) diff --git a/test_common.in b/test_common.in index b8af51855d..67f7cc1c0d 100644 --- a/test_common.in +++ b/test_common.in @@ -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. + TOPSRCDIR='@abs_top_srcdir@' TOPBUILDDIR='@abs_top_builddir@' diff --git a/test_prog.c b/test_prog.c index d0c6706a0d..ba9a6fd46c 100644 --- a/test_prog.c +++ b/test_prog.c @@ -1,10 +1,10 @@ -/* This is part of Unidata's netCDF package. Copyright 2009. +/* This is part of Unidata's netCDF package. Copyright 2018. This is a test program for the nc-config utility. */ #include #include int -main() +main() { printf("NetCDF version: %s\n", nc_inq_libvers()); printf("*** SUCCESS!\n");