Commit 4ed848e6 authored by Dave Cooper's avatar Dave Cooper
Browse files

simplified defsystem-depends-on processing into asd file.

parent 21e5a989
......@@ -32,10 +32,11 @@
(let ((sexpr (glisp:sexpr-from-file (merge-pathnames (make-pathname :name "defsystem-depends-on"
:type "isc")
(the ppathname)))))
(if (and sexpr (not (stringp sexpr)))
(if (and sexpr (not (or (stringp sexpr) (consp sexpr))))
(error "defsystem-depends-on.isc should be either nil or a string containing the expression
to go inside the actual list form in the asdf file. It came in as ~s instead.~%" sexpr)
sexpr)))
to go inside the actual list form in the asdf file, or the list form for the asdf file.
It came in as ~s instead.~%"
sexpr) sexpr)))
(%asdf-system-list
(let ((binaries (the compile-and-load)))
......@@ -48,7 +49,10 @@ to go inside the actual list form in the asdf file. It came in as ~s instead.~%"
:version ,(the version)
:depends-on ,(the asdf-depends-on)
:defsystem-depends-on ,(read-from-string (format nil "(~a)" (or (the asdf-defsystem-depends-on) "")))
:defsystem-depends-on ,(cond ((stringp (the asdf-defsystem-depends-on))
(read-from-string (format nil "(~a)" (the asdf-defsystem-depends-on))))
((null (the asdf-defsystem-depends-on)) nil)
(t (the asdf-defsystem-depends-on)))
#|
:depends-on ,(the asdf-depends-on)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment