From: Christophe R. <cr...@us...> - 2006-03-17 15:34:59
|
Update of /cvsroot/sbcl/sbcl/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26491/contrib Modified Files: asdf-stub.lisp Log Message: 0.9.10.42: In this exciting world of Windows support, we might have files named *.FASL not found by a find for *.fasl. ... and, argh, -iname is a GNUism. Try harder to delete things in contrib/ anyway. ... tidy up asdf-stub.lisp while I'm at it. Index: asdf-stub.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/asdf-stub.lisp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- asdf-stub.lisp 14 Jul 2005 16:30:06 -0000 1.2 +++ asdf-stub.lisp 17 Mar 2006 15:34:52 -0000 1.3 @@ -1,26 +1,18 @@ -(load "../asdf/asdf") - -(setf asdf::*central-registry* - '((merge-pathnames "systems/" (truename (sb-ext:posix-getenv "SBCL_HOME"))))) -(push :sb-building-contrib *features*) -(asdf:operate 'asdf:load-op *system*) - -(defvar *system-stub* (make-pathname :name *system* :type "lisp")) - -(when (probe-file (compile-file-pathname *system-stub*)) - (error "fasl file exists")) - -(with-open-file (s *system-stub* :direction :output :if-exists :error) - (print '(unless (member "ASDF" *modules* :test #'string=) - (load (merge-pathnames "asdf/asdf.fasl" (truename (sb-ext:posix-getenv "SBCL_HOME"))))) - s) - ;; This addition to *central-registry* allows us to find contribs - ;; even if the user has frobbed the original contents. - (print `(let ((asdf:*central-registry* (cons (merge-pathnames "systems/" - (truename (sb-ext:posix-getenv "SBCL_HOME"))) - asdf:*central-registry*))) - (asdf::module-provide-asdf ,*system*)) - s)) +(load "SYS:CONTRIB;ASDF;ASDF.FASL") -(compile-file *system-stub*) -(delete-file *system-stub*) +(let ((asdf:*central-registry* nil)) + (push :sb-building-contrib *features*) + (asdf:operate 'asdf:load-op *system*) + (let ((stub (make-pathname :name *system* :type "lisp"))) + (when (probe-file (compile-file-pathname stub)) + (error "fasl file exists")) + (with-open-file (s stub :direction :output :if-exists :error) + (print '(unless (member "ASDF" *modules* :test #'string=) + (require :asdf)) + s) + ;; we find our contribs without reference to *central-registry*. + (print `(let ((asdf:*central-registry* nil)) + (asdf::module-provide-asdf ,*system*)) + s)) + (compile-file stub) + (delete-file stub))) |