From 43d545f166cd4eb23ba835aa92685d5bd6d23d01 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 13 May 2002 16:22:08 +0000 Subject: [PATCH] r2024: moved files to separate base interface --- {sql => base}/classes.cl | 2 +- {sql => base}/conditions.cl | 2 +- {sql => base}/db-interface.cl | 2 +- {sql => base}/package.cl | 2 +- clsql-base.system | 6 +++--- debian/cl-sql-base.dirs | 2 +- debian/rules | 11 ++++++----- 7 files changed, 14 insertions(+), 13 deletions(-) rename {sql => base}/classes.cl (96%) rename {sql => base}/conditions.cl (99%) rename {sql => base}/db-interface.cl (99%) rename {sql => base}/package.cl (98%) diff --git a/sql/classes.cl b/base/classes.cl similarity index 96% rename from sql/classes.cl rename to base/classes.cl index 4cb643a..0a91a16 100644 --- a/sql/classes.cl +++ b/base/classes.cl @@ -8,7 +8,7 @@ ;;;; original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: classes.cl,v 1.6 2002/05/07 10:19:13 marc.battyani Exp $ +;;;; $Id: classes.cl,v 1.1 2002/05/13 16:22:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai diff --git a/sql/conditions.cl b/base/conditions.cl similarity index 99% rename from sql/conditions.cl rename to base/conditions.cl index c669cdd..5785653 100644 --- a/sql/conditions.cl +++ b/base/conditions.cl @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: conditions.cl,v 1.2 2002/03/29 08:12:16 kevin Exp $ +;;;; $Id: conditions.cl,v 1.1 2002/05/13 16:22:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai diff --git a/sql/db-interface.cl b/base/db-interface.cl similarity index 99% rename from sql/db-interface.cl rename to base/db-interface.cl index b2dd41e..f779159 100644 --- a/sql/db-interface.cl +++ b/base/db-interface.cl @@ -9,7 +9,7 @@ ;;;; onShoreD to support UncommonSQL front-end ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: db-interface.cl,v 1.7 2002/04/27 20:58:11 kevin Exp $ +;;;; $Id: db-interface.cl,v 1.1 2002/05/13 16:22:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai, and onShoreD diff --git a/sql/package.cl b/base/package.cl similarity index 98% rename from sql/package.cl rename to base/package.cl index ec93e1e..71aa24e 100644 --- a/sql/package.cl +++ b/base/package.cl @@ -8,7 +8,7 @@ ;;;; Original code by Pierre R. Mai ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: package.cl,v 1.14 2002/05/11 22:37:46 kevin Exp $ +;;;; $Id: package.cl,v 1.1 2002/05/13 16:22:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai diff --git a/clsql-base.system b/clsql-base.system index 7f82393..80f359c 100644 --- a/clsql-base.system +++ b/clsql-base.system @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: clsql-base.system,v 1.2 2002/05/13 05:24:57 kevin Exp $ +;;;; $Id: clsql-base.system,v 1.3 2002/05/13 16:22:08 kevin Exp $ ;;;; ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -28,9 +28,9 @@ ;;; System definitions (mk:defsystem :clsql-base - :source-pathname "CL-LIBRARY:clsql;sql;" + :source-pathname "CL-LIBRARY:clsql;base;" :source-extension "cl" - :binary-pathname "CL-LIBRARY:clsql;sql;bin;" + :binary-pathname "CL-LIBRARY:clsql;base;bin;" :components ((:file "package") (:file "classes" :depends-on ("package")) (:file "conditions" :depends-on ("classes")) diff --git a/debian/cl-sql-base.dirs b/debian/cl-sql-base.dirs index 7133f9e..44f8191 100644 --- a/debian/cl-sql-base.dirs +++ b/debian/cl-sql-base.dirs @@ -5,7 +5,7 @@ usr/share/common-lisp/systems usr/share/common-lisp/source usr/share/common-lisp/repositories usr/share/common-lisp/repositories/clsql -usr/share/common-lisp/repositories/clsql/sql +usr/share/common-lisp/repositories/clsql/base usr/share/common-lisp/repositories/clsql/interfaces usr/share/common-lisp/repositories/clsql/interfaces/clsql-uffi diff --git a/debian/rules b/debian/rules index 30dc211..17c2791 100755 --- a/debian/rules +++ b/debian/rules @@ -24,9 +24,9 @@ prefix-pg-socket := debian/$(pkg-pg-socket) prefix-aodbc := debian/$(pkg-aodbc) ## Lisp sources -srcs := sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.cl sql/usql.cl -srcs-cmucl-compat := $(wildcard cmucl-compat/*.cl) -srcs-base := sql/package.cl sql/db-interface.cl sql/classes.cl sql/conditions.cl +srcs := $(wildcard sql/*.cl) +srcs-cmucl-compat:= $(wildcard cmucl-compat/*.cl) +srcs-base := $(wildcard base/*.cl) srcs-base-uffi := $(wildcard interfaces/clsql-uffi/*.cl) $(wildcard interfaces/clsql-uffi/*.so) srcs-mysql := $(wildcard interfaces/mysql/*.cl) $(wildcard interfaces/mysql/*.so) srcs-pg := $(wildcard interfaces/postgresql/*.cl) @@ -78,14 +78,15 @@ install: build $(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat # Base - $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/sql + $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql/base $(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi + chmod +x $(wildcard $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi/*.so) $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql + chmod +x $(wildcard $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql/*.so) $(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(prefix-pg)/$(clc-repos)/clsql/interfaces/postgresql $(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(prefix-pg-socket)/$(clc-repos)/clsql/interfaces/postgresql-socket $(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(prefix-aodbc)/$(clc-repos)/clsql/interfaces/aodbc - chmod +x `find debian -type f -name \*.so` # CLC Systems $(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)/ -- 2.34.1