ensure COPYRIGHT file retains years; edit file headers for consistency

This commit is contained in:
Evan Hunt 2018-03-15 18:32:02 -07:00
parent 26e0ed8331
commit da4aa9b03f
8 changed files with 14 additions and 20 deletions

View file

@ -1,8 +1,3 @@
Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Copyright (C) Internet Systems Consortium, Inc. ("ISC")
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
See the COPYRIGHT file distributed with this work for additional
information regarding copyright ownership.
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

View file

@ -1,4 +1,4 @@
Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Copyright (C) Internet Systems Consortium, Inc. ("ISC")
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this

View file

@ -1,4 +1,4 @@
Portions Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this

View file

@ -1,4 +1,4 @@
Portions Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
@ -7,7 +7,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
See the COPYRIGHT file distributed with this work for additional
information regarding copyright ownership.
Portions Copyright (C) Nominum, Inc.
Portions Copyright (C) @NOMYEARS@ Nominum, Inc.
Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above

View file

@ -1,4 +1,4 @@
Portions Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this

5
util/COPYRIGHT.TOP Normal file
View file

@ -0,0 +1,5 @@
Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.

View file

@ -7,7 +7,7 @@
./CHANGES X 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
./CONTRIBUTING X 2017,2018
./CONTRIBUTING.md MKD 2017,2018
./COPYRIGHT X 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
./COPYRIGHT X.TOP 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
./HISTORY X 2010,2013,2016,2017,2018
./HISTORY.md MKD 2017,2018
./Kyuafile X 2017,2018

View file

@ -21,6 +21,7 @@ require 5.002;
my %owner2filename = (
"" => "util/COPYRIGHT",
TOP => "util/COPYRIGHT.TOP",
"NAI" => "util/COPYRIGHT.NAI",
"NOM" => "util/COPYRIGHT.NOM",
"BSDI" => "util/COPYRIGHT.BSDI",
@ -442,10 +443,6 @@ foreach $file (keys %file_types) {
}
} else {
$years .= $last_year == 0 ? "$year" : ", $year";
#if ($anchor_year != 0) {
# print "$file: noncontiguous year: ",
# "$year != $last_year + 1\n";
#}
$anchor_year = $year;
$anchor_end = length($years);
}
@ -454,9 +451,6 @@ foreach $file (keys %file_types) {
}
$nomyears = $years;
#
# Internet Systems Consortium: 2004 onwards.
#
$last_year = 0;
$anchor_year = 0;
$years = "";