Update of /project/lispy/cvsroot/lispy In directory clnet:/tmp/cvs-serv15421

Modified Files: lispy.asd lispy.lisp specials.lisp Log Message: Bootstrap tweaking

--- /project/lispy/cvsroot/lispy/lispy.asd 2007/07/09 05:11:14 1.1.1.1 +++ /project/lispy/cvsroot/lispy/lispy.asd 2007/07/10 05:00:32 1.2 @@ -5,8 +5,8 @@

(defsystem #:lispy :components ((:file "packages") - (:file "specials") - (:file "utils" :depends-on ("packages" "specials")) + (:file "specials" :depends-on ("packages")) + (:file "utils" :depends-on ("specials")) (:file "lispy" :depends-on ("utils"))) :depends-on (#:drakma #:puri --- /project/lispy/cvsroot/lispy/lispy.lisp 2007/07/09 05:11:14 1.1.1.1 +++ /project/lispy/cvsroot/lispy/lispy.lisp 2007/07/10 05:00:32 1.2 @@ -159,14 +159,15 @@ (maphash #'(lambda (name install) (declare (ignore name)) (if (null (asdf-paths install)) - (push (merge-pathnames (root install) *lispy-pathname*) + (push (root install) paths) (dolist (path (asdf-paths install)) - (push (merge-pathnames path *lispy-pathname*) + (push path paths)))) *lispy-installation*) - (print `(dolist (path ',paths) - (pushnew path asdf:*central-registry* :test 'equal)) + (print `(let ((root (make-pathname :directory (pathname-directory *load-truename*)))) + (dolist (path ',paths) + (pushnew (merge-pathnames path root) asdf:*central-registry* :test 'equal))) stream))))

(defgeneric fetch (module)) @@ -277,7 +278,7 @@ ;;; Lispy bootstrap code (remove installation.lisp-expr, distfiles and ;;; all source directories) #+nil -(dolist (name '(drakma puri gzip-stream archive ironclad cl-fad asdf)) +(dolist (name '(drakma puri gzip-stream archive ironclad cl-fad asdf lispy)) (install (module-by-name name))) #+nil (initialize) --- /project/lispy/cvsroot/lispy/specials.lisp 2007/07/09 05:11:14 1.1.1.1 +++ /project/lispy/cvsroot/lispy/specials.lisp 2007/07/10 05:00:32 1.2 @@ -1,9 +1,16 @@ (in-package #:lispy)

-(defvar *lispy-map-url* (puri:parse-uri "http://localhost/~mkennedy/lispy/map.lisp-expr")) -(defvar *lispy-pathname* (merge-pathnames "lispy/" (user-homedir-pathname))) +(defvar *lispy-map-url* (puri:parse-uri "http://common-lisp.net/project/lispy/repository/map.lisp-expr")) + +(defvar *lispy-pathname* + (make-pathname :name nil :type nil :version nil + :defaults (parse-namestring *load-truename*))) + (defvar *lispy-installation-pathname* (merge-pathnames #p"installation.lisp-expr" *lispy-pathname*)) + (defvar *lispy-asdf-config-pathname* (merge-pathnames #p"asdf-config.lisp" *lispy-pathname*)) + (defvar *lispy-distfiles-pathname* (merge-pathnames #p"distfiles/" *lispy-pathname*)) + (defvar *lispy-log-stream* t)