Commits

Mats Lidell committed 20d3c94

Version used for producing published remaining files list.

Comments (0)

Files changed (3)

matsl/gplv3/ChangeLog

+2010-11-02  Mats Lidell  <matsl@xemacs.org>
+
+	* substgplv2 (licensePatterns): Handle some more line breaks in
+	the GPLv3 license text.
+	* substgplv2 (ignoreFiles): Don't ignore the bitmap formats png,
+	xbm and xpm.
+	* substgplv2 (checkGPLv2): Use nonsense.
+	* nonsense.py (nonsense): Added more files that needs special
+	treatment.
+
 2010-10-14  Mats Lidell  <matsl@xemacs.org>
 
 	* substgplv2: Removed commented out code. 

matsl/gplv3/nonsense.py

 # This is a dictionary of files that has no license ...
 
 # Explanation...
+GPLv3 = "GPLv3 or later -- But script can't identify it for some reason."
+LISPREF_TEXI = "see lispref.texi for copyright, not version 2 or later!?"
+MIT_NOA = 'MIT-style "no advertising" license'
 NL = "No license"
-LISPREF_TEXI = "see lispref.texi for copyright, not version 2 or later!?"
+NOEXP = "Emacs version has no explicit license declaration"
+OFSF = "old FSF Documentation license"
 
 nonsense = { 
-    './src/m/is386.h': NL,
-    './man/make-stds.texi' : NL,
-    "./man/lispref/back.texi" : NL,
+    "./config.guess" : "Part of config which is still GPLv2 or later. See \"http://savannah.gnu.org/projects/config\"",
+    "./config.sub" : "Part of config which is still GPLv2 or later. See \"http://savannah.gnu.org/projects/config\"",
+    "./aclocal.m4" : GPLv3,
+    "./move-if-change" : "Identical to GPLv3 or later Emacs version",
+    "./INSTALL" : OFSF,
+    "./install-sh" : MIT_NOA,
+    "./lisp/term/vt102.el" : NOEXP,
+    "./lisp/term/vt125.el" : NOEXP,
+    "./lisp/term/vt420.el" : NOEXP,
+    "./lisp/term/vt220.el" : NOEXP,
+    "./lisp/term/vt200.el" : NOEXP,
+    "./lisp/term/vt300.el" : NOEXP,
+    "./lisp/term/vt240.el" : NOEXP,
+    "./lisp/term/vt400.el" : NOEXP,
+    "./lisp/term/vt320.el" : NOEXP,
+    "./lisp/term/vt201.el" : NOEXP
 }	 
 

matsl/gplv3/substgplv2

 ignoreDirNames = re.compile('\.|\.\.|\.hg|CVS')
 
 # Don't bother with these files at all.
-ignoreFiles = re.compile('.*\.(bmp|gpg|ico|png|ps\.gz|xbm|xpm|orig)$|\.(cvs|hg)(ignore|tags)|README.*|.*(~|ChangeLog|NEWS)|depend|dir|install-sh|COPYING')
+ignoreFiles = re.compile('.*\.(bmp|gpg|ico|ps\.gz|orig)$|\.(cvs|hg)(ignore|tags)|README.*|.*(~|ChangeLog|NEWS)|depend|dir|install-sh|COPYING')
 
 # Generic copyleft
 genericCopyleft = """This file is part of XEmacs.
 # Pattern zero...
 # Already converted?
 [
-"Free Software Foundation, either version 3 of the License, or \(at your",
+"Free Software Foundation, either version 3 of the License, or(\s|#|;|\*)+\(at your(\s|#|;|\*)+option\) any later version.",
 "gplv3",
 None,
 ],
         m = pat.search(text)
         if m:
             # We got a match
-            printFile(copy[1], f, None, str(pos), copy[2])
-            assert(not f in nonsense.nonsense)
+            if copy[1] == "unknown(C)" and f in nonsense.nonsense:
+                printFile("?!!", f, nonsense.nonsense[f], "Nonsense", None)
+            else:
+                printFile(copy[1], f, None, str(pos), copy[2])
             return pos
     if f in nonsense.nonsense:
         printFile("?!!", f, nonsense.nonsense[f], "Nonsense", None)