Final New Description patch!

[clinton/lisp-on-lines.git] / lisp-on-lines.asd

diff --git a/lisp-on-lines.asd b/lisp-on-lines.asd
index e8633cb..c6f5a74 100644 (file)
--- a/lisp-on-lines.asd
+++ b/lisp-on-lines.asd
@@ -3,14 +3,14 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (find-package :coop.tech.systems)
     (defpackage :coop.tech.systems
-      (:documentation "ASDF System package for meta-model.")
+      (:documentation "ASDF System package for Lisp On Lines")
       (:use :common-lisp :asdf))))
 
 (in-package :coop.tech.systems)
 
 (defsystem :lisp-on-lines
   :license 
-"Copyright (c) 2004-2007 Drew Crampsie
+  "Copyright (c) 2004-2007 Drew Crampsie
 
 Contains portions of ContextL: 
 Copyright (c) 2005 - 2007 Pascal Costanza
@@ -36,28 +36,60 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE."
   :components ((:static-file "lisp-on-lines.asd")
-              
               (:module :src
                        :components ((:file "packages")
                                     (:file "utilities")
+                                    (:module :mao
+                                             :components ((:file "simple-plist-attribute") 
+                                                          (:file "attribute")                              
+                                                          (:file "description-class")
+                                                          (:file "description")
+                                                          (:module :display
+                                                           :components ((:file "display-attribute") 
+                                                                        (:file "display-description")                              
+                                                                        (:file "define-description-compat"))
+                                                           :serial t))
+                                             :serial t)
                                     (:file "display")
+                                   (:module :standard-descriptions
+                                             :components ((:file "t")
+                                                          (:file "inline")
+                                                          (:file "edit")
+                                                          (:file "symbol")
+                                                          (:file "list")
+                                                          (:file "null")
+                                                          (:file "clos")
+                                                          (:file "validate")
+                                                          )
+                                                          
+                                             :serial t))
                                     
-                                    (:file "attribute")
+                                    :serial t))
+  :serial t
+  :depends-on (:contextl :arnesi :alexandria :parse-number :yaclml :trivial-garbage
+ ))
 
-                                    (:file "description-class")
-                                    (:file "description")
-                                    
 
+(defsystem :lisp-on-lines.test
+  :components ((:module :src
+                       :components ((:file "packages-test")
                                     (:file "description-test")
-                                    (:file "attribute-test"))
-                       :serial t))
+                                    (:file "attribute-test")
+                                    (:file "display-test")
+                                    (:module :standard-descriptions
+                                     :components ((:file "edit-test"))
+                                     :serial t)
+                                    (:module :ucw
+                                     :components ((:file "ucw-test"))
+                                     :serial t))
+                       :serial t)
+              (:module :tests
+                       :components ((:module :bug
+                                             :components ((:file "0"))))))
   :serial t
-  :depends-on (:contextl))
 
-(defsystem :lisp-on-lines.test
-  :components ((:module :src
-                       :components ((:file "description-test")
-                                    (:file "attribute-test"))
-                       :serial t))
 
-  :depends-on (:lisp-on-lines :stefil))
+  :depends-on (:lisp-on-lines :lisp-on-lines-ucw :stefil))
+
+
+