X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi.asd;h=ddcf338210d3c8a2dfbffd095aff3323db577b17;hb=a960f62cd8258585d12f2b05cd5d54fafd6ed9cc;hp=bbc9d0a1456b7ffcd1c0f599c5038a2717f6439b;hpb=3c6df96ff889ad07feda90baa7b049359485d80c;p=uffi.git

diff --git a/uffi.asd b/uffi.asd
index bbc9d0a..ddcf338 100644
--- a/uffi.asd
+++ b/uffi.asd
@@ -4,62 +4,43 @@
 ;;;;
 ;;;; Name:          uffi.asd
 ;;;; Purpose:       ASDF system definition file for UFFI package
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: uffi.asd,v 1.12 2002/09/20 01:19:20 kevin Exp $
+;;;; This file, part of UFFI, is Copyright (c) 2002-2009 by Kevin M. Rosenberg
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
-;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :asdf)
+(defpackage #:uffi-system (:use #:asdf #:cl))
+(in-package #:uffi-system)
 
+#+(or allegro lispworks cmu openmcl digitool cormanlisp sbcl scl)
 (defsystem uffi
-  :name "cl-uffi"
-  :author "Kevin M. Rosenberg <kmr@debian.org>"
-  :version "0.7.0"
-  :maintainer "Kevin M. Rosenberg <kmr@debian.org"
+  :name "uffi"
+  :author "Kevin Rosenberg <kevin@rosenberg.net>"
+  :version "1.2.x"
+  :maintainer "Kevin M. Rosenberg <kmr@debian.org>"
   :licence "Lessor Lisp General Public License"
   :description "Universal Foreign Function Library for Common Lisp"
   :long-description "UFFI provides a universal foreign function interface (FFI) for Common Lisp. UFFI supports CMUCL, Lispworks, and AllegroCL."
-  
-  :perform (load-op :after (op uffi)
-	    (pushnew :uffi cl:*features*))
 
   :components
-  (
-   #+(or cmu sbcl allegro lispworks)
-     (:module :src-main
-	      :components
-	      ((:file "package")
-	       (:file "primitives" :depends-on ("package"))
-	       (:file "strings" :depends-on ("primitives"))
-	       (:file "objects" :depends-on ("primitives"))
-	       (:file "aggregates" :depends-on ("primitives"))
-	       (:file "functions" :depends-on ("primitives"))
-	       (:file "libraries" :depends-on ("package"))))
-     #+mcl
-     (:module :src-mcl
-	      :components
-	      ((:file "package")
-	       (:file "primitives" :depends-on ("package"))
-	       (:file "strings" :depends-on ("primitives"))
-	       (:file "objects" :depends-on ("primitives"))
-	       (:file "aggregates" :depends-on ("primitives"))
-	       (:file "functions" :depends-on ("primitives"))
-	       (:file "libraries" :depends-on ("package"))))
-     #+cormanlisp
-     (:module :src-corman
-	      :components
-	      ((:file "uffi-corman")))
-     ))
+  ((:module :src
+	    :components
+	    ((:file "package")
+	     (:file "primitives" :depends-on ("package"))
+	     #+(or openmcl digitool) (:file "readmacros-mcl" :depends-on ("package"))
+	     (:file "objects" :depends-on ("primitives"))
+	     (:file "aggregates" :depends-on ("primitives"))
+	     (:file "strings" :depends-on ("primitives" "functions" "aggregates" "objects"))
+	     (:file "functions" :depends-on ("primitives"))
+	     (:file "libraries" :depends-on ("package"))
+	     (:file "os" :depends-on ("package"))))
+   ))
 
+#+(or allegro lispworks cmu openmcl digitool cormanlisp sbcl scl)
+(defmethod perform ((o test-op) (c (eql (find-system 'uffi))))
+  (oos 'load-op 'uffi-tests)
+  (oos 'test-op 'uffi-tests :force t))
 
-(defmethod source-file-type  ((c cl-source-file) (s (eql (find-system 'uffi)))) 
-   "cl")