--- a/tools/relic/make-id-list
+++ b/tools/relic/make-id-list
@@ -8,21 +8,25 @@
# to make them all use the same variant of each name.
my %equivalents = (
"ActiveState Tool Corporation" => "ActiveState Tool Corp",
"Activestate Tool Corp" => "ActiveState Tool Corp",
"ActiveState Tool Corp." => "ActiveState Tool Corp",
"Crocodile Clips Ltd." => "Crocodile Clips Ltd",
+ "Hewlett-Packard Company. Portions created by Hewlett-Packard Company are Copyright" => "Hewlett-Packard Company",
+
"IBM" => "IBM Corporation",
"IBM Corp" => "IBM Corporation",
"International Business Machines Corporation" => "IBM Corporation",
+ "None" => "Mozilla Foundation",
"a mozilla.org contributor" => "Mozilla Foundation",
+ "person recorded in the version control logs" => "Mozilla Foundation",
"Mozilla" => "Mozilla Foundation",
"Mozilla.com" => "Mozilla Corporation",
"Mozilla.org" => "Mozilla Foundation",
"Mozilla Organization" => "Mozilla Foundation",
"mozilla.org" => "Mozilla Foundation",
"mozilla.org SeaMonkey project" => "Mozilla Foundation",
"SeaMonkey project" => "Mozilla Foundation",
@@ -32,17 +36,19 @@ my %equivalents = (
"Mozilla Corp" => "Mozilla Corporation",
"Netscape" => "Netscape Communications Corporation",
"Netscape Corp" => "Netscape Communications Corporation",
"Netscape Communications" => "Netscape Communications Corporation",
"Netscape Communications, Inc" => "Netscape Communications Corporation",
"Netscape Communications Corp" => "Netscape Communications Corporation",
"Netscape Communications Corp." => "Netscape Communications Corporation",
+ "Netscape Commmunications Corp" => "Netscape Communications Corporation",
"Netscape Communications Corp, Inc" => "Netscape Communications Corporation",
+ "Netscape Communication Corporation" => "Netscape Communications Corporation",
"Novell" => "Novell Inc",
"Novell, Inc" => "Novell Inc",
"Novell Corporation" => "Novell Inc",
"Red Hat Software" => "Red Hat Inc",
"Red Hat" => "Red Hat Inc",
"Red Hat, Inc" => "Red Hat Inc",
@@ -65,39 +71,38 @@ my %equivalents = (
"University Of Queensland" => "University of Queensland",
"OEOne Corporation" => "OEone Corporation",
"Paul Kocher of Cryptography Research" => "Paul Kocher",
"QUALCOMM incorporated" => "Qualcomm Inc",
"Simdesk Technologies" => "Simdesk Technologies Inc",
"Google" => "Google Inc",
"Telephone Corporation)" => "NTT",
- "Frank Schoenheit" => "Frank Schönheit",
- "HÃ¥kan Waara" => "Håkan Waara",
- "Karsten Düsterloh" => "Karsten Düsterloh",
- "Simon Bünzli" => "Simon Bünzli",
- "Vincent Béron" => "Vincent Béron",
- "Tomas Mšller" => "Tomas Müller",
-
- "person recorded in the version control logs" => "Mozilla Foundation",
- "None" => "Mozilla Foundation"
+ "Frank Schoenheit" => "Frank Schönheit",
+ "Frank Schönheit" => "Frank Schönheit",
+ "HÃ¥kan Waara" => "Håkan Waara",
+ "Håkan Waara" => "Håkan Waara",
+ "Karsten Düsterloh" => "Karsten Düsterloh",
+ "Simon Bünzli" => "Simon Bünzli",
+ "Vincent Béron" => "Vincent Béron",
+ "Tomas Mšller" => "Tomas Müller",
);
# 'indevs' == "Initial Developers"
my %indevs;
while (<>)
{
chomp;
my @candidates = split(" and ", $_);
foreach my $indev (@candidates)
{
# Chop off email addresses and suchlike
$indev =~ s/[<,\(].*$//;
- $indev =~ s/^The\s*//i;
+ $indev =~ s/^The\s+//i;
# Trim whitespace
$indev =~ s/^\s*//;
$indev =~ s/\s*$//;
$indev = $equivalents{$indev} || $indev;
$indevs{$indev} = 1;
}
--- a/tools/relic/relic
+++ b/tools/relic/relic
@@ -162,39 +162,34 @@ log = logging.getLogger("relic")
"config.sub",
# Auto-generated from other files
"configure",
# license and readme files
"license",
"readme",
-
+ "copyright",
+ "LICENSE-MPL",
+ "MPL-1.1.txt",
]
_g_skip_files = [
# TODO: update with MPL block - or CVS remove (check history)
"tools/wizards/templates/licenses/MPL/lic.mak",
"tools/wizards/templates/licenses/MPL/lic.pl",
###########################################################################
# Everything in _g_skip_files below this line needs no further work.
###########################################################################
# Files containing copies of licence text which confuses the script
"LICENSE",
"js2/COPYING",
"security/svrcore/LICENSE",
"extensions/xmlterm/doc/MPL",
- "xpinstall/wizard/unix/src2/MPL-1.1.txt",
- "nsprpub/pkg/solaris/common_files/copyright",
- "security/nss/pkg/solaris/common_files/copyright",
- "security/jss/pkg/solaris/common_files/copyright",
- "security/nss/lib/freebl/mpi/utils/LICENSE-MPL",
- "security/nss/lib/freebl/mpi/tests/LICENSE-MPL",
- "security/nss/lib/freebl/mpi/doc/LICENSE-MPL",
"gfx/cairo/cairo/COPYING-LGPL-2.1",
"gfx/cairo/cairo/COPYING-MPL-1.1",
# Files containing global licensing information
"xpfe/global/resources/content/license.html",
"toolkit/content/license.html",
# Ben Bucksch - files are tri-licensed with an extra clause.
@@ -268,25 +263,21 @@ log = logging.getLogger("relic")
# Test files for this script, which cause it to crash!
"tools/relic/test",
# License template files (TODO: this directory may disappear)
"tools/wizards/templates/licenses",
# As per the "New Original Source Files" section of:
# http://www.mozilla.org/MPL/license-policy.html
+ # with obsolete or now-relicensed directories removed
"apache", # Obsolete mod_gzip code
"cck", # mkaply's baby; not core code anyway.
"dbm",
-# "directory/java-sdk", # Java LDAP SDK
- "directory/perldap", # Perl LDAP SDK
- "ef", # Multi-platform Java JIT
- "grendel", # Mail client in Java
"js/rhino", # Currently MPL/GPL - may end up BSD
- "mstone", # Mail server performance testing tool
"webtools", # Various MPLed webtools
# These could be done, but no-one's clamouring for it, and it's a hassle
# sorting it all out, so let sleeping dogs lie.
"msgsdk",
"java",
"privacy",
@@ -458,16 +449,17 @@ log = logging.getLogger("relic")
".dsp": (["#"], ),
".exp": (["#"], ),
".mk": (["#"], ),
".mn": (["#"], ),
".mak": (["#"], ),
".MAK": (["#"], ),
".perl": (["#"], ),
".pl": (["#"], ),
+ ".PL": (["#"], ),
".sh": (["#"], ),
".dsw": (["#"], ),
".cgi": (["#"], ),
".pm": (["#"], ),
".pod": (["#"], ),
".src": (["#"], ),
".csh": (["#"], ),
".DLLs": (["#"], ),