Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitde7c8db

Browse files
committed
Make copyright.pl cope with nonstandard case choices in copyright notices.
The need for this is shown by the files it missed in Bruce's recent run.I fixed it so that it will actually adjust the case when needed.In passing, also make it skip .po files, since those will just getoverwritten anyway from the translation repository.
1 parent48c9f28 commitde7c8db

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

‎src/tools/copyright.pl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
use Tie::File;
1818

1919
my$pgdg ='PostgreSQL Global Development Group';
20-
my$cc ='Copyright \(c\)';
20+
my$cc ='Copyright \(c\)';
21+
my$ccliteral ='Copyright (c)';
2122

2223
# year-1900 is what localtime(time) puts in element 5
2324
my$year = 1900 + ${ [localtime(time) ] }[5];
@@ -40,7 +41,7 @@ sub wanted
4041

4142
# skip file names with binary extensions
4243
# How are these updated? bjm 2012-01-02
43-
returnif ($_ =~m/\.(ico|bin)$/);
44+
returnif ($_ =~m/\.(ico|bin|po)$/);
4445

4546
my@lines;
4647
tie@lines,"Tie::File",$File::Find::name;
@@ -49,16 +50,16 @@ sub wanted
4950
{
5051

5152
# We only care about lines with a copyright notice.
52-
nextunless$line =~m/$cc.*$pgdg/;
53+
nextunless$line =~m/$cc.*$pgdg/i;
5354

5455
# Skip line if already matches the current year; if not
5556
# we get $year-$year, e.g. 2012-2012
56-
nextif$line =~m/$cc$year,$pgdg/;
57+
nextif$line =~m/$cc$year,$pgdg/i;
5758

5859
# We process all lines because some files have copyright
5960
# strings embedded in them, e.g. src/bin/psql/help.c
60-
$line =~s/($cc\d{4})(, $pgdg)/$1-$year$2/;
61-
$line =~s/($cc\d{4})-\d{4}(, $pgdg)/$1-$year$2/;
61+
$line =~s/$cc (\d{4})-\d{4}, $pgdg/$ccliteral$1-$year,$pgdg/i;
62+
$line =~s/$cc (\d{4}), $pgdg/$ccliteral$1-$year,$pgdg/i;
6263
}
6364
untie@lines;
6465
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp