X-Git-Url: http://git.kpe.io/?p=hyperobject.git;a=blobdiff_plain;f=hyperobject.asd;h=f5f7916d4058264cc12b3adf10735b45a1c3fb84;hp=3c47f1687768688683c66892321dabefae02cb6c;hb=HEAD;hpb=f45b5a177039ec999d3fd43ddf2f7bad8e8e4fd3

diff --git a/hyperobject.asd b/hyperobject.asd
index 3c47f16..f5f7916 100644
--- a/hyperobject.asd
+++ b/hyperobject.asd
@@ -4,25 +4,23 @@
 ;;;;
 ;;;; Name:          hyperobject.asd
 ;;;; Purpose:       ASDF system definition for hyperobject package
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: hyperobject.asd,v 1.21 2003/04/28 16:07:11 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $Id$
 ;;;; *************************************************************************
 
-(in-package :asdf)
+(defpackage hyperobject-system (:use #:asdf #:cl))
+(in-package :hyperobject-system)
 
-#+(or allegro lispworks sbcl cmu scl)
-(defsystem hyperobject 
-  :name "cl-hyperobject"
+(defsystem hyperobject
+  :name "hyperobject"
   :author "Kevin M. Rosenberg <kevin@rosenberg.net>"
-  :version "2.6.x"
+  :version "2.7.2"
   :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
   :licence "BSD-like License"
-
-  :components 
+  :depends-on (:kmrcl :clsql)
+  :components
   ((:file "package")
    (:file "metaclass" :depends-on ("package"))
    (:file "mop" :depends-on ("metaclass"))
@@ -31,19 +29,13 @@
    (:file "sql" :depends-on ("connect"))
    (:file "views" :depends-on ("mop"))
    (:file "base-class" :depends-on ("views" "sql" "rules"))
-   (:file "wrapper" :depends-on ("base-class"))
    )
-  :depends-on (:kmrcl :clsql))
-
-(defmethod perform ((o test-op) (c (eql (find-system :hyperobject))))
-  (oos 'load-op 'hyperobject-tests)
-  (oos 'test-op 'hyperobject-tests))
-
-(defsystem hyperobject-tests
-    :depends-on (rt)
-    :components ((:file "tests")))
+  :in-order-to ((test-op (test-op "hyperobject/test"))))
 
-(defmethod perform ((o test-op) (c (eql (find-system :sb-aclrepl-tests))))
-  (or (funcall (intern (symbol-name '#:do-tests)
-		       (find-package '#:sb)))
-      (error "test-op failed")))
+(defsystem hyperobject/test
+    :depends-on (:rt :hyperobject)
+    :components ((:file "tests"))
+    :perform (test-op (o s)
+                      (or (funcall (intern (symbol-name '#:do-tests)
+                                           (find-package '#:regression-test)))
+                          (error "test-op failed"))))