From: Richard M Kreuter Date: Mon, 24 Nov 2008 15:56:11 +0000 (+0000) Subject: 1.0.22.19: Canonicalize whitespace in .asd files. X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=bf25f936158ea89a142d86a0f0216a8bed029dc5;p=sbcl.git 1.0.22.19: Canonicalize whitespace in .asd files. --- diff --git a/contrib/asdf-install/asdf-install.asd b/contrib/asdf-install/asdf-install.asd index d36609a..1795efc 100644 --- a/contrib/asdf-install/asdf-install.asd +++ b/contrib/asdf-install/asdf-install.asd @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- -(defpackage #:asdf-install-system +(defpackage #:asdf-install-system (:use #:cl #:asdf)) (in-package #:asdf-install-system) @@ -11,8 +11,8 @@ #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;ASDF-INSTALL;" :components ((:file "defpackage") - (:file "installer" :depends-on ("defpackage")))) - + (:file "installer" :depends-on ("defpackage")))) + (defmethod perform :after ((o load-op) (c (eql (find-system :asdf-install)))) (provide 'asdf-install)) diff --git a/contrib/sb-aclrepl/sb-aclrepl.asd b/contrib/sb-aclrepl/sb-aclrepl.asd index 8a18b39..4fbae1d 100644 --- a/contrib/sb-aclrepl/sb-aclrepl.asd +++ b/contrib/sb-aclrepl/sb-aclrepl.asd @@ -9,9 +9,9 @@ #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;SB-ACLREPL;" :components ((:file "toplevel") - (:file "repl" :depends-on ("toplevel")) - (:file "inspect" :depends-on ("repl")) - (:file "debug" :depends-on ("repl")))) + (:file "repl" :depends-on ("toplevel")) + (:file "inspect" :depends-on ("repl")) + (:file "debug" :depends-on ("repl")))) (defmethod perform :after ((o load-op) (c (eql (find-system :sb-aclrepl)))) (provide 'sb-aclrepl)) diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd index b70a7b0..90ecde9 100644 --- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd +++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd @@ -10,35 +10,35 @@ #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;SB-BSD-SOCKETS;" :components ((:file "defpackage") - (:file "split" :depends-on ("defpackage")) + (:file "split" :depends-on ("defpackage")) #+win32 - (:file "win32-lib") - #-win32 (sb-grovel:grovel-constants-file - "constants" - :package :sockint + (:file "win32-lib") + #-win32 (sb-grovel:grovel-constants-file + "constants" + :package :sockint :do-not-grovel #.(progn #-sb-building-contrib t) - :depends-on ("defpackage")) - #+win32 (sb-grovel:grovel-constants-file - "win32-constants" - :package :sockint + :depends-on ("defpackage")) + #+win32 (sb-grovel:grovel-constants-file + "win32-constants" + :package :sockint :do-not-grovel #.(progn #-sb-building-contrib t) - :depends-on ("defpackage" "win32-lib")) + :depends-on ("defpackage" "win32-lib")) #+win32 (:file "win32-sockets" - :depends-on ("win32-constants")) - (:file "sockets" + :depends-on ("win32-constants")) + (:file "sockets" :depends-on #-win32 ("constants") #+win32 ("win32-sockets")) - (:file "sockopt" :depends-on ("sockets")) + (:file "sockopt" :depends-on ("sockets")) (:file "inet" :depends-on ("sockets" "split")) (:file "local" :depends-on ("sockets" "split")) (:file "name-service" :depends-on ("sockets")) (:file "misc" :depends-on ("sockets")) - (:static-file "NEWS") - ;; (:static-file "INSTALL") - ;; (:static-file "README") - ;; (:static-file "index" :pathname "index.html") - (:static-file "TODO"))) + (:static-file "NEWS") + ;; (:static-file "INSTALL") + ;; (:static-file "README") + ;; (:static-file "index" :pathname "index.html") + (:static-file "TODO"))) (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets)))) (provide 'sb-bsd-sockets)) diff --git a/contrib/sb-cltl2/sb-cltl2.asd b/contrib/sb-cltl2/sb-cltl2.asd index 3055a8e..a4cb89b 100644 --- a/contrib/sb-cltl2/sb-cltl2.asd +++ b/contrib/sb-cltl2/sb-cltl2.asd @@ -8,7 +8,7 @@ #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;SB-CLTL2;" :components ((:file "defpackage") - (:file "compiler-let" :depends-on ("defpackage")) + (:file "compiler-let" :depends-on ("defpackage")) (:file "macroexpand" :depends-on ("defpackage")) (:file "env" :depends-on ("defpackage")))) diff --git a/contrib/sb-grovel/sb-grovel.asd b/contrib/sb-grovel/sb-grovel.asd index e673135..f34712f 100644 --- a/contrib/sb-grovel/sb-grovel.asd +++ b/contrib/sb-grovel/sb-grovel.asd @@ -8,8 +8,8 @@ #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;SB-GROVEL;" :components ((:file "defpackage") - (:file "def-to-lisp" :depends-on ("defpackage")) - (:file "foreign-glue" :depends-on ("defpackage")))) + (:file "def-to-lisp" :depends-on ("defpackage")) + (:file "foreign-glue" :depends-on ("defpackage")))) (defmethod perform :after ((o load-op) (c (eql (find-system :sb-grovel)))) (provide 'sb-grovel)) diff --git a/contrib/sb-md5/sb-md5.asd b/contrib/sb-md5/sb-md5.asd index 4144bf0..d2abb96 100644 --- a/contrib/sb-md5/sb-md5.asd +++ b/contrib/sb-md5/sb-md5.asd @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- -(defpackage #:sb-md5-system +(defpackage #:sb-md5-system (:use #:cl #:asdf)) (in-package #:sb-md5-system) @@ -27,4 +27,3 @@ (defmethod perform ((o test-op) (c (eql (find-system :sb-md5-tests)))) (or (funcall (intern "DO-TESTS" (find-package "SB-RT"))) (error "test-op failed"))) - \ No newline at end of file diff --git a/contrib/sb-posix/sb-posix.asd b/contrib/sb-posix/sb-posix.asd index 14892c1..591147d 100644 --- a/contrib/sb-posix/sb-posix.asd +++ b/contrib/sb-posix/sb-posix.asd @@ -9,13 +9,13 @@ #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;SB-POSIX;" :components ((:file "defpackage") - (:file "designator" :depends-on ("defpackage")) - (:file "macros" :depends-on ("designator")) - (sb-grovel:grovel-constants-file - "constants" + (:file "designator" :depends-on ("defpackage")) + (:file "macros" :depends-on ("designator")) + (sb-grovel:grovel-constants-file + "constants" :do-not-grovel #.(progn #-sb-building-contrib t) - :package :sb-posix :depends-on ("defpackage")) - (:file "interface" :depends-on ("constants" "macros" "designator")))) + :package :sb-posix :depends-on ("defpackage")) + (:file "interface" :depends-on ("constants" "macros" "designator")))) (defsystem sb-posix-tests :depends-on (sb-rt) @@ -31,9 +31,9 @@ (defmethod perform ((o test-op) (c (eql (find-system :sb-posix-tests)))) (funcall (intern "DO-TESTS" (find-package "SB-RT"))) (let ((failures (funcall (intern "PENDING-TESTS" "SB-RT"))) - (ignored-failures (loop for sym being the symbols of :sb-posix-tests - if (search ".ERROR" (symbol-name sym)) - collect sym))) + (ignored-failures (loop for sym being the symbols of :sb-posix-tests + if (search ".ERROR" (symbol-name sym)) + collect sym))) (cond ((null failures) t) diff --git a/contrib/sb-rotate-byte/sb-rotate-byte.asd b/contrib/sb-rotate-byte/sb-rotate-byte.asd index a445c1f..40ae7dd 100644 --- a/contrib/sb-rotate-byte/sb-rotate-byte.asd +++ b/contrib/sb-rotate-byte/sb-rotate-byte.asd @@ -1,6 +1,6 @@ ;;; -*- Lisp -*- -(cl:defpackage #:sb-rotate-byte-system +(cl:defpackage #:sb-rotate-byte-system (:use #:asdf #:cl)) (cl:in-package #:sb-rotate-byte-system) @@ -8,20 +8,20 @@ :version "0.1" #+sb-building-contrib :pathname #+sb-building-contrib "SYS:CONTRIB;SB-ROTATE-BYTE;" - :components + :components ((:file "package") (:file "compiler" :depends-on ("package")) (:module "vm" - :depends-on ("compiler") - :components - ((:file "x86-vm" - :in-order-to ((compile-op (feature :x86)))) - (:file "ppc-vm" - :in-order-to ((compile-op (feature :ppc))))) - :pathname - #+sb-building-contrib "SYS:CONTRIB;SB-ROTATE-BYTE;" - #-sb-building-contrib #.(make-pathname :directory '(:relative)) - :if-component-dep-fails :ignore) + :depends-on ("compiler") + :components + ((:file "x86-vm" + :in-order-to ((compile-op (feature :x86)))) + (:file "ppc-vm" + :in-order-to ((compile-op (feature :ppc))))) + :pathname + #+sb-building-contrib "SYS:CONTRIB;SB-ROTATE-BYTE;" + #-sb-building-contrib #.(make-pathname :directory '(:relative)) + :if-component-dep-fails :ignore) (:file "rotate-byte" :depends-on ("compiler")))) (defmethod perform :after ((o load-op) (c (eql (find-system :sb-rotate-byte)))) diff --git a/tools-for-build/whitespacely-canonical-filenames b/tools-for-build/whitespacely-canonical-filenames index ff8f4ef..5a61381 100755 --- a/tools-for-build/whitespacely-canonical-filenames +++ b/tools-for-build/whitespacely-canonical-filenames @@ -9,7 +9,7 @@ # glob patterns for source files in languages for which the # canonicalization is safe (not affecting meaning, at least given the # conservative syntax used in SBCL sources) -source_extensions='.lisp .lisp-expr .c .h' +source_extensions='.lisp .lisp-expr .c .h .asd' # other candidates: # .sh: if ./make.sh is altered, Bad Things happen # ? diff --git a/version.lisp-expr b/version.lisp-expr index 4101747..fb1cc7a 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.22.18" +"1.0.22.19"