Update scripts in util/ to drop the year information from the individual source files.

This commit is contained in:
Ondřej Surý 2018-02-19 12:03:28 +01:00
parent 5bb02f5fbf
commit 785194b46f
10 changed files with 2756 additions and 2812 deletions

View file

@ -1,5 +1,5 @@
Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Copyright (C) @SFTYEARS@ Internet Software Consortium.
Copyright (C) Internet Systems Consortium, Inc. ("ISC")
Copyright (C) Internet Software Consortium.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above

View file

@ -1,3 +1,2 @@
Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Copyright (C) @SFTYEARS@ Internet Software Consortium.
Copyright (C) Internet Systems Consortium, Inc. ("ISC")
See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.

View file

@ -1,6 +1,9 @@
Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Copyright (C) @SFTYEARS@ Internet Software Consortium.
See the COPYRIGHT file distributed with this work for additional
information regarding copyright ownership.
This code is derived from software contributed to ISC by
Berkeley Software Design, Inc.

View file

@ -13,7 +13,10 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Portions Copyright (C) 1995-2000 by Network Associates, Inc.
See the COPYRIGHT file distributed with this work for additional
information regarding copyright ownership.
Portions Copyright (C) Network Associates, 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

@ -13,7 +13,10 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Portions Copyright (C) @NOMYEARS@ Nominum, Inc.
See the COPYRIGHT file distributed with this work for additional
information regarding copyright ownership.
Portions Copyright (C) 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,5 +1,5 @@
Portions Copyright (C) @SYSYEARS@ Internet Systems Consortium, Inc. ("ISC")
Portions Copyright (C) @SFTYEARS@ Internet Software Consortium.
Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
Portions Copyright (C) Internet Software Consortium.
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above

File diff suppressed because it is too large Load diff

View file

@ -1,24 +0,0 @@
#!/bin/sh
#
# Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id$
# Given a file in the currently checked-out branch of the Git
# repository, find out in what year it was most recently committed.
# Used by merge_copyrights.
rev=`git rev-list HEAD -- "$1" | head -n 1`
git show --pretty=format:%ai $rev | head -n 1 | sed 's;-.*;;'

View file

@ -21,7 +21,6 @@ use strict;
my %file_types = ();
my %file_years = ();
my %exists = ();
open(COPYRIGHTS, "<util/copyrights") || die "can't open ./util/copyrights: $!";
while (<COPYRIGHTS>) {
@ -36,20 +35,10 @@ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime(time());
$sec = $min = $hour = $mday = $mon = $wday = $yday = $isdst = 0;
$year += 1900;
open(FILES, "git ls-files | sed 's;^;./;' |") || die "git ls-files: $!";
while (<FILES>) {
chomp;
$exists{$_} = 1;
}
close(FILES);
open(CHANGES, "sh util/recent_changes.sh |") || die "recent_changes.sh: $!";
open(CHANGES, "git ls-files | sed 's;^;./;' | sort |") || die "git ls-files: $!";
while (<CHANGES>) {
chomp;
# this file isn't in the repository now
next unless ($exists{$_});
next if (m%/\.\# | # CVS old conflict file
/CVS/ | # CVS directory
/.git/ | # git directory
@ -144,13 +133,9 @@ while (<CHANGES>) {
} else {
$file_types{$_} = "?";
}
my $m_year = int(`sh util/file_year.sh $_`);
if (($file_types{$_} eq "MAN" || $file_types{$_} eq "HTML") &&
$base =~ /\.docbook$/ && -e $base) {
$file_years{$_} = "DOCBOOK";
} elsif ($m_year != $year) {
print "$_: must set copyright year(s) manually\n";
$file_years{$_} = "????";
} else {
$file_years{$_} = "$year";
}

View file

@ -1,28 +0,0 @@
#!/bin/sh
#
# Copyright (C) 2012, 2017 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# Find the list of files that have been touched in the Git repository
# during the current calendar year. This is done by walking backwards
# through the output of "git whatchanged" until a year other than the
# current one is seen. Used by merge_copyrights.
thisyear=`date +%Y`
when="`expr $thisyear - 1`-12-31"
git whatchanged --since="$when" --pretty="" | awk '
BEGIN { change=0 }
NF == 0 { next; }
$(NF-1) ~ /[AM]/ { print "./" $NF; change=1 }
END { if (change) print "./COPYRIGHT" } ' | sort | uniq