X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=cl-graph.asd;h=e6eb3cad1a26a3eb52933c9564090dbf4f5ef1b3;hb=f54f262647ae0d4c98e87d16ad81ebe130da4f3f;hp=6ef0b94d72b5fcfe2c850d682b47c0d37af760c5;hpb=25d9c9819ce0bb610c024c3ef760660e76653c21;p=cl-graph.git

diff --git a/cl-graph.asd b/cl-graph.asd
index 6ef0b94..e6eb3ca 100644
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -1,28 +1,25 @@
 ;;; -*- 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 
+  (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 (find-system 'asdf-system-connections nil)
+  (operate 'load-op 'asdf-system-connections))
 
 (defsystem cl-graph
-  :version "0.8.1"
+  :version "0.9.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,8 +33,6 @@ instructions."))
 			:depends-on ("graph"))
 		 (:file "graph-matrix"
 			:depends-on ("graph"))
-		 (:file "graph-metrics"
-			:depends-on ("graph"))
 		 (:file "graph-algorithms"
 			:depends-on ("graph"))
                                      
@@ -49,18 +44,18 @@ 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
-	       metabang-bind
-	       cl-mathstats
-	       ;; makes ASDF-Install get this automatically
-	       asdf-system-connections
+		    (funcall
+		      (intern (symbol-name '#:run-tests) :lift)
+		      :config :generic))
+  :depends-on ((:version :metatilities-base "0.6.0")
+	       :dynamic-classes
+	       :cl-containers
+	       :metabang-bind
+	       ;:cl-mathstats
+	       :moptilities
 	       ))
 
 (defmethod operation-done-p 
@@ -93,3 +88,11 @@ 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")))))