[armedbear-cvs] r13290 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Tue May 24 05:24:46 2011
New Revision: 13290

Log:
Strip VERSION from the source location output by COMPILE-FILE.

ABCL currently outputs non-readable--by the Lisp reader--namestrings
for any PATHNAME with a non-NIL VERSION.  With the recent fixes to how
ABCL deals with VERSION components by defaulting to the ANSI specified
:NEWEST in MERGE-PATHNAMES, this breaks ASDF compiliation which tends
to acculumlate such PATHNAMES in its labryinth of cross-implementation
TRUENAMIZE* and LISPIZE-PATHNAME invocations.  Since VERSION doesn't
really have an effect on the filesystems that ABCL deals with we just
silently nip it to NIL before forming our FASL source location.

Modified:
   trunk/abcl/src/org/armedbear/lisp/compile-file.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/compile-file.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Tue May 24 02:01:03 2011	(r13289)
+++ trunk/abcl/src/org/armedbear/lisp/compile-file.lisp	Tue May 24 05:24:46 2011	(r13290)
@@ -536,7 +536,8 @@
          (failure-p nil))
     (with-open-file (in input-file :direction :input)
       (let* ((*compile-file-pathname* (pathname in))
-             (*compile-file-truename* (truename in))
+             (*compile-file-truename* (make-pathname :defaults (truename in)
+                                                     :version nil))
              (*source* *compile-file-truename*)
              (*class-number* 0)
              (namestring (namestring *compile-file-truename*))