X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=cl-graph.asd;h=313041c48f3cc0c2ea9591a62f4120fb4d0c8646;hb=45c12d2ef967f4fda3c37a9e9594b243f6c879a9;hp=3bad4089152981dc94aa5aab937ecbc9bd33b338;hpb=438d1e0593dc62fe7b975a5865ec27955afcb7a1;p=cl-graph.git

diff --git a/cl-graph.asd b/cl-graph.asd
index 3bad408..313041c 100644
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -1,17 +1,13 @@
-;;; -*- Mode: Lisp; package: CL-USER; Syntax: Common-lisp; Base: 10 -*-
+;;; -*- Mode: Lisp; package: cl-user; Syntax: Common-lisp; Base: 10 -*-
 
-#|
-
-|#
-
-(in-package :common-lisp-user)
-(defpackage "ASDF-CL-GRAPH" (:use #:cl #:asdf))
-(in-package "ASDF-CL-GRAPH")
+(in-package #:common-lisp-user)
+(defpackage #:asdf-cl-graph (:use #:cl #:asdf))
+(in-package #:asdf-cl-graph)
 
 (unless (find-system 'asdf-system-connections nil)
  (when (find-package 'asdf-install)
    (print "Trying to install asdf-system-connections with ASDF-Install...")
-   (funcall (intern "INSTALL" "ASDF-INSTALL") 'asdf-system-connections)))
+   (funcall (intern (symbol-name :install) :asdf-install) 'asdf-system-connections)))
 ;; give up with a useful (?) error message
 (unless (find-system 'asdf-system-connections nil)
   (error "The CL-Graph system requires ASDF-SYSTEM-CONNECTIONS. See 
@@ -20,48 +16,80 @@ instructions."))
 
 (asdf:operate 'asdf:load-op 'asdf-system-connections)
 
-(defsystem cl-graph 
-  :version "0.8"
+(defsystem cl-graph
+  :version "0.8.2"
   :author "Gary Warren King <gwking@metabang.com>"
   :maintainer "Gary Warren King <gwking@metabang.com>"
   :licence "MIT Style License"
   :description "Graph manipulation utilities for Common Lisp"
-  :components ((:module "dev"
-                        :components ((:file "package")
-                                     (:file "api"
-                                            :depends-on ("package"))
-                                     (:file "macros"
-                                            :depends-on ("package"))
-                                     (:file "graph"
-                                            :depends-on ("api"))
-                                     (:file "graph-container"
-                                            :depends-on ("graph"))
-                                     (:file "graph-matrix"
-                                            :depends-on ("graph"))
-                                     (:file "graph-metrics"
-                                            :depends-on ("graph"))
-                                     (:file "graph-algorithms"
-                                            :depends-on ("graph"))
-                                     (:file "graphviz-support"
-                                            :depends-on ("graph"))
+  :components ((:module 
+		"dev"
+		:components 
+		((:file "package")
+		 (:file "api"
+			:depends-on ("package"))
+		 (:file "macros"
+			:depends-on ("package"))
+		 (:file "graph"
+			:depends-on ("api" "macros"))
+		 (:file "graph-container"
+			:depends-on ("graph"))
+		 (:file "graph-matrix"
+			:depends-on ("graph"))
+		 (:file "graph-metrics"
+			:depends-on ("graph"))
+		 (:file "graph-algorithms"
+			:depends-on ("graph"))
                                      
-                                     (:static-file "notes.text")))
-               (:module "website"
-                        :components ((:module "source"
-                                              :components ((:static-file "index.lml"))))))
-  
-  :depends-on (metatilities 
-               cl-containers
-               metabang-bind
-               cl-mathstats
-               asdf-system-connections          ; makes ASDF-Install get this automatically
-               ))
+		 (:static-file "notes.text")
+
+		 (:module "graphviz" :depends-on ("graph")
+			  :components ((:file "graphviz-support")))))
+               (:module 
+		"website"
+		:components 
+		((:module "source"
+			  :components ((:static-file "index.lml"))))))
+  :in-order-to ((test-op (load-op cl-graph-test)))
+  :perform (test-op :after (op c)
+                    (describe 
+		     (funcall (intern (symbol-name '#:run-tests) :lift) 
+			      :suite '#:cl-graph-test)))
+  :depends-on (:metatilities 
+	       :cl-containers
+	       :metabang-bind
+	       :cl-mathstats
+	       ;; makes ASDF-Install get this automatically
+	       :asdf-system-connections
+	       ))
 
-;;; ---------------------------------------------------------------------------
+(defmethod operation-done-p 
+           ((o test-op) (c (eql (find-system 'cl-graph))))
+  (values nil))
 
+#+asdf-system-connections
 (asdf:defsystem-connection cl-graph-and-cl-variates
   :requires (cl-graph cl-variates)
-  :components ((:module "dev"
-                        :components ((:file "graph-and-variates")
-                                     (:file "graph-generation"
-                                            :depends-on ("graph-and-variates"))))))
+  :components ((:module 
+		"dev"
+		:components
+		((:file "graph-and-variates")
+		 (:file "graph-generation"
+			:depends-on ("graph-and-variates"))))))
+
+#+asdf-system-connections
+(asdf:defsystem-connection cl-graph-and-cl-graphviz
+  :requires (cl-graph cl-graphviz)
+  :components ((:module 
+		"dev"
+		:components
+		((:module "graphviz"
+			  :components
+			  ((:file "graphviz-support-optional")))))))
+
+#+asdf-system-connections
+(asdf:defsystem-connection cl-graph-and-metacopy
+  :requires (cl-graph metacopy)
+  :components ((:module 
+		"dev"
+		:components ((:file "copying")))))