From: Kevin M. Rosenberg Date: Sun, 18 Aug 2002 02:57:50 +0000 (+0000) Subject: r2298: *** empty log message *** X-Git-Tag: v3.8.6~966 X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=1776004eedb08c52fe909be73a9d34900808e172 r2298: *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index 813e014..45df542 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ +17 Aug 2002 Kevin Rosenberg (kevin@rosenberg.net) + * Add .asd definition files for ASDF users + 31 Jul 2002 Kevin Rosenberg (kevin@rosenberg.net) * Restructure directories for Common Lisp Controller v3 compatibility - + 25 Jul 2002 Kevin Rosenberg (kevin@rosenberg.net) * Also change case of logical host in loader files * Rework handling of logical pathnames diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd new file mode 100644 index 0000000..7d00f5c --- /dev/null +++ b/clsql-aodbc.asd @@ -0,0 +1,29 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql-aodbc.asd +;;;; Purpose: ASDF definition file for CLSQL AODBC backend +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Aug 2002 +;;;; +;;;; $Id: clsql-aodbc.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) +(in-package :asdf) + +(defsystem clsql-aodbc + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-aodbc;" + :components ((:file "aodbc-package") + (:file "aodbc-sql" :depends-on ("aodbc-package"))) + :depends-on (:clsql-base)) + + diff --git a/clsql-base.asd b/clsql-base.asd new file mode 100644 index 0000000..66072f3 --- /dev/null +++ b/clsql-base.asd @@ -0,0 +1,43 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql-base.asd +;;;; Purpose: ASDF definition file for Base CLSQL +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Feb 2002 +;;;; +;;;; $Id: clsql-base.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) +(in-package :asdf) + +;; For use with non-Debian installations +(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl" + :defaults *load-truename*))) + (when (probe-file helper-pathname) + (load helper-pathname))) + +;;; System definitions + +(defsystem clsql-base + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-base;" + :perform (load-op :after (op clsql-base) + (pushnew :clsql cl:*features*)) + :components ((:file "cmucl-compat") + (:file "package") + (:file "utils" :depends-on ("package")) + (:file "classes" :depends-on ("package")) + (:file "conditions" :depends-on ("classes")) + (:file "db-interface" :depends-on ("conditions")) + (:file "initialize" :depends-on ("db-interface"))) + :finally-do + ) diff --git a/clsql-mysql.asd b/clsql-mysql.asd new file mode 100644 index 0000000..99a527c --- /dev/null +++ b/clsql-mysql.asd @@ -0,0 +1,38 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql-mysql.asd +;;;; Purpose: ASDF definition file for CLSQL MySQL backend +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Aug 2002 +;;;; +;;;; $Id: clsql-mysql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) + +(in-package :asdf) + +;;; System definition + +(defsystem clsql-mysql + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-mysql;" + :components ((:file "mysql-package") + (:file "mysql-loader" :depends-on ("mysql-package")) + (:file "mysql-api" :depends-on ("mysql-loader")) + (:file "mysql-sql" :depends-on ("mysql-api")) + (:file "mysql-usql" :depends-on ("mysql-sql"))) + :depends-on (:uffi :clsql-base :clsql-uffi)) + + + + + diff --git a/clsql-oracle.asd b/clsql-oracle.asd new file mode 100644 index 0000000..63f48c8 --- /dev/null +++ b/clsql-oracle.asd @@ -0,0 +1,25 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; This is copyrighted software. See interfaces/oracle/* files for terms. +;;;; +;;;; $Id: clsql-oracle.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ + +(in-package :asdf) + +;;; System definition + +(defsystem :clsql-oracle + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-oracle" + :components + ((:file "oracle-package") + (:file "oracle-loader" :depends-on ("oracle-package")) + (:file "alien-resources" :depends-on ("oracle-package")) + (:file "oracle-constants" :depends-on ("oracle-package")) + (:file "oracle" :depends-on ("oracle-constants" "oracle-loader")) + (:file "oracle-sql" :depends-on ("oracle" "alien-resources")) + (:file "oracle-objects" :depends-on ("oracle-sql"))) + :depends-on (:clsql-base)) + + + + diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd new file mode 100644 index 0000000..060dd30 --- /dev/null +++ b/clsql-postgresql-socket.asd @@ -0,0 +1,32 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql-postgresql.asd +;;;; Purpose: ASDF file for CLSQL PostgresSQL socket backend +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Aug 2002 +;;;; +;;;; $Id: clsql-postgresql-socket.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) +(in-package :asdf) + +;;; System definition + +(defsystem clsql-postgresql-socket + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-postgresql-socket;" + :components ((:file "postgresql-socket-package") + (:file "postgresql-socket-api" + :depends-on ("postgresql-socket-package")) + (:file "postgresql-socket-sql" + :depends-on ("postgresql-socket-api"))) + :depends-on (:clsql-base :uffi)) diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd new file mode 100644 index 0000000..ae45873 --- /dev/null +++ b/clsql-postgresql.asd @@ -0,0 +1,31 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql-postgresql.asd +;;;; Purpose: ASDF file for CLSQL PostgresSQL backend +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Aug 2002 +;;;; +;;;; $Id: clsql-postgresql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) +(in-package :asdf) + +(defsystem clsql-postgresql + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-postgresql;" + :components ((:file "postgresql-package") + (:file "postgresql-loader" :depends-on ("postgresql-package")) + (:file "postgresql-api" :depends-on ("postgresql-loader")) + (:file "postgresql-sql" :depends-on ("postgresql-api")) + (:file "postgresql-usql" :depends-on ("postgresql-sql"))) + :depends-on (:uffi :clsql-base :clsql-uffi)) + diff --git a/clsql-uffi.asd b/clsql-uffi.asd new file mode 100644 index 0000000..848f3b1 --- /dev/null +++ b/clsql-uffi.asd @@ -0,0 +1,37 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql-uffi.asd +;;;; Purpose: ASDF definition file for CLSQL UFFI Helper package +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Aug 2002 +;;;; +;;;; $Id: clsql-uffi.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) + +(in-package :asdf) + +(unless (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")) + +;;; System definition + +(defsystem clsql-uffi + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql-uffi;" + :components ((:file "clsql-uffi-package") + (:file "clsql-uffi-loader" :depends-on ("clsql-uffi-package")) + (:file "clsql-uffi" :depends-on ("clsql-uffi-loader"))) + :depends-on (:uffi)) + diff --git a/clsql.asd b/clsql.asd new file mode 100644 index 0000000..3d29edc --- /dev/null +++ b/clsql.asd @@ -0,0 +1,50 @@ +;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;;; ************************************************************************* +;;;; FILE IDENTIFICATION +;;;; +;;;; Name: clsql.system +;;;; Purpose: Defsystem-3/4 for CLSQL +;;;; Programmer: Kevin M. Rosenberg +;;;; Date Started: Feb 2002 +;;;; +;;;; $Id: clsql.asd,v 1.1 2002/08/18 02:57:50 kevin Exp $ +;;;; +;;;; 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 +;;;; as governed by the terms of the Lisp Lesser GNU Public License +;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;;; ************************************************************************* + +(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) +(in-package :make) + +;; For use with non-Debian installations +(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl" + :defaults *load-truename*))) + (when (probe-file helper-pathname) + (load helper-pathname))) + +(in-package :asdf) + +;;; System definitions + +(unless (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")) + +(defsystem clsql + :default-component-class clsql-cl-source-file + :pathname "cl-library:clsql;" + :perform (load-op :after (op clsql) + (pushnew :clsql cl:*features*)) + :components ((:file "package") + (:file "pool" :depends-on ("package")) + (:file "loop-extension") + (:file "sql" :depends-on ("pool")) + (:file "transactions" :depends-on ("sql")) + (:file "functional" :depends-on ("sql")) + (:file "usql" :depends-on ("sql"))) + :depends-on (:clsql-base) + ) diff --git a/debian/changelog b/debian/changelog index 50cc764..e88ad81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (0.8.3-1) unstable; urgency=low + + * Add .asd definition files to upstream for ASDF users + + -- Kevin M. Rosenberg Sat, 17 Aug 2002 20:54:35 -0600 + cl-sql (0.8.2-1) unstable; urgency=low * New upstream version diff --git a/debian/rules b/debian/rules index 4ee900c..5b1f3c1 100755 --- a/debian/rules +++ b/debian/rules @@ -107,13 +107,13 @@ install: build dh_install -p $(pkg-aodbc) $(srcs-aodbc) $(lispdir-aodbc) # CLC Systems - dh_install -p $(pkg) clsql.system $(clc-systems) - dh_install -p $(pkg-base) clsql-base.system $(clc-systems) - dh_install -p $(pkg-uffi) clsql-uffi.system $(clc-systems) - dh_install -p $(pkg-mysql) clsql-mysql.system $(clc-systems) - dh_install -p $(pkg-pg) clsql-postgresql.system $(clc-systems) - dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.system $(clc-systems) - dh_install -p $(pkg-aodbc) clsql-aodbc.system $(clc-systems) + dh_install -p $(pkg) clsql.system clsql.asd $(clc-systems) + dh_install -p $(pkg-base) clsql-base.system clsql-base.asd $(clc-systems) + dh_install -p $(pkg-uffi) clsql-uffi.system clsql-uffi.asd $(clc-systems) + dh_install -p $(pkg-mysql) clsql-mysql.system clsql-mysql.asd $(clc-systems) + dh_install -p $(pkg-pg) clsql-postgresql.system clsql-postgresql.asd $(clc-systems) + dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.system clsql-postgresql-socket.asd $(clc-systems) + dh_install -p $(pkg-aodbc) clsql-aodbc.system clsql-aodbc.asd $(clc-systems) # Test suite dh_installdirs -p $(pkg) $(doc-dir)/html $(doc-dir)/test-suite