Update of /project/cells/cvsroot/cell-cultures/asdf-aclproj In directory common-lisp.net:/tmp/cvs-serv10030/asdf-aclproj
Modified Files: asdf-aclproj.lisp Log Message:
Date: Wed Jun 30 14:02:47 2004 Author: tburdick
Index: cell-cultures/asdf-aclproj/asdf-aclproj.lisp diff -u cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.1 cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.2 --- cell-cultures/asdf-aclproj/asdf-aclproj.lisp:1.1 Tue Jun 29 01:58:48 2004 +++ cell-cultures/asdf-aclproj/asdf-aclproj.lisp Wed Jun 30 14:02:47 2004 @@ -48,12 +48,6 @@ (defmethod asdf:module-components ((project lpr-project-file)) (project-modules project))
-#+(or) -(defmethod asdf:perform :before (operation (project lpr-project-file)) - (unless (asdf:module-components project) - (setf (asdf:module-components project) - (project-modules project)))) - ;;;; For use in .lpr files
(defclass lpr-component () ()) @@ -61,8 +55,9 @@ (defclass project-module (lpr-component lpr-project-file) ())
;; Because we allow goofy names like ../foo/bar.lisp, we want to return the -;; truename of the pathname, if it exists, so children will be merged -;; correctly. +;; truename of the pathname, if it exists, so children will be merged correctly. +;; I think this is a workaround for a bug in SBCL's pathname merging, but the +;; bug could be in my understanding of CL pathnames -tfb (defmethod asdf:component-pathname ((component lpr-component)) (let ((path (call-next-method))) (or (probe-file path) path))) @@ -125,8 +120,8 @@ (apply #'call-next-method component args)))
(defun ensure-cgu-package () - #+(and acl mswindows) - (progn (aclwin-warning) (return-from ensure-cgu-package)) + #+(and acl mswindows) (progn (aclwin-warning) + (return-from ensure-cgu-package)) (unless (find-package "COMMON-GRAPHICS-USER") (let ((user-package (find-package "ASDF-ACLPROJ-USER"))) (assert (not (null user-package))) @@ -162,7 +157,8 @@ for depends-on = (reverse so-far) do (setf (slot-value component 'asdf::in-order-to) `((asdf:load-op (asdf:load-op ,@depends-on)) - (asdf:compile-op (asdf:compile-op ,@depends-on)))) + (asdf:compile-op (asdf:load-op ,@depends-on) + (asdf:compile-op ,@depends-on)))) (push component so-far) finally (return (reverse so-far))))) (setf *project-modules*