Skip to content

Commit

Permalink
Add and use asdf-condition-control.
Browse files Browse the repository at this point in the history
  • Loading branch information
fare committed May 31, 2012
1 parent f2fd17c commit e8b3dca
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 2 deletions.
11 changes: 11 additions & 0 deletions asdf-condition-control.asd
@@ -0,0 +1,11 @@
;;; -*- mode: lisp -*-
(in-package :asdf)

(defsystem :asdf-condition-control
:author ("Francois-Rene Rideau")
:maintainer "Francois-Rene Rideau"
:licence "MIT"
:description "Condition control for ASDF"
:long-description "Using XCVB's condition control for ASDF"
:depends-on ((:version :asdf "2.019") :xcvb-driver)
:components ((:file "asdf-condition-control")))
18 changes: 18 additions & 0 deletions asdf-condition-control.lisp
@@ -0,0 +1,18 @@
#+xcvb (module (:build-depends-on ("/asdf" "/xcvb/driver")))

(in-package :asdf)

(defmethod perform :around ((o compile-op) (c cl-source-file))
(declare (ignorable o c))
(xcvb-driver:with-controlled-compiler-conditions ()
(call-next-method)))

(defmethod perform :around ((o load-op) (c cl-source-file))
(declare (ignorable o c))
(xcvb-driver:with-controlled-loader-conditions ()
(call-next-method)))

(defmethod perform :around ((o load-source-op) (c cl-source-file))
(declare (ignorable o c))
(xcvb-driver:with-controlled-loader-conditions ()
(call-next-method)))
1 change: 1 addition & 0 deletions driver.lisp
Expand Up @@ -221,6 +221,7 @@ but before the entry point is called.")

(defvar *uninteresting-load-conditions*
(append
'("Overwriting already existing readtable ~S.") ;; from named-readtables
#+clisp '(clos::simple-gf-replacing-method-warning))
"Additional conditions that may be skipped while loading. type symbols, predicates or strings")

Expand Down
4 changes: 2 additions & 2 deletions xcvb.asd
Expand Up @@ -15,7 +15,7 @@

(let ((old-ver (asdf-version)))
(load-system :asdf)
(let ((min "2.20.18")
(let ((min "2.21")
(ver (asdf-version)))
(unless (or (version-satisfies old-ver "2.014.8") ; first version to do magic upgrade
(equal ver old-ver))
Expand Down Expand Up @@ -46,7 +46,7 @@
:long-description "an eXtensible Component Verifier and Builder for Lisp.
XCVB provides a scalable system to build large software in Lisp, featuring
deterministic separate compilation and enforced locally-declared dependencies."
:defsystem-depends-on (:asdf :xcvb-driver :xcvb-bootstrap)
:defsystem-depends-on (:asdf :xcvb-driver :xcvb-bootstrap :asdf-condition-control)
:depends-on (:asdf :xcvb-driver :lambda-reader
:fare-utils :fare-mop :fare-memoization
:command-line-arguments
Expand Down

0 comments on commit e8b3dca

Please sign in to comment.