cleanup *.asd files

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 84572beb2e0ddc033d0c6c246abb23e7e668dfc8..42e4cdb1151f1dcb5a142784951dfe75b94e5c41 100644 (file)
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;; 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 43f219db2eec7174bceb633879b39f007558e232..400701716da0560f1f0885ee8c80b6b704b25a41 100644 (file)
--- a/clsql-db2.asd
+++ b/clsql-db2.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;; 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 e8d89a871a6c9ddabd85fd490cd45976b05c7983..6f4acfb18d58c23d72ed74087a5c2a699ec4be59 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -7,9 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;;
 ;;;; 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)))
 
   (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)
                                   :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."
 
   :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
   :components
   ((:module :db-mysql
            :components

diff --git a/clsql-odbc.asd b/clsql-odbc.asd
index 5913bede6092b975d60873a67b0a567cd7c39eff..30c04cf1ece10b08bca4f9f8ecbf078a9cb0772e 100644 (file)
--- a/clsql-odbc.asd
+++ b/clsql-odbc.asd
@@ -7,8 +7,6 @@
 ;;;; Author:   Kevin M. Rosenberg
 ;;;; Created:  April 2004
 ;;;;
 ;;;; 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
 ;;;; 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."
 
   :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
   :components
   ((:module :db-odbc
            :components

diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 77436743395586effdd257f96eb824f0adbd0276..62d9eb7b81b99a740f14e64af5a9dd2f873d6c45 100644 (file)
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;; 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 e5e1320b52846c0f590b30f0a3b98b855b9bf190..2051b7a4b1b6387d9bbd77456f819a675faffae9 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;; 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."
 
   :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
   :components
   ((:module :db-postgresql-socket
            :components

diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 84e3606e80776e85b202aaea567a2071289b1fd0..5c73bba7f2bc62886baaf0d6ff805d5effff22fa 100644 (file)
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;; 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."
 
   :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
   :components
   ((:module :db-postgresql
            :components

diff --git a/clsql-sqlite.asd b/clsql-sqlite.asd
index c4e92597390136c28a6976cb53cda8b72b615791..a8538dc2b1757a2987465c6f8111617e75cecfc2 100644 (file)
--- a/clsql-sqlite.asd
+++ b/clsql-sqlite.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Aug 2003
 ;;;;
 ;;;; 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
 ;;;; 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 479536232c13498d551811893d06d36d1da1322c..a32130f2596743851cf813c3623c4b992799108a 100644 (file)
--- a/clsql-sqlite3.asd
+++ b/clsql-sqlite3.asd
@@ -2,13 +2,11 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;

-;;;; Name:          clsql-sqlite.asd
+;;;; Name:          clsql-sqlite3.asd

 ;;;; Purpose:       ASDF file for CLSQL SQLite3 backend
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Oct 2004
 ;;;;
 ;;;; 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
 ;;;; 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 4bd56e6188fe9e676de9d5813cdae0951a893925..60ffd0eb98b2896b970489180a6d1d8cd5c442c4 100644 (file)
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -3,9 +3,8 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; File:     clsql-tests.asd
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; File:     clsql-tests.asd

-;;;; Authors:  Marcus Pearce <m.t.pearce@city.ac.uk> and Kevin Rosenberg 
+;;;; Authors:  Marcus Pearce <m.t.pearce@city.ac.uk> and Kevin Rosenberg

 ;;;; Created:  30/03/2004
 ;;;; Created:  30/03/2004

-;;;; Updated:  $Id$

 ;;;;
 ;;;; This file is part of CLSQL.
 ;;;;
 ;;;;
 ;;;; This file is part of CLSQL.
 ;;;;


@@ -26,7 +25,7 @@
     :licence ""
     :description "A regression test suite for CLSQL."
     :depends-on (clsql rt)
     :licence ""
     :description "A regression test suite for CLSQL."
     :depends-on (clsql rt)

-    :components 
+    :components

     ((:module tests
              :serial t
              :components ((:file "package")
     ((:module tests
              :serial t
              :components ((:file "package")

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index ed556ee01e7bbdd350f7e032a63ab7105fc8f020..6f743ecabd31405a5df8a70ffc157711d5d43849 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -7,8 +7,6 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Aug 2002
 ;;;;
 ;;;; 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
 ;;;; 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."
 
   :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
 
   :components
   ((:module :uffi

diff --git a/clsql.asd b/clsql.asd
index 0e1a302907af0770c3c8d6edc4153168bee99f6f..29e2f38bf55d7835402837963faeee29ff297f29 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -3,12 +3,10 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:     clsql.asd
 ;;;; 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
 ;;;;
 ;;;; 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.
 ;;;; 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.