From 56a0b7f90d30e321ca7e95f15dab3c43bd551e3f Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Fri, 29 Jan 2010 14:54:43 -0700 Subject: [PATCH] cleanup *.asd files --- clsql-aodbc.asd | 4 +--- clsql-db2.asd | 2 -- clsql-mysql.asd | 12 +++++------- clsql-odbc.asd | 4 +--- clsql-oracle.asd | 2 -- clsql-postgresql-socket.asd | 4 +--- clsql-postgresql.asd | 4 +--- clsql-sqlite.asd | 2 -- clsql-sqlite3.asd | 4 +--- clsql-tests.asd | 5 ++--- clsql-uffi.asd | 4 +--- clsql.asd | 4 +--- 12 files changed, 14 insertions(+), 37 deletions(-) diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd index 84572be..42e4cdb 100644 --- a/clsql-aodbc.asd +++ b/clsql-aodbc.asd @@ -7,9 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; -;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software ;;;; as governed by the terms of the Lisp Lesser GNU Public License diff --git a/clsql-db2.asd b/clsql-db2.asd index 43f219d..4007017 100644 --- a/clsql-db2.asd +++ b/clsql-db2.asd @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; ;;;; This file is part of CLSQL. ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software diff --git a/clsql-mysql.asd b/clsql-mysql.asd index e8d89a8..6f4acfb 100644 --- a/clsql-mysql.asd +++ b/clsql-mysql.asd @@ -7,9 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; -;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; This file, part of CLSQL, is Copyright (c) 2002-2010 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software ;;;; as governed by the terms of the Lisp Lesser GNU Public License @@ -23,9 +21,9 @@ (unless (find-package 'uffi) (asdf:operate 'asdf:load-op 'uffi))) -(defvar *library-file-dir* - (merge-pathnames "db-mysql/" - (make-pathname :name nil :type nil +(defvar *library-file-dir* + (merge-pathnames "db-mysql/" + (make-pathname :name nil :type nil :defaults *load-truename*))) (defclass clsql-mysql-source-file (c-source-file) @@ -80,7 +78,7 @@ :description "Common Lisp SQL MySQL Driver" :long-description "cl-sql-mysql package provides a database driver to the MySQL database system." - :depends-on (uffi clsql clsql-uffi) + :depends-on (clsql clsql-uffi) :components ((:module :db-mysql :components diff --git a/clsql-odbc.asd b/clsql-odbc.asd index 5913bed..30c04cf 100644 --- a/clsql-odbc.asd +++ b/clsql-odbc.asd @@ -7,8 +7,6 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Created: April 2004 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 200d42 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -27,7 +25,7 @@ :description "Common Lisp SQL ODBC Driver" :long-description "cl-sql-odbc package provides a database driver to the ODBC database system." - :depends-on (uffi clsql clsql-uffi) + :depends-on (clsql clsql-uffi) :components ((:module :db-odbc :components diff --git a/clsql-oracle.asd b/clsql-oracle.asd index 7743674..62d9eb7 100644 --- a/clsql-oracle.asd +++ b/clsql-oracle.asd @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; ;;;; This file is part of CLSQL. ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd index e5e1320..2051b7a 100644 --- a/clsql-postgresql-socket.asd +++ b/clsql-postgresql-socket.asd @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -29,7 +27,7 @@ :description "Common Lisp SQL PostgreSQL Socket Driver" :long-description "cl-sql-postgresql-socket package provides a database driver to the PostgreSQL database via a socket interface." - :depends-on (clsql uffi md5 #+sbcl sb-bsd-sockets) + :depends-on (clsql md5 #-:clsql-cffi uffi #+:clsql-cffi cffi-uffi-compat #+sbcl sb-bsd-sockets) :components ((:module :db-postgresql-socket :components diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd index 84e3606..5c73bba 100644 --- a/clsql-postgresql.asd +++ b/clsql-postgresql.asd @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -29,7 +27,7 @@ :description "Common Lisp PostgreSQL API Driver" :long-description "cl-sql-postgresql package provides a the database driver for the PostgreSQL API." - :depends-on (uffi clsql clsql-uffi) + :depends-on (clsql clsql-uffi) :components ((:module :db-postgresql :components diff --git a/clsql-sqlite.asd b/clsql-sqlite.asd index c4e9259..a8538dc 100644 --- a/clsql-sqlite.asd +++ b/clsql-sqlite.asd @@ -7,8 +7,6 @@ ;;;; Programmer: Aurelio Bignoli ;;;; Date Started: Aug 2003 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2003 by Aurelio Bignoli ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software diff --git a/clsql-sqlite3.asd b/clsql-sqlite3.asd index 4795362..a32130f 100644 --- a/clsql-sqlite3.asd +++ b/clsql-sqlite3.asd @@ -2,13 +2,11 @@ ;;;; ************************************************************************* ;;;; FILE IDENTIFICATION ;;;; -;;;; Name: clsql-sqlite.asd +;;;; Name: clsql-sqlite3.asd ;;;; Purpose: ASDF file for CLSQL SQLite3 backend ;;;; Programmer: Aurelio Bignoli ;;;; Date Started: Oct 2004 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2004 by Aurelio Bignoli ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software diff --git a/clsql-tests.asd b/clsql-tests.asd index 4bd56e6..60ffd0e 100644 --- a/clsql-tests.asd +++ b/clsql-tests.asd @@ -3,9 +3,8 @@ ;;;; FILE IDENTIFICATION ;;;; ;;;; File: clsql-tests.asd -;;;; Authors: Marcus Pearce and Kevin Rosenberg +;;;; Authors: Marcus Pearce and Kevin Rosenberg ;;;; Created: 30/03/2004 -;;;; Updated: $Id$ ;;;; ;;;; This file is part of CLSQL. ;;;; @@ -26,7 +25,7 @@ :licence "" :description "A regression test suite for CLSQL." :depends-on (clsql rt) - :components + :components ((:module tests :serial t :components ((:file "package") diff --git a/clsql-uffi.asd b/clsql-uffi.asd index ed556ee..6f743ec 100644 --- a/clsql-uffi.asd +++ b/clsql-uffi.asd @@ -7,8 +7,6 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id$ -;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; ;;;; CLSQL users are granted the rights to distribute and use this software @@ -79,7 +77,7 @@ :description "Common UFFI Helper functions for Common Lisp SQL Interface Library" :long-description "cl-sql-uffi package provides common helper functions using the UFFI for the CLSQL package." - :depends-on (uffi clsql) + :depends-on (clsql #-:clsql-cffi uffi #+:clsql-cffi cffi-uffi-compat) :components ((:module :uffi diff --git a/clsql.asd b/clsql.asd index 0e1a302..29e2f38 100644 --- a/clsql.asd +++ b/clsql.asd @@ -3,12 +3,10 @@ ;;;; FILE IDENTIFICATION ;;;; ;;;; Name: clsql.asd -;;;; Purpose: System definition for CLSQL-CLASSIC +;;;; Purpose: ASDF system definition for CLSQL ;;;; Authors: Marcus Pearce and Kevin M. Rosenberg ;;;; Created: March 2004 ;;;; -;;;; $Id$ -;;;; ;;;; CLSQL 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. -- 2.34.1