Fix for OpenMCL and logical-pathname display
Greg Pfeil <[email protected]> Mon, 3 Apr 2006 16:36:55 -0700
| Newsgroups | gmane.lisp.cclan.bugs |
|---|---|
| Message-ID | <[email protected]> |
--Apple-Mail-8-443974723
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
charset=US-ASCII;
format=flowed
I made two changes to ASDF-Install. First, OpenMCL is not a fan of the
#+:sbcl #+:sbcl :external-format :latin1
style of conditional compilation, so I changed it to
#+:sbcl :external-format #+:sbcl :latin1
Also, following up on Jason Kantz's logical-pathname patch, I made a
couple more changes so that logical pathnames are displayed as physical
pathnames. However, I wasn't sure where to call
TRANSLATE-LOGICAL-PATHNAME and where to call TRUENAME, since TRUENAME
should only be called after you know the path exists, so that may need
to be changed.
--Apple-Mail-8-443974723
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
x-unix-mode=0644;
name="openmcl.patch"
Content-Disposition: attachment;
filename=openmcl.patch
Index: installer.lisp
===================================================================
RCS file: /cvsroot/cclan/asdf-install/installer.lisp,v
retrieving revision 1.15
diff -u -r1.15 installer.lisp
--- installer.lisp 20 Mar 2006 16:46:21 -0000 1.15
+++ installer.lisp 3 Apr 2006 23:30:35 -0000
@@ -372,7 +372,7 @@
:element-type
#+(or :clisp :digitool (and :lispworks :win32))
'(unsigned-byte 8)
- #+:sbcl #+:sbcl :external-format :latin1
+ #+:sbcl :external-format #+:sbcl :latin1
:if-exists :supersede)
;; for Allegro versions < 8.0, the above #+sbcl #+sbcl
;; will cause an error [2006/01/09:rpg]
@@ -497,7 +497,7 @@
(loop for (source system name) in *locations*
for i from 0
do (format t "~A) ~A: ~% System in ~A~% Files in ~A ~%"
- i name system source))
+ i name (translate-logical-pathname system) (translate-logical-pathname source)))
(format t "~D) Abort installation.~% --> " n-locations)
(force-output)
(read)))
@@ -535,7 +535,7 @@
(merge-pathnames
(make-pathname :directory
`(:relative ,(subseq tar 0 pos-slash)))
- source))
+ (truename source)))
)
(princ tar)
(loop for sysfile in (append
@@ -553,7 +553,7 @@
(let ((target (merge-pathnames
(make-pathname :name (pathname-name sysfile)
:type (pathname-type sysfile))
- system)))
+ (truename system))))
(when (probe-file target)
(unlink-file target))
(symlink-files sysfile target))
@@ -598,7 +598,7 @@
(setf p tmp))
end
do (installer-msg t "Installing ~A in ~A, ~A"
- p source system)
+ p (truename source) (truename system))
append (install-package source system p)))
)
(declare (ignore installed-package-sysfiles))
--Apple-Mail-8-443974723--
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642