Commit 8cc46b8e authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.29.6: some filesystem tweaks to accommodate Genera (!)

parent 921be307
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.29.5" ;; to be automatically updated by make bump-version :version "2.29.6" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8 #+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system. ;; For most purposes, asdf itself specially counts as a builtin system.
......
...@@ -88,47 +88,48 @@ or the original (parsed) pathname if it is false (the default)." ...@@ -88,47 +88,48 @@ or the original (parsed) pathname if it is false (the default)."
(null nil) (null nil)
(string (probe-file* (parse-namestring p) :truename truename)) (string (probe-file* (parse-namestring p) :truename truename))
(pathname (pathname
(handler-case (and (not (wild-pathname-p p))
(or (handler-case
#+allegro (or
(probe-file p :follow-symlinks truename) #+allegro
#-(or allegro clisp gcl2.6) (probe-file p :follow-symlinks truename)
(if truename #-(or allegro clisp gcl2.6)
(probe-file p) (if truename
(and (not (wild-pathname-p p)) (probe-file p)
(ignore-errors (ignore-errors
(let ((pp (translate-logical-pathname p))) (let ((pp (translate-logical-pathname p)))
#+(or cmu scl) (unix:unix-stat (ext:unix-namestring pp)) (and
#+(and lispworks unix) (system:get-file-stat pp) #+(or cmu scl) (unix:unix-stat (ext:unix-namestring pp))
#+sbcl (sb-unix:unix-stat (sb-ext:native-namestring pp)) #+(and lispworks unix) (system:get-file-stat pp)
#-(or cmu (and lispworks unix) sbcl scl) (file-write-date pp))) #+sbcl (sb-unix:unix-stat (sb-ext:native-namestring pp))
p)) #-(or cmu (and lispworks unix) sbcl scl) (file-write-date pp)
#+(or clisp gcl2.6) p))))
#.(flet ((probe (probe) #+(or clisp gcl2.6)
`(let ((foundtrue ,probe)) #.(flet ((probe (probe)
(cond `(let ((foundtrue ,probe))
(truename foundtrue) (cond
(foundtrue p))))) (truename foundtrue)
#+gcl2.6 (foundtrue p)))))
(probe '(or (probe-file p) #+gcl2.6
(and (directory-pathname-p p) (probe '(or (probe-file p)
(ignore-errors (and (directory-pathname-p p)
(ensure-directory-pathname (ignore-errors
(truename* (subpathname (ensure-directory-pathname
(ensure-directory-pathname p) "."))))))) (truename* (subpathname
#+clisp (ensure-directory-pathname p) ".")))))))
(let* ((fs (find-symbol* '#:file-stat :posix nil)) #+clisp
(pp (find-symbol* '#:probe-pathname :ext nil)) (let* ((fs (find-symbol* '#:file-stat :posix nil))
(resolve (if pp (pp (find-symbol* '#:probe-pathname :ext nil))
`(ignore-errors (,pp p)) (resolve (if pp
'(or (truename* p) `(ignore-errors (,pp p))
(truename* (ignore-errors (ensure-directory-pathname p))))))) '(or (truename* p)
(if fs (truename* (ignore-errors (ensure-directory-pathname p)))))))
`(if truename (if fs
,resolve `(if truename
(and (ignore-errors (,fs p)) p)) ,resolve
(probe resolve))))) (and (ignore-errors (,fs p)) p))
(file-error () nil)))))) (probe resolve)))))
(file-error () nil)))))))
(defun directory* (pathname-spec &rest keys &key &allow-other-keys) (defun directory* (pathname-spec &rest keys &key &allow-other-keys)
(apply 'directory pathname-spec (apply 'directory pathname-spec
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.29.5: Another System Definition Facility. ;;; This is ASDF 2.29.6: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -31,9 +31,9 @@ Some constraints: ...@@ -31,9 +31,9 @@ Some constraints:
(in-package :asdf-test) (in-package :asdf-test)
(declaim (optimize (speed 2) (safety 3) #-(or allegro gcl) (debug 3) (declaim (optimize (speed 2) (safety 3) #-(or allegro gcl genera) (debug 3)
#+(or cmu scl) (c::brevity 2))) #+(or cmu scl) (c::brevity 2)))
(proclaim '(optimize (speed 2) (safety 3) #-(or allegro gcl) (debug 3) (proclaim '(optimize (speed 2) (safety 3) #-(or allegro gcl genera) (debug 3)
#+(or cmu scl) (c::brevity 2))) #+(or cmu scl) (c::brevity 2)))
(defvar *trace-symbols* (defvar *trace-symbols*
...@@ -154,7 +154,8 @@ Some constraints: ...@@ -154,7 +154,8 @@ Some constraints:
(defparameter *test-directory* (defparameter *test-directory*
(truename (truename
(make-pathname :name nil :type nil :version nil (make-pathname :name nil :type nil :version nil
:defaults (or *load-pathname* *compile-file-pathname*)))) :defaults (or *load-pathname* *compile-file-pathname* *default-pathname-defaults*))))
(format t "bye, world~%")
(defun make-sub-pathname (&rest keys &key defaults &allow-other-keys) (defun make-sub-pathname (&rest keys &key defaults &allow-other-keys)
(merge-pathnames (apply 'make-pathname keys) defaults)) (merge-pathnames (apply 'make-pathname keys) defaults))
(defun relative-dir (&rest dir) #-gcl (cons ':relative dir) #+gcl dir) (defun relative-dir (&rest dir) #-gcl (cons ':relative dir) #+gcl dir)
......
...@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO ...@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
;; "3.4.5.67" would be a development version in the official upstream of 3.4.5. ;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "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 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "2.29.5") (asdf-version "2.29.6")
(existing-version (asdf-version))) (existing-version (asdf-version)))
(setf *asdf-version* asdf-version) (setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version))) (when (and existing-version (not (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