[Wisp-cvs] wisp config.guess,1.2,1.3 config.sub,1.1,1.2 install-sh,1.3,1.4 wisplint.wisp,1.17,1.18

[<di...@us...>]

Update of /cvsroot/wisp/wisp
In directory usw-pr-cvs1:/tmp/cvs-serv30450

Modified Files:
	config.guess config.sub install-sh wisplint.wisp 
Log Message:
Made wisplint.wisp check that source files manifest their proper names.

Index: config.guess
===================================================================
RCS file: /cvsroot/wisp/wisp/config.guess,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config.guess	22 Jul 2002 14:36:46 -0000	1.2
+++ config.guess	4 Sep 2002 14:31:41 -0000	1.3
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# config.guess - attempt to guess a canonical system name
+#   Copyright © 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
 timestamp='2002-03-20'

Index: config.sub
===================================================================
RCS file: /cvsroot/wisp/wisp/config.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config.sub	12 May 2002 14:39:13 -0000	1.1
+++ config.sub	4 Sep 2002 14:31:41 -0000	1.2
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# config.sub - configuration validation subroutine script
+#   Copyright © 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
 timestamp='2002-03-07'

Index: install-sh
===================================================================
RCS file: /cvsroot/wisp/wisp/install-sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- install-sh	30 Jul 2002 21:43:59 -0000	1.3
+++ install-sh	4 Sep 2002 14:31:41 -0000	1.4
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# install - install a program, script, or datafile
+# install-sh - install a program, script, or datafile
 # This comes from X11R5 (mit/util/scripts/install.sh).
 #
 # Copyright 1991 by the Massachusetts Institute of Technology

Index: wisplint.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/wisplint.wisp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- wisplint.wisp	31 Aug 2002 14:29:37 -0000	1.17
+++ wisplint.wisp	4 Sep 2002 14:31:41 -0000	1.18
@@ -13,7 +13,7 @@
 (define (check-for-gpl-notice name)
   (call-with-input-file name
     (lambda (port)
-      (my head (string-join (read-all-lines port 7)
+      (my head (string-join (read-all-lines port 10)
                             #\newline
                             'suffix)
         (cond
@@ -50,6 +50,22 @@
                            "@users.sourceforge.net")
         (raise 'refers-to-sourceforge.net name)))))
 
+(define (check-for-filename name)
+  (call-with-input-file name
+    (lambda (port)
+      (my manifest-name name
+        (if (and (string=? name[... 8] "modules/")
+                 (string=? name[-4 ...] ".wim"))
+          (set! manifest-name name[8 ...]))
+        (my haystack (string-join (read-all-lines port 10)
+                                  #\newline
+                                  'suffix)
+          (if (not (or (string-contains haystack " $,[manifest-name] ")
+                       (string-contains haystack " $,[manifest-name]\n")
+                       (string-contains haystack " $,(basename name) ")
+                       (string-contains haystack " $,(basename name)\n")))
+            (raise 'no-filename name)))))))
+
 (define (check-for-id name)
   (call-with-input-file name
     (lambda (port)
@@ -144,7 +160,29 @@
                                        "tests/cut-check.wisp"
                                        "wa/README.wa")
                                 string=?)))
-            (run check-for-id name))))))
+            (run check-for-id name))
+          (if (and (not (equal? (filename-suffix name) ".s"))
+                   (not (member name '("COPYING"
+                                       "DISCLAIMER"
+                                       "INSTALL"
+                                       "README"
+                                       "acconfig.h"
+                                       "debian/changelog"
+                                       "debian/control"
+                                       "doc/TODO"
+                                       "doc/depends.txt"
+                                       "doc/examples/quine.wisp"
+                                       "doc/paw.txt"
+                                       "doc/wisp.texi"
+                                       "src/native/sysconst.inc"
+                                       "src/stamp-h.in"
+                                       "src/sysconst.h"
+                                       "wa/README.wa"
+                                       "web/gray.cgi"
+                                       "web/index.html"
+                                       "web/names.cgi")
+                                string=?)))
+            (run check-for-filename name))))))
   (collect
     (lambda (emit)
       (let (loop (dir "."))