From 31e110c6d17b31e9978b61dcf64c13ba509182eb Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Sun, 1 Sep 2002 09:00:15 +0000
Subject: [PATCH] r2474: update asd files

---
 ChangeLog                   |  3 +++
 clsql-aodbc.asd             |  7 +++++--
 clsql-base.asd              | 10 ++++------
 clsql-mysql.asd             |  7 +++++--
 clsql-oracle.asd            |  7 +++++--
 clsql-postgresql-socket.asd |  7 +++++--
 clsql-postgresql.asd        |  7 +++++--
 clsql-uffi.asd              |  7 +++++--
 clsql.asd                   | 11 +++++------
 9 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45df542..a0990f0 100644
--- 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 7e0952d..b50d362 100644
--- 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 cae66ee..a7b9fae 100644
--- 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 b8796dc..a18db47 100644
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-mysql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-mysql.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
 ;;;;
@@ -22,8 +22,11 @@
 
 ;;; System definition
 
+(defmethod source-file-type  ((c cl-source-file)
+			      (s (eql (find-system 'clsql-mysql)))) 
+   "cl")
+
 (defsystem clsql-mysql
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)
   :components ((:file "mysql-package")
 	       (:file "mysql-loader" :depends-on ("mysql-package"))
diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 2154b25..08bf7be 100644
--- 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 5e07926..7faa04b 100644
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-postgresql-socket.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-postgresql-socket.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -21,8 +21,11 @@
 
 ;;; System definition
 
+(defmethod source-file-type  ((c cl-source-file)
+			      (s (eql (find-system 'clsql-postgresql-socket)))) 
+   "cl")
+
 (defsystem clsql-postgresql-socket
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)
   :components ((:file "postgresql-socket-package")
 	       (:file "postgresql-socket-api"
diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 2245d9c..d9c24b9 100644
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
-;;;; $Id: clsql-postgresql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
+;;;; $Id: clsql-postgresql.asd,v 1.3 2002/09/01 09:00:15 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-postgresql)))) 
+   "cl")
+
 (defsystem clsql-postgresql
-  :default-component-class clsql-cl-source-file
   :pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)
   :components ((:file "postgresql-package")
 	       (:file "postgresql-loader" :depends-on ("postgresql-package"))
diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index a836524..9d5c21e 100644
--- 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 c60ec62..9a1460b 100644
--- 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*))
-- 
2.34.1