moving to git; cleanup; wip

[cl-graph.git] / cl-graph.asd

diff --git a/cl-graph.asd b/cl-graph.asd
index ace07b1..93c2cc0 100644 (file)
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -4,16 +4,18 @@
 (defpackage #:cl-graph-system (:use #:cl #:asdf))
 (in-package #:cl-graph-system)
 
-(unless (find-system 'asdf-system-connections nil)
+(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."))
-(when (find-system 'asdf-system-connections nil)
+(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.5"
+  :version "0.10.2"
   :author "Gary Warren King <gwking@metabang.com>"
   :maintainer "Gary Warren King <gwking@metabang.com>"
   :licence "MIT Style License"
@@ -33,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")
@@ -52,12 +54,9 @@ instructions."))
                    (funcall
                      (intern (symbol-name '#:run-tests) :lift)
                      :config :generic))
-  :depends-on (:metatilities 
-              :cl-containers
+  :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 
@@ -75,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 
@@ -90,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")))))
+
+
+
+