r2006: debian

diff --git a/cmucl-compat/Makefile b/cmucl-compat/Makefile
new file mode 100644 (file)
index 0000000..31dc910
--- /dev/null
+++ b/cmucl-compat/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS                := 
+
+include ../Makefile.common
+
+.PHONY: distclean
+distclean: clean

diff --git a/debian/cl-sql-aodbc.dirs b/debian/cl-sql-aodbc.dirs
new file mode 100644 (file)
index 0000000..295c652
--- /dev/null
+++ b/debian/cl-sql-aodbc.dirs
@@ -0,0 +1,14 @@
+usr
+usr/share
+usr/share/common-lisp
+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/interfaces
+usr/share/common-lisp/repositories/clsql/interfaces/aodbc
+
+
+
+
+

diff --git a/debian/cl-sql-base.dirs b/debian/cl-sql-base.dirs
index 4e9055bdcb9608a1e323f6d22e46e03ca49a44ea..0a661a733a87b6abe5acbe189326fd829b35e8f1 100644 (file)
--- a/debian/cl-sql-base.dirs
+++ b/debian/cl-sql-base.dirs
@@ -5,6 +5,6 @@ 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/source
 usr/share/common-lisp/repositories
 usr/share/common-lisp/repositories/clsql

-
-
+usr/share/common-lisp/repositories/clsql/interfaces
+usr/share/common-lisp/repositories/clsql/interfaces/clsql-uffi

 
 

diff --git a/debian/control b/debian/control
index b0708426b5019f0d32101edc9420e7a5a6b00721..411b94eb1ede62e79448c4457b6b2ab1e0f0f56d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,14 @@ Description: UncommonSQL database backend, MySQL
  This package enables you to use the CLSQL data access package
  with MySQL databases.
 
  This package enables you to use the CLSQL data access package
  with MySQL databases.
 

+Package: cl-sql-aodbc
+Architecture: all
+Depends: cl-sql-base (>= ${Source-Version}), acl-installer
+Provides: cl-sql-backend
+Description: UncommonSQL database backend, AODBC
+ This package enables you to use the CLSQL data access package
+ with AllegroCL's AODBC databases.
+

 Package: cl-sql-postgresql
 Architecture: all
 Depends: cl-sql-base (>= ${Source-Version}), postgresql-client
 Package: cl-sql-postgresql
 Architecture: all
 Depends: cl-sql-base (>= ${Source-Version}), postgresql-client

diff --git a/debian/rules b/debian/rules
index 8587c591dffffc48063f282b30d4b5d195e9d4f5..9567dc92c4dfb71aa8acdcf9b11f2fef6a84db32 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,23 +13,27 @@ pkg-base    := cl-sql-base
 pkg-mysql      := cl-sql-mysql
 pkg-pg         := cl-sql-postgresql
 pkg-pg-socket  := cl-sql-postgresql-socket
 pkg-mysql      := cl-sql-mysql
 pkg-pg         := cl-sql-postgresql
 pkg-pg-socket  := cl-sql-postgresql-socket

-all-pkgs       := $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket)
+pkg-mysql      := cl-sql-aodbc
+all-pkgs       := $(pkg) $(pkg-base) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)

 
 prefix         := debian/$(pkg)
 prefix-base    := debian/$(pkg-base)
 prefix-mysql   := debian/$(pkg-mysql)
 prefix-pg      := debian/$(pkg-pg)
 prefix-pg-socket := debian/$(pkg-pg-socket)
 
 prefix         := debian/$(pkg)
 prefix-base    := debian/$(pkg-base)
 prefix-mysql   := debian/$(pkg-mysql)
 prefix-pg      := debian/$(pkg-pg)
 prefix-pg-socket := debian/$(pkg-pg-socket)

+prefix-aodbc   := debian/$(pkg-aodbc)

 
 ##
 ## lisp sources per pkg
 ##
 srcs           := sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.cl sql/usql.cl
 srcs-cmucl-compat := $(wilcard cmucl-compat/*.cl)
 
 ##
 ## lisp sources per pkg
 ##
 srcs           := sql/pool.cl sql/sql.cl sql/transactions.cl sql/utils.cl sql/functional.cl sql/usql.cl
 srcs-cmucl-compat := $(wilcard cmucl-compat/*.cl)

-srcs-base      := sql/package.cl sql/db-interface.cl sql/classes.cl sql/conditions.cl $(wilcard cmu-compat/*.cl)
-srcs-mysql     := $(wildcard interfaces/mysql/*.cl)
+srcs-base      := sql/package.cl sql/db-interface.cl sql/classes.cl sql/conditions.cl
+srcs-base-uffi := $(wildcard interfaces/clsql-uffi/*.cl) $(wildcard interfaces/clsql-uffi/*.so)
+srcs-mysql     := $(wildcard interfaces/mysql/*.cl) $(wildcards interfaces/mysl/*.so)

 srcs-pg                := $(wildcard interfaces/postgresql/*.cl)
 srcs-pg-socket := $(wildcard interfaces/postgresql-socket/*.cl)
 srcs-pg                := $(wildcard interfaces/postgresql/*.cl)
 srcs-pg-socket := $(wildcard interfaces/postgresql-socket/*.cl)

+srcs-aodbc     := $(wildcard interfaces/aodbc/*.cl)

 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644


@@ -53,7 +57,8 @@ build: build-stamp
 
 build-stamp: configure-stamp 
        dh_testdir
 
 build-stamp: configure-stamp 
        dh_testdir

-       # Add here commands to compile the package.
+       # Compile helper libraries
+       $(MAKE)

        touch build-stamp
 
 clean:
        touch build-stamp
 
 clean:


@@ -61,6 +66,7 @@ clean:
        dh_testroot
        rm -f build-stamp configure-stamp
        # Add here commands to clean up after the build process.
        dh_testroot
        rm -f build-stamp configure-stamp
        # Add here commands to clean up after the build process.

+       $(MAKE) clean

        dh_clean
 
 install: build
        dh_clean
 
 install: build


@@ -69,12 +75,18 @@ install: build
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 

-       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql
+       # Main package

        $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql
        $(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat
        $(INSTALL) $(INSTALLFLAGS) $(srcs) $(prefix)/$(clc-repos)/clsql
        $(INSTALL) $(INSTALLFLAGS) $(srcs-cmucl-compat) $(prefix)/$(clc-repos)/clsql/cmucl-compat

+
+       # Base
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(prefix-base)/$(clc-repos)/clsql
+       $(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(prefix-base)/$(clc-repos)/clsql/interfaces/clsql-uffi
+

        $(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
        $(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-mysql) $(prefix-mysql)/$(clc-repos)/clsql/interfaces/mysql
        $(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

 
        dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql
 
 
        dh_link ../repositories/clsql $(prefix-base)/$(clc-source)/clsql
 


@@ -84,6 +96,7 @@ install: build
        $(INSTALL) $(INSTALLFLAGS) clsql-mysql.system $(prefix-mysql)/$(clc-systems)/
        $(INSTALL) $(INSTALLFLAGS) clsql-postgresql.system $(prefix-pg)/$(clc-systems)/
        $(INSTALL) $(INSTALLFLAGS) clsql-postgresql-socket.system $(prefix-pg-socket)/$(clc-systems)/
        $(INSTALL) $(INSTALLFLAGS) clsql-mysql.system $(prefix-mysql)/$(clc-systems)/
        $(INSTALL) $(INSTALLFLAGS) clsql-postgresql.system $(prefix-pg)/$(clc-systems)/
        $(INSTALL) $(INSTALLFLAGS) clsql-postgresql-socket.system $(prefix-pg-socket)/$(clc-systems)/

+       $(INSTALL) $(INSTALLFLAGS) clsql-aodbc.system $(prefix-aodbc)/$(clc-systems)/

 
        # Test suite
        $(INSTALL) $(INSTALLFLAGS) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/test-suite
 
        # Test suite
        $(INSTALL) $(INSTALLFLAGS) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/test-suite

diff --git a/interfaces/aodbc/Makefile b/interfaces/aodbc/Makefile
new file mode 100644 (file)
index 0000000..ce6118b
--- /dev/null
+++ b/interfaces/aodbc/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS                := 
+
+include ../../Makefile.common
+
+.PHONY: distclean
+distclean: clean

diff --git a/interfaces/postgresql-socket/Makefile b/interfaces/postgresql-socket/Makefile
new file mode 100644 (file)
index 0000000..ce6118b
--- /dev/null
+++ b/interfaces/postgresql-socket/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS                := 
+
+include ../../Makefile.common
+
+.PHONY: distclean
+distclean: clean

diff --git a/interfaces/postgresql/Makefile b/interfaces/postgresql/Makefile
new file mode 100644 (file)
index 0000000..ce6118b
--- /dev/null
+++ b/interfaces/postgresql/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS                := 
+
+include ../../Makefile.common
+
+.PHONY: distclean
+distclean: clean

diff --git a/sql/Makefile b/sql/Makefile
new file mode 100644 (file)
index 0000000..31dc910
--- /dev/null
+++ b/sql/Makefile
@@ -0,0 +1,6 @@
+SUBDIRS                := 
+
+include ../Makefile.common
+
+.PHONY: distclean
+distclean: clean