r2474: update asd files

diff --git a/ChangeLog b/ChangeLog
index 45df54281c41ea8e2864742207f09bb44da3542c..a0990f0bd321f693f648342126dd69f99b142723 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+01 Sep 2002 Kevin Rosenberg (kevin@rosenberg.net)
+        * Rework use of file types in .asd files
+
 17 Aug 2002 Kevin Rosenberg (kevin@rosenberg.net)
         * Add .asd definition files for ASDF users
 

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 7e0952d643108d9e888666ed164140f71b9e06a2..b50d362c332ab518b6f20c9c589cf87ba52587f1 100644 (file)
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-aodbc.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-aodbc.asd,v 1.3 2002/09/01 09:00:14 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,8 +19,11 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :asdf)
 
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql-aodbc)))) 
+   "cl")
+
 (defsystem clsql-aodbc
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
   :components ((:file "aodbc-package")
               (:file "aodbc-sql" :depends-on ("aodbc-package")))

diff --git a/clsql-base.asd b/clsql-base.asd
index cae66ee4bd21b16035c59f508d305ceaf966411c..a7b9fae1d08c28c9dedbdd75a177a1d68ca6a914 100644 (file)
--- a/clsql-base.asd
+++ b/clsql-base.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql-base.asd,v 1.4 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-base.asd,v 1.5 2002/09/01 09:00:14 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -36,15 +36,13 @@
   #-common-lisp-controller "clsql"
   "Logical hostname for loading system")
 
-(unless (ignore-errors (find-class 'clsql-cl-source-file))
-  (defclass clsql-cl-source-file (cl-source-file) ())
-  (defmethod source-file-type ((c clsql-cl-source-file) (s module)) 
-    "cl"))
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql-base)))) 
+   "cl")
 
  ;;; System definitions
 
 (defsystem clsql-base
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
   :perform (load-op :after (op clsql-base)
                    (pushnew :clsql-base cl:*features*))

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index b8796dccde1e4b59c36716147e456a430fc365d2..a18db47823a6fda7b5f098a0e56d5dfa048747b7 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
-;;;; $Id: clsql-mysql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $\r
+;;;; $Id: clsql-mysql.asd,v 1.3 2002/09/01 09:00:14 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -22,8 +22,11 @@
 \r
 ;;; System definition\r
 \r
+(defmethod source-file-type  ((c cl-source-file)\r
+                             (s (eql (find-system 'clsql-mysql)))) \r
+   "cl")\r
+\r
 (defsystem clsql-mysql\r
-  :default-component-class clsql-cl-source-file\r
   :pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)\r
   :components ((:file "mysql-package")\r
               (:file "mysql-loader" :depends-on ("mysql-package"))\r

diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 2154b25f30c60420dc1e9a3ae08459fca42b5f4b..08bf7be2daa2f21ab04bef088bc0b26cb6f8155f 100644 (file)
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -1,14 +1,17 @@
 ;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 ;;;; This is copyrighted software.  See interfaces/oracle/* files for terms.
 ;;;; 
-;;;; $Id: clsql-oracle.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-oracle.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $
 
 (in-package :asdf)
 
 ;;; System definition
 
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql-oracle)))) 
+   "cl")
+
 (defsystem :clsql-oracle
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
   :pathname "cl-library:clsql-oracle"
   :components

diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index 5e07926ffeac45997a0f945806d0a2101774e219..7faa04bbac26ad3ce6375a8abf7fa14d13f56774 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
-;;;; $Id: clsql-postgresql-socket.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $\r
+;;;; $Id: clsql-postgresql-socket.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -21,8 +21,11 @@
 \r
 ;;; System definition\r
 \r
+(defmethod source-file-type  ((c cl-source-file)\r
+                             (s (eql (find-system 'clsql-postgresql-socket)))) \r
+   "cl")\r
+\r
 (defsystem clsql-postgresql-socket\r
-  :default-component-class clsql-cl-source-file\r
   :pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)\r
   :components ((:file "postgresql-socket-package")\r
               (:file "postgresql-socket-api"\r

diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 2245d9cb9c2371be5044babf4a1e25218d5cdb50..d9c24b97651347c7d5c2dc5189a683edf0b24843 100644 (file)
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg\r
 ;;;; Date Started:  Aug 2002\r
 ;;;;\r
-;;;; $Id: clsql-postgresql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $\r
+;;;; $Id: clsql-postgresql.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -19,8 +19,11 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))\r
 (in-package :asdf)\r
 \r
+(defmethod source-file-type  ((c cl-source-file)\r
+                             (s (eql (find-system 'clsql-postgresql)))) \r
+   "cl")\r
+\r
 (defsystem clsql-postgresql\r
-  :default-component-class clsql-cl-source-file\r
   :pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)\r
   :components ((:file "postgresql-package")\r
               (:file "postgresql-loader" :depends-on ("postgresql-package"))\r

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index a836524aaff7d787b4302e74426236f385582cea..9d5c21e4cd41e7d5ad56479a7f997d5a3115d88e 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-uffi.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-uffi.asd,v 1.4 2002/09/01 09:00:15 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -22,8 +22,11 @@
 
 ;;; System definition
 
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql-uffi)))) 
+   "cl")
+
 (defsystem clsql-uffi
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
   :components ((:file "clsql-uffi-package")
               (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))

diff --git a/clsql.asd b/clsql.asd
index c60ec628b0d2967c9d459134c76d5bac64c44994..9a1460b476059217fe0e77109fef4c0fa743c910 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: clsql.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql.asd,v 1.4 2002/09/01 09:00:15 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -28,13 +28,12 @@
 
 ;;; System definitions
 
-(unless (ignore-errors (find-class 'clsql-cl-source-file))
-  (defclass clsql-cl-source-file (cl-source-file) ())
-  (defmethod source-file-type ((c clsql-cl-source-file) (s module)) 
-    "cl"))
+
+(defmethod source-file-type  ((c cl-source-file)
+                             (s (eql (find-system 'clsql)))) 
+   "cl")
 
 (defsystem clsql
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
   :perform (load-op :after (op clsql)
                    (pushnew :clsql cl:*features*))