Changeset 15488


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/src/org/armedbear/lisp/asdf.lisp

    r15240 r15488  
    11;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
    2 ;;; This is ASDF 3.3.4: Another System Definition Facility.
     2;;; This is ASDF 3.3.4.0.1: Another System Definition Facility.
    33;;;
    44;;; Feedback, bug reports, and patches are all welcome:
     
    16981698
    16991699(with-upgradability ()
    1700   (defparameter *uiop-version* "3.3.4")
     1700  (defparameter *uiop-version* "3.3.4.0.1")
    17011701
    17021702  (defun unparse-version (version-list)
     
    27252725even though the OS may not be Unixish, we recommend you use :WANT-RELATIVE T
    27262726to throw an error if the pathname is absolute"
     2727    #+(or abcl mcl)
     2728    (declare (ignore defaults))
    27272729    (block nil
    27282730      (check-type type (or null string (eql :directory)))
     
    27492751                  :directory (unless file-only (cons relative path))
    27502752                  :name name :type type
    2751                   :defaults (or #-mcl defaults *nil-pathname*))
     2753                  :defaults (or #-(or abcl mcl) defaults *nil-pathname*))
    27522754                 (remove-plist-keys '(:type :dot-dot :defaults) keys))))))
    27532755
     
    76297631         ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
    76307632         ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
    7631          (asdf-version "3.3.4")
     7633         (asdf-version "3.3.4.0.1")
    76327634         (existing-version (asdf-version)))
    76337635    (setf *asdf-version* asdf-version)
Note: See TracChangeset for help on using the changeset viewer.