src/sod.asd.in: Find `auto.lisp' even if we're located via logical pathname.

[sod] / src / sod.asd.in

diff --git a/src/sod.asd.in b/src/sod.asd.in
index f88ea25..894d50b 100644 (file)
--- a/src/sod.asd.in
+++ b/src/sod.asd.in
@@ -29,7 +29,8 @@
 
 (cl:in-package #:sod-sysdef)
 
-#|@-auto-@|# (load (merge-pathnames "auto.lisp" *load-pathname*))
+#|@-auto-@|# (load (make-pathname :name "AUTO" :type "LISP" :version :newest
+                                 :case :common :defaults *load-pathname*))
 
 #+cmu (require :gray-streams)
 
@@ -69,6 +70,7 @@
 
   :components
   ((:file "utilities")
+   (:file "optparse")
 
    ;; Parser equipment.  This is way more elaborate than it needs to be, but
    ;; it was interesting, and it may well get split off into a separate
@@ -118,7 +120,7 @@
 
    ;; Property set protocol.
    (:file "pset-proto" :depends-on ("package" "c-types-proto"))
-   (:file "pset-impl" :depends-on ("pset-proto"))
+   (:file "pset-impl" :depends-on ("pset-proto" "module-proto"))
    (:file "pset-parse" :depends-on ("pset-proto" "lexer-proto"))
 
    ;; Code generation protocol.
@@ -126,7 +128,7 @@
    (:file "codegen-impl" :depends-on ("codegen-proto"))
 
    ;; Modules.
-   (:file "module-proto" :depends-on ("package"))
+   (:file "module-proto" :depends-on ("pset-proto" "package"))
    (:file "module-impl" :depends-on
          ("module-proto" "pset-proto" "c-types-class-impl" "builtin"))
    (:file "builtin" :depends-on
@@ -178,10 +180,7 @@
 
 (defmethod perform ((op test-op) (component (eql (find-system "sod"))))
   (declare (ignore op component))
-  (handler-bind (((or warning style-warning)
-                 (lambda (cond)
-                   (declare (ignore cond))
-                   (invoke-restart 'muffle-warning))))
+  (handler-bind (((or warning style-warning) #'muffle-warning))
     (operate 'test-op "sod-test")))
 
 ;;;----- That's all, folks --------------------------------------------------