Skip to content

Commit 31e110c

Browse files
kevinrosenbergkevinrosenberg
committed
r2474: update asd files
1 parent 252de16 commit 31e110c

9 files changed

Lines changed: 42 additions & 24 deletions

‎ChangeLog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
01 Sep 2002 Kevin Rosenberg (kevin@rosenberg.net)
2+
* Rework use of file types in .asd files
3+
14
17 Aug 2002 Kevin Rosenberg (kevin@rosenberg.net)
25
* Add .asd definition files for ASDF users
36

‎clsql-aodbc.asd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Aug 2002
99
;;;;
10-
;;;; $Id: clsql-aodbc.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql-aodbc.asd,v 1.3 2002/09/01 09:00:14 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -19,8 +19,11 @@
1919
(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
2020
(in-package :asdf)
2121

22+
(defmethod source-file-type ((c cl-source-file)
23+
(s (eql (find-system 'clsql-aodbc))))
24+
"cl")
25+
2226
(defsystem clsql-aodbc
23-
:default-component-class clsql-cl-source-file
2427
:pathname #.(format nil "~A:clsql-aodbc;" +clsql-logical-host+)
2528
:components ((:file "aodbc-package")
2629
(:file "aodbc-sql" :depends-on ("aodbc-package")))

‎clsql-base.asd‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Feb 2002
99
;;;;
10-
;;;; $Id: clsql-base.asd,v 1.4 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql-base.asd,v 1.5 2002/09/01 09:00:14 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -36,15 +36,13 @@
3636
#-common-lisp-controller "clsql"
3737
"Logical hostname for loading system")
3838

39-
(unless (ignore-errors (find-class 'clsql-cl-source-file))
40-
(defclass clsql-cl-source-file (cl-source-file) ())
41-
(defmethod source-file-type ((c clsql-cl-source-file) (s module))
42-
"cl"))
39+
(defmethod source-file-type ((c cl-source-file)
40+
(s (eql (find-system 'clsql-base))))
41+
"cl")
4342

4443
;;; System definitions
4544

4645
(defsystem clsql-base
47-
:default-component-class clsql-cl-source-file
4846
:pathname #.(format nil "~A:clsql-base;" +clsql-logical-host+)
4947
:perform (load-op :after (op clsql-base)
5048
(pushnew :clsql-base cl:*features*))

‎clsql-mysql.asd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Aug 2002
99
;;;;
10-
;;;; $Id: clsql-mysql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql-mysql.asd,v 1.3 2002/09/01 09:00:14 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -22,8 +22,11 @@
2222

2323
;;; System definition
2424

25+
(defmethod source-file-type ((c cl-source-file)
26+
(s (eql (find-system 'clsql-mysql))))
27+
"cl")
28+
2529
(defsystem clsql-mysql
26-
:default-component-class clsql-cl-source-file
2730
:pathname #.(format nil "~A:clsql-mysql;" +clsql-logical-host+)
2831
:components ((:file "mysql-package")
2932
(:file "mysql-loader" :depends-on ("mysql-package"))

‎clsql-oracle.asd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
22
;;;; This is copyrighted software. See interfaces/oracle/* files for terms.
33
;;;;
4-
;;;; $Id: clsql-oracle.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
4+
;;;; $Id: clsql-oracle.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $
55

66
(in-package :asdf)
77

88
;;; System definition
99

10+
(defmethod source-file-type ((c cl-source-file)
11+
(s (eql (find-system 'clsql-oracle))))
12+
"cl")
13+
1014
(defsystem :clsql-oracle
11-
:default-component-class clsql-cl-source-file
1215
:pathname #.(format nil "~A:clsql-oracle;" +clsql-logical-host+)
1316
:pathname "cl-library:clsql-oracle"
1417
:components

‎clsql-postgresql-socket.asd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Aug 2002
99
;;;;
10-
;;;; $Id: clsql-postgresql-socket.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql-postgresql-socket.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -21,8 +21,11 @@
2121

2222
;;; System definition
2323

24+
(defmethod source-file-type ((c cl-source-file)
25+
(s (eql (find-system 'clsql-postgresql-socket))))
26+
"cl")
27+
2428
(defsystem clsql-postgresql-socket
25-
:default-component-class clsql-cl-source-file
2629
:pathname #.(format nil "~A:clsql-postgresql-socket;" +clsql-logical-host+)
2730
:components ((:file "postgresql-socket-package")
2831
(:file "postgresql-socket-api"

‎clsql-postgresql.asd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Aug 2002
99
;;;;
10-
;;;; $Id: clsql-postgresql.asd,v 1.2 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql-postgresql.asd,v 1.3 2002/09/01 09:00:15 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -19,8 +19,11 @@
1919
(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
2020
(in-package :asdf)
2121

22+
(defmethod source-file-type ((c cl-source-file)
23+
(s (eql (find-system 'clsql-postgresql))))
24+
"cl")
25+
2226
(defsystem clsql-postgresql
23-
:default-component-class clsql-cl-source-file
2427
:pathname #.(format nil "~A:clsql-postgresql;" +clsql-logical-host+)
2528
:components ((:file "postgresql-package")
2629
(:file "postgresql-loader" :depends-on ("postgresql-package"))

‎clsql-uffi.asd‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Aug 2002
99
;;;;
10-
;;;; $Id: clsql-uffi.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql-uffi.asd,v 1.4 2002/09/01 09:00:15 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -22,8 +22,11 @@
2222

2323
;;; System definition
2424

25+
(defmethod source-file-type ((c cl-source-file)
26+
(s (eql (find-system 'clsql-uffi))))
27+
"cl")
28+
2529
(defsystem clsql-uffi
26-
:default-component-class clsql-cl-source-file
2730
:pathname #.(format nil "~A:clsql-uffi;" +clsql-logical-host+)
2831
:components ((:file "clsql-uffi-package")
2932
(:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package"))

‎clsql.asd‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
;;;; Programmer: Kevin M. Rosenberg
88
;;;; Date Started: Feb 2002
99
;;;;
10-
;;;; $Id: clsql.asd,v 1.3 2002/08/23 19:39:56 kevin Exp $
10+
;;;; $Id: clsql.asd,v 1.4 2002/09/01 09:00:15 kevin Exp $
1111
;;;;
1212
;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
1313
;;;;
@@ -28,13 +28,12 @@
2828

2929
;;; System definitions
3030

31-
(unless (ignore-errors (find-class 'clsql-cl-source-file))
32-
(defclass clsql-cl-source-file (cl-source-file) ())
33-
(defmethod source-file-type ((c clsql-cl-source-file) (s module))
34-
"cl"))
31+
32+
(defmethod source-file-type ((c cl-source-file)
33+
(s (eql (find-system 'clsql))))
34+
"cl")
3535

3636
(defsystem clsql
37-
:default-component-class clsql-cl-source-file
3837
:pathname #.(format nil "~A:clsql;" +clsql-logical-host+)
3938
:perform (load-op :after (op clsql)
4039
(pushnew :clsql cl:*features*))

0 commit comments

Comments
 (0)