Dear weblocks hackers,

recent failures of ASDF 2.26.36 to compile weblocks led me to give a look 
at your .asd files.

In the end, I improved backwards compatibility, and I believe that the 
latest ASDF (currenty 2.26.45) will compile weblocks. Please test, though.

However, while I was at it, I made those small improvements to your .asd 
files.

Also, I don't quite understand what is the intent of the 
prepare-prevalence-op thingie. How is it not but a horribly inefficient way 
to do the same as including :weblocks-memory in your :depends-on?

I would also cut on all the defpackage overhead when all you're doing is 
using a single defsystem form. ASDF will load your systems in a package 
where defsystem already works, for lambda's sake!

-- 
You received this message because you are subscribed to the Google Groups 
"weblocks" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/weblocks/-/i5BXv5gXM7UJ.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/weblocks?hl=en.

diff -r 87c89cdc13a1 src/package.lisp
--- a/src/package.lisp	Fri Feb 10 10:36:35 2012 +0100
+++ b/src/package.lisp	Sat Dec 29 14:15:07 2012 -0500
@@ -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.")))
-
diff -r 87c89cdc13a1 weblocks-store-test.asd
--- a/weblocks-store-test.asd	Fri Feb 10 10:36:35 2012 +0100
+++ b/weblocks-store-test.asd	Sat Dec 29 14:15:07 2012 -0500
@@ -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")))))
diff -r 87c89cdc13a1 weblocks.asd
--- a/weblocks.asd	Fri Feb 10 10:36:35 2012 +0100
+++ b/weblocks.asd	Sat Dec 29 14:15:07 2012 -0500
@@ -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"))))
 

Reply via email to