Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Applied patch from Francois-Rene Rideau for latest asdf (2.26.152)

  • Loading branch information...
commit 119f2af69eecbdf3f224c4973c6435b3fc46b133 1 parent 0796b7f
@html html authored
Showing with 6 additions and 9 deletions.
  1. +2 −3 src/package.lisp
  2. +2 −3 weblocks-store-test.asd
  3. +2 −3 weblocks.asd
View
5 src/package.lisp
@@ -5,14 +5,14 @@
(without-package-variance-warnings
(defpackage #:weblocks
- (:use :cl :c2mop :metabang.utilities :hunchentoot :cl-who :json :fare-matcher :cont :parenscript
+ (:use :cl :c2mop :metabang.utilities :hunchentoot :cl-who :json :optima :cont :parenscript
:anaphora :f-underscore :trivial-timeout)
(:shadowing-import-from :c2mop #:defclass #:defgeneric #:defmethod
#:standard-generic-function #:ensure-generic-function
#:standard-class #:typep #:subtypep #:standard-method)
(:shadowing-import-from :cl-who #:str)
(:shadowing-import-from :f-underscore #:f #:_)
- (:shadowing-import-from :fare-matcher #:match)
+ (:shadowing-import-from :optima #:match)
(:shadowing-import-from :metabang.utilities #:with-array #:size #:bind)
(:shadowing-import-from :json #:prototype)
(:shadow #:redirect #:reset-sessions #:errors #:find-all)
@@ -32,4 +32,3 @@
(defpackage #:weblocks-util
(:documentation "General Lisp utilities traditionally exported
with Weblocks.")))
-
View
5 weblocks-store-test.asd
@@ -13,6 +13,5 @@
:description "A test suite for weblocks backend stores."
:depends-on (:rt :weblocks :lift :f-underscore)
:components ((:module test
- :components (
- (:file "weblocks-store-test")))))
-
+ :components
+ ((:file "weblocks-store-test")))))
View
5 weblocks.asd
@@ -20,7 +20,7 @@
:cl-who
:parenscript
:cl-fad
- :fare-matcher
+ :optima
:cl-cont
:metatilities
:cl-ppcre
@@ -232,8 +232,7 @@
:depends-on ("weblocks" "application-mop" store))
(:file "default-application"
:depends-on ("server" "weblocks" utils "request-handler")))))
- :in-order-to ((asdf:test-op (load-op "weblocks-test"))
- (test-op (load-op "weblocks-test"))
+ :in-order-to ((test-op (load-op "weblocks-test"))
(doc-op (load-op "weblocks-scripts"))
(make-app-op (load-op "weblocks-scripts"))))
Please sign in to comment.
Something went wrong with that request. Please try again.