X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=cl-graph.asd;h=93c2cc0d434b154396fad0a492926f2b8303217a;hb=5986ec0238faafb18a326e55f16c5fe880d92575;hp=1c5e0f17dde165a5c51e6fecdf85a0f650a26634;hpb=d537ac1c5bd4ac2ac5b63cef4b5a3bfc87aa1c19;p=cl-graph.git

diff --git a/cl-graph.asd b/cl-graph.asd
index 1c5e0f1..93c2cc0 100644
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -1,28 +1,27 @@
 ;;; -*- 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)
+(defpackage #:cl-graph-system (:use #:cl #:asdf))
+(in-package #:cl-graph-system)
 
-(unless (find-system 'asdf-system-connections nil)
- (when (find-package 'asdf-install)
-   (print "Trying to install asdf-system-connections with ASDF-Install...")
-   (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 
+(unless (or (member :asdf-system-connections *features*)
+	    (find-system 'asdf-system-connections nil))
+  (warn "The CL-Graph system would enjoy having asdf-system-connections 
+around. See 
 http://www.cliki.net/asdf-system-connections for details and download
 instructions."))
-
-(asdf:operate 'asdf:load-op 'asdf-system-connections)
+(when (and (not (member :asdf-system-connections *features*))
+	   (find-system 'asdf-system-connections nil))
+  (operate 'load-op 'asdf-system-connections))
 
 (defsystem cl-graph
-  :version "0.8.1"
+  :version "0.10.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 
+  :components ((:static-file "COPYING")
+	       (:module 
 		"dev"
 		:components 
 		((:file "package")
@@ -36,11 +35,11 @@ instructions."))
 			:depends-on ("graph"))
 		 (:file "graph-matrix"
 			:depends-on ("graph"))
-		 (:file "graph-metrics"
-			:depends-on ("graph"))
 		 (:file "graph-algorithms"
 			:depends-on ("graph"))
-                                     
+		 #+(or)
+		 (:file "dynamic-classes"
+			:depends-on ("graph"))
 		 (:static-file "notes.text")
 
 		 (:module "graphviz" :depends-on ("graph")
@@ -49,18 +48,15 @@ instructions."))
 		"website"
 		:components 
 		((:module "source"
-			  :components ((:static-file "index.lml"))))))
-  :in-order-to ((test-op (load-op cl-graph-test)))
+			  :components ((:static-file "index.md"))))))
+  :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
+		    (funcall
+		      (intern (symbol-name '#:run-tests) :lift)
+		      :config :generic))
+  :depends-on ((:version :metatilities-base "0.6.0")
+	       (:version :cl-containers "0.12.0")
 	       :metabang-bind
-	       :cl-mathstats
-	       ;; makes ASDF-Install get this automatically
-	       :asdf-system-connections
 	       ))
 
 (defmethod operation-done-p 
@@ -78,6 +74,14 @@ instructions."))
 			:depends-on ("graph-and-variates"))))))
 
 #+asdf-system-connections
+(asdf:defsystem-connection cl-graph-and-dynamic-classes
+  :requires (cl-graph dynamic-classes)
+  :components ((:module 
+		"dev"
+		:components
+		((:file "dynamic-classes")))))
+
+#+asdf-system-connections
 (asdf:defsystem-connection cl-graph-and-cl-graphviz
   :requires (cl-graph cl-graphviz)
   :components ((:module 
@@ -93,3 +97,23 @@ instructions."))
   :components ((:module 
 		"dev"
 		:components ((:file "copying")))))
+
+#+asdf-system-connections
+(asdf:defsystem-connection cl-graph-and-cl-mathstats
+  :requires (cl-graph cl-mathstats)
+  :components ((:module 
+		"dev"
+		:components
+		((:file "graph-metrics")))))
+
+#+asdf-system-connections
+(asdf:defsystem-connection cl-graph-and-moptilities
+  :requires (cl-graph moptilities)
+  :components ((:module 
+		"dev"
+		:components
+		((:file "subgraph-containing")))))
+
+
+
+