Commit e05485f3 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau Committed by Robert P. Goldman
Browse files

2.28.3: make the recent EVAL-WHEN non-sense work on LispWorks.

Also, decouple with-muffled-compiler-condtions from with-saved-deferred-warnings.
parent aa2f79cd
......@@ -19,9 +19,10 @@
#:action-path #:find-action #:stamp #:done-p))
(in-package :asdf/action)
(with-upgradability ()
(deftype action () '(cons operation component)) ;; a step to be performed while building the system
(eval-when (#-lispworks :compile-toplevel :load-toplevel :execute)
(deftype action () '(cons operation component))) ;; a step to be performed while building
(with-upgradability ()
(defgeneric traverse-actions (actions &key &allow-other-keys))
(defgeneric traverse-sub-actions (operation component &key &allow-other-keys))
(defgeneric required-components (component &key &allow-other-keys)))
......@@ -74,7 +74,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.28.2" ;; to be automatically updated by make bump-version
:version "2.28.3" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system.
......@@ -178,8 +178,9 @@
(defun user-system-p (s)
(and (typep s 'system)
(not (builtin-system-p s))
(not (trivial-system-p s))))
(not (trivial-system-p s)))))
(eval-when (#-lispworks :compile-toplevel :load-toplevel :execute)
(deftype user-system () '(and system (satisfies user-system-p))))
......@@ -169,11 +169,11 @@
(recurse more start end))))))))
(recurse substrings 0 length))
(if stream (get-output-stream-string stream) ""))))
(if stream (get-output-stream-string stream) "")))
(defmacro compatfmt (format)
(defmacro compatfmt (format)
#+(or gcl genera)
(remove-substrings `("~3i~_" #+(or genera gcl2.6) ,@'("~@<" "~@;" "~@:>" "~:>")) format)
#-(or gcl genera) format)
#-(or gcl genera) format))
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.28.2: Another System Definition Facility.
;;; This is ASDF 2.28.3: Another System Definition Facility.
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <>.
......@@ -86,6 +86,8 @@ Note that ASDF ALWAYS raises an error if it fails to create an output file when
;;#+clozure '(ccl:compiler-warning)
#+cmu '("Deleting unreachable code.")
#+lispworks '("~S being redefined in ~A (previously in ~A)."
"~S defined more than once in ~A.") ;; lispworks gets confused by eval-when.
"&OPTIONAL and &KEY found in the same lambda list: ~S"
......@@ -393,8 +395,7 @@ possibly in a different process."
(let (#+sbcl (sb-c::*undefined-warnings* nil))
(with-muffled-compiler-conditions ()
(funcall thunk))
(funcall thunk)
(save-deferred-warnings warnings-file)))
(funcall thunk)))
......@@ -486,13 +487,14 @@ it will filter them appropriately."
(tmp-lib (make-pathname :type "lib" :defaults tmp-file)))
(multiple-value-bind (output-truename warnings-p failure-p)
(with-saved-deferred-warnings (warnings-file)
(with-muffled-compiler-conditions ()
(or #-(or ecl mkcl) (apply 'compile-file input-file :output-file tmp-file keywords)
#+ecl (apply 'compile-file input-file :output-file
(if object-file
(list* object-file :system-p t keywords)
(list* tmp-file keywords)))
#+mkcl (apply 'compile-file input-file
:output-file object-file :fasl-p nil keywords)))
:output-file object-file :fasl-p nil keywords))))
((and output-truename
(flet ((check-flag (flag behaviour)
......@@ -387,7 +387,6 @@ is bound, write a message and exit on an error. If
(ignore-errors (load-asdf-fasl tag)))
(load-asdf-lisp tag)
(compile-asdf tag)))))
(defun compile-asdf-script ()
......@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
;; "" would be a development version in the official upstream of 3.4.5.
;; "" would be your eighth local modification of official release 3.4.5
;; "" would be your eighth local modification of development version
(asdf-version "2.28.2")
(asdf-version "2.28.3")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
......@@ -241,8 +241,9 @@ starting the separation from the end, e.g. when called with arguments
;;; stamps: a REAL or boolean where NIL=-infinity, T=+infinity
(eval-when (#-lispworks :compile-toplevel :load-toplevel :execute)
(deftype stamp () '(or real boolean)))
(with-upgradability ()
(deftype stamp () '(or real boolean))
(defun stamp< (x y)
(etypecase x
(null (and y t))
Supports Markdown
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