Commit 056f33a9 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.26.64: checkpointing progress with define-package

parent 4b1cea29
......@@ -14,7 +14,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.63" ;; to be automatically updated by bin/bump-revision
:version "2.26.64" ;; to be automatically updated by bin/bump-revision
:depends-on ()
:components
((:file "asdf")))
......
......@@ -26,24 +26,26 @@
:components
((:file "header")
(:module
"code" :pathname "" :components
"utils" :pathname "" :components
((:file "package")
(:file "implementation" :depends-on ("package"))
(:file "utility" :depends-on ("implementation"))
(:file "pathname" :depends-on ("utility"))
(:file "os" :depends-on ("pathname"))
(:file "upgrade" :depends-on ("utility"))
(:file "component" :depends-on ("pathname"))
(:file "os" :depends-on ("pathname"))))
(:module
"code" :pathname "" :components
(:file "upgrade")
(:file "component")
(:file "system" :depends-on ("component"))
(:file "find-system" :depends-on ("system"))
(:file "find-component" :depends-on ("find-system"))
(:file "lisp-build" :depends-on ("pathname"))
(:file "operation" :depends-on ("utility"))
(:file "lisp-build")
(:file "operation")
(:file "action" :depends-on ("find-component" "operation"))
(:file "lisp-action" :depends-on ("action" "lisp-build"))
(:file "plan" :depends-on ("action"))
(:file "operate" :depends-on ("plan"))
(:file "configuration" :depends-on ("pathname"))
(:file "configuration")
(:file "output-translations" :depends-on ("configuration" "operate"))
(:file "source-registry" :depends-on ("configuration" "find-system"))
(:file "backward-internals" :depends-on ("action" "operate"))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.63: Another System Definition Facility.
;;; This is ASDF 2.26.64: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
This diff is collapsed.
......@@ -706,8 +706,7 @@ For the latter case, we ought pick random suffix and atomically open it."
(defun* physical-pathname-p (x)
(and (pathnamep x) (not (typep x 'logical-pathname))))
(defun* sane-physical-pathname (&key (defaults *default-pathname-defaults*)
fallback (keep t) must-exist)
(defun* sane-physical-pathname (defaults &key (keep t) fallback must-exist)
(flet ((sanitize (x)
(setf x (and x (ignore-errors (translate-logical-pathname x))))
(when (pathnamep x)
......@@ -722,10 +721,13 @@ For the latter case, we ought pick random suffix and atomically open it."
(setf x (and (probe-file* x) x)))
(and (physical-pathname-p x) x))))
(or (sanitize defaults)
(when fallback (sanitize (ignore-errors (user-homedir-pathname))))
(when fallback
(or (sanitize (ignore-errors (user-homedir-pathname)))
(sanitize (nil-pathname))))
(error "Could not find a sanitize ~S ~:[~;or a fallback ~] into a physical pathname"
defaults fallback))))
;;;; -----------------------------------------------------------------
;;;; Windows shortcut support. Based on:
;;;;
......
......@@ -63,9 +63,9 @@
(let ((old-asdf
(merge-pathnames
(make-pathname :directory `(#-gcl :relative "tmp")
:name (format nil "asdf-~A" tag)
:name (format nil "asdf-~A" tag) :type "lisp"
:defaults *asdf-directory*)
*asdf-lisp*)))
*asdf-directory*)))
(handler-bind (#+sbcl (sb-kernel:redefinition-warning #'muffle-warning))
(load old-asdf))))
......
......@@ -23,7 +23,7 @@
;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.63")
(asdf-version "2.26.64")
(existing-asdf (find-class 'component nil))
(existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment