Changeset 15488

Timestamp:

11/30/20 08:22:29 (2 years ago)

Author:

Mark Evenson

Message:

asdf: fix PARSE-UNIX-NAMESTRING in presence of JAR-PATHNAME device

Under ABCL, when loading system definitions from a JAR-PATHNAME, the
PARSE-UNIX-NAMESTRING was including the DEVICE in the defaults to
MAKE-PATHNAME. This was mostly harmless but fails when the as yet
unreleased abcl-1.8.1 tightened the definition of JAR-PATHNAME to
always have an absolute directory.

TODO: ensure that this works correctly in the presence of logical
pathnames, and under Windows where the device may contain the logical
drive letter or the UNC path.

File:

• trunk/abcl/src/org/armedbear/lisp/asdf.lisp (modified) (5 diffs)

trunk/abcl/src/org/armedbear/lisp/asdf.lisp

@@ -1 +1 @@
 ;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
-;;; This is ASDF 3.3.4: Another System Definition Facility.
+;;; This is ASDF 3.3.4.0.1: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
@@ -1698 +1698 @@
 
 (with-upgradability ()
-  (defparameter *uiop-version* "3.3.4")
+  (defparameter *uiop-version* "3.3.4.0.1")
 
   (defun unparse-version (version-list)
@@ -2725 +2725 @@
 even though the OS may not be Unixish, we recommend you use :WANT-RELATIVE T
 to throw an error if the pathname is absolute"
+    #+(or abcl mcl)
+    (declare (ignore defaults))
     (block nil
       (check-type type (or null string (eql :directory)))
@@ -2749 +2751 @@
                   :directory (unless file-only (cons relative path))
                   :name name :type type
-                  :defaults (or #-mcl defaults *nil-pathname*))
+                  :defaults (or #-(or abcl mcl) defaults *nil-pathname*))
                  (remove-plist-keys '(:type :dot-dot :defaults) keys))))))
 
@@ -7629 +7631 @@
          ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
          ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
-         (asdf-version "3.3.4")
+         (asdf-version "3.3.4.0.1")
          (existing-version (asdf-version)))
     (setf *asdf-version* asdf-version)