Update of /project/lispy/cvsroot/lispy In directory clnet:/tmp/cvs-serv16226
Modified Files: .cvsignore lispy.lisp Log Message: Use printer for installation.lisp-expr and asdf-config.lisp. Bind *print-readably* t when printing.
--- /project/lispy/cvsroot/lispy/.cvsignore 2007/07/13 04:23:17 1.1 +++ /project/lispy/cvsroot/lispy/.cvsignore 2007/07/24 04:59:00 1.2 @@ -2,3 +2,4 @@ *.lib *.fas *.x86f +*.ufasl --- /project/lispy/cvsroot/lispy/lispy.lisp 2007/07/23 14:25:58 1.9 +++ /project/lispy/cvsroot/lispy/lispy.lisp 2007/07/24 04:59:00 1.10 @@ -141,17 +141,18 @@ :direction :output :if-does-not-exist :create :if-exists :supersede) - (print (let ((installation '())) - (maphash #'(lambda (name install) - (push `(:name ,name - :our-version ,(our-version install) - :version ,(version install) - :root ,(root install) - :asdf-paths ,(asdf-paths install)) - installation)) - *lispy-installation*) - installation) - stream))) + (let ((*print-readably* t)) + (print (let ((installation '())) + (maphash #'(lambda (name install) + (push `(:name ,name + :our-version ,(our-version install) + :version ,(version install) + :root ,(root install) + :asdf-paths ,(asdf-paths install)) + installation)) + *lispy-installation*) + installation) + stream))))
(defun parse-install (install) (destructuring-bind (&key name our-version version root asdf-paths) @@ -183,17 +184,11 @@ (push path paths)))) *lispy-installation*) - #+nil (print `(let ((root (make-pathname :directory (pathname-directory *load-truename*)))) - (dolist (path ',paths) - (pushnew (merge-pathnames path root) asdf:*central-registry* :test 'equal))) - stream) - (format stream -"(let ((root (make-pathname :directory (pathname-directory *load-truename*)))) - (dolist (path '(~{~S ~})) - (pushnew (merge-pathnames path root) - asdf:*central-registry* - :test 'equal)))" - paths)))) + (let ((*print-readably* t)) + (print `(let ((cl-user::root (make-pathname :directory (pathname-directory *load-truename*)))) + (dolist (cl-user::path ',paths) + (pushnew (merge-pathnames cl-user::path cl-user::root) asdf:*central-registry* :test 'equal))) + stream)))))
(defgeneric fetch (module))