Further updates to cope with new code

tools/relic/relic

@@ -190,10 +190,9 @@ _g_skip_files = [
     # TODO: Update
     "xpfe/global/resources/content/license.html",
     "toolkit/content/license.html",
-    
-    ###########################################################################
-    # Everything in _g_skip_files below this line needs no further work.
     ###########################################################################
+# Everything in _g_skip_files below this line needs no further work.
+###########################################################################
     
     # Ben Bucksch - files are tri-licensed with an extra clause.
     "netwerk/streamconv/converters/mozTXTToHTMLConv.cpp",
@@ -224,7 +223,7 @@ _g_skip_files = [
     "security/nss/lib/freebl/mpi/README",
     "lib/mac/UserInterface/Tables/TableClasses.doc",
     
-    # XXX Not sure what to do with these...
+    # Not sure what to do with this...
     "gfx/cairo/stdint.diff",
     
     # Same license as files distributed with
@@ -244,8 +243,7 @@ _g_skip_dir_basenames_cvs_only = [
 # Complete path from mozilla dir to a dir to skip.
 _g_skip_dirs = [
     ###########################################################################
-    # Everything in_g_skip_dirs below this line needs no further work.
-    ###########################################################################
+# Everything in_g_skip_dirs below this line needs no further work.    ###########################################################################
     
     # Test files for this script; they cause it to crash!
     "tools/relic/test",
@@ -262,7 +260,7 @@ _g_skip_dirs = [
     "directory/perldap", # Perl LDAP SDK
     "ef", # Multi-platform Java JIT
     "grendel", # Mail client in Java
-    "js/rhino", # Currently under discussion - may end up BSD
+    "js/rhino", # Currently MPL/GPL - may end up BSD
     "mstone", # Mail server performance testing tool
     "webtools", # Various MPLed webtools
     
@@ -272,6 +270,7 @@ _g_skip_dirs = [
     "java",
     "privacy",
 
+    # These have their own BSD-like license
     "jpeg",
     "modules/libimg/mng",
     
@@ -396,6 +395,7 @@ _g_ext_to_comment_info = {
     ".l":      (["/*", " *", "*/"], ),
     ".htp":    (["/*", " *", "*/"], ),
     ".xs":     (["/*", " *", "*/"], ),
+    ".as":     (["/*", " *", "*/"], ),
     ".api":    (["/*", " *", "*/"], ['#']),
 
     ".html": (["<!--", "   -", "-->"], ["#"]),
@@ -554,6 +554,30 @@ the Initial Developer. All Rights Reserved.
 Contributor(s):
 %s
 """,
+    "gpl for mpl": """\
+Alternatively, the contents of this file may be used under the terms of
+the GNU General Public License Version 2 or later (the "GPL"), in which
+case the provisions of the GPL are applicable instead of those above. If
+you wish to allow use of your version of this file only under the terms of
+the GPL and not to allow others to use your version of this file under the
+MPL, indicate your decision by deleting the provisions above and replacing
+them with the notice and other provisions required by the GPL. If you do
+not delete the provisions above, a recipient may use your version of this
+file under either the MPL or the GPL.
+
+***** END LICENSE BLOCK *****""",
+    "gpl for npl": """\
+Alternatively, the contents of this file may be used under the terms of
+the GNU General Public License Version 2 or later (the "GPL"), in which
+case the provisions of the GPL are applicable instead of those above. If
+you wish to allow use of your version of this file only under the terms of
+the GPL and not to allow others to use your version of this file under the
+NPL, indicate your decision by deleting the provisions above and replacing
+them with the notice and other provisions required by the GPL. If you do
+not delete the provisions above, a recipient may use your version of this
+file under either the NPL or the GPL.
+
+***** END LICENSE BLOCK *****""",
     "gpl/lgpl for mpl": """\
 Alternatively, the contents of this file may be used under the terms of
 either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -1196,7 +1220,7 @@ def _get_license_info(filename, quick=0):
             \.?         # maybe a trailing period
             (
                 \s+Portions\ created\ by\ .*?
-                are\ Copyright\ \(C\)\ (?P<date>[\d-]+)
+                are\ Copyright\ \(C\)\[?\ (?P<date>[\d-]+)
                 .*?     # maybe a trailing period
                 (\s+All\ Rights\ Reserved\.)?
             )?