X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=debian%2Frules;h=74d450051afb07ddc0116befc80c58b0294b4efa;hp=46cdd6333e7ed15c7c237c9566a037cfadc66514;hb=180b52cb686a87487e12e87b13bafe131e6c3bef;hpb=2434b58ef00a7f6c5915c86b25a891c4adda79e4

diff --git a/debian/rules b/debian/rules
index 46cdd63..74d4500 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,50 +1,48 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=4
 
 plain-pkg	:= clsql
 
 pkg		:= cl-sql
-pkg-base	:= cl-sql-base
 pkg-uffi	:= cl-sql-uffi
 pkg-mysql	:= cl-sql-mysql
 pkg-pg		:= cl-sql-postgresql
 pkg-pg-socket	:= cl-sql-postgresql-socket
 pkg-aodbc	:= cl-sql-aodbc
-all-pkgs	:= $(pkg) $(pkg-base) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
+pkg-odbc	:= cl-sql-odbc
+pkg-sqlite	:= cl-sql-sqlite
+pkg-sqlite3	:= cl-sql-sqlite3
+pkg-oracle	:= cl-sql-oracle
+pkg-tests	:= cl-sql-tests
+all-pkgs	:= $(pkg) $(pkg-uffi) $(pkg-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc) $(pkg-odbc) $(pkg-sqlite) $(pkg-sqlite3) $(pkg-tests)
 
 
 UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
 
 ## Lisp sources
-srcs		:= sql clsql.asd
-srcs-base	:= $(wildcard base/*.cl) 
-srcs-uffi	:= $(wildcard uffi/*.cl) $(wildcard uffi/*.c)
-srcs-uffi-so	:= $(wildcard uffi/*.so)
-srcs-mysql	:= $(wildcard db-mysql/*.cl) $(wildcard db-mysql/*.c)
-srcs-mysql-so	:=  $(wildcard db-mysql/*.so)
-srcs-pg		:= $(wildcard db-postgresql/*.cl)
-srcs-pg-socket	:= $(wildcard db-postgresql-socket/*.cl)
-srcs-aodbc	:= $(wildcard db-aodbc/*.cl)
+srcs-sql	:= $(wildcard sql/*.lisp)
+srcs-uffi	:= $(wildcard uffi/*.lisp) $(wildcard uffi/*.c)
+srcs-uffi-so	= $(wildcard uffi/*.so)
+srcs-mysql	:= $(wildcard db-mysql/*.lisp) $(wildcard db-mysql/*.c)
+srcs-mysql-so	=  $(wildcard db-mysql/*.so)
+srcs-pg		:= $(wildcard db-postgresql/*.lisp)
+srcs-pg-socket	:= $(wildcard db-postgresql-socket/*.lisp)
+srcs-aodbc	:= $(wildcard db-aodbc/*.lisp)
+srcs-odbc	:= $(wildcard db-odbc/*.lisp)
+srcs-sqlite	:= $(wildcard db-sqlite/*.lisp)
+srcs-sqlite3	:= $(wildcard db-sqlite3/*.lisp)
+srcs-oracle	:= $(wildcard db-oracle/*.lisp)
+srcs-tests	:= $(wildcard tests/*.lisp)
 
 clc-base	:= usr/share/common-lisp
 clc-source	:= $(clc-base)/source
 clc-systems	:= $(clc-base)/systems
-doc-dir		:= usr/share/doc/cl-sql-base
+doc-dir		:= usr/share/doc/cl-sql
 
 clc-clsql	:= $(clc-source)/$(plain-pkg)
 
 clc-sql		:= $(clc-source)/clsql
 lispdir-sql	:= $(clc-sql)/sql
-clc-base	:= $(clc-source)/clsql-base
-lispdir-base	:= $(clc-base)/base
-clc-uffi	 := $(clc-source)/clsql-uffi
+clc-uffi	:= $(clc-source)/clsql-uffi
 lispdir-uffi 	:= $(clc-uffi)/uffi
 sodir-uffi 	:= usr/lib/clsql
 clc-mysql	:= $(clc-source)/clsql-mysql
@@ -52,55 +50,65 @@ lispdir-mysql	:= $(clc-mysql)/db-mysql
 sodir-mysql	:= usr/lib/clsql
 clc-pg		:= $(clc-source)/clsql-postgresql
 lispdir-pg	:= $(clc-pg)/db-postgresql
-clc-socket 	:= $(clc-source)/clsql-postgresql-socket
+clc-pg-socket 	:= $(clc-source)/clsql-postgresql-socket
 lispdir-pg-socket := $(clc-pg-socket)/db-postgresql-socket
 clc-aodbc	:= $(clc-source)/clsql-aodbc
 lispdir-aodbc	:= $(clc-aodbc)/db-aodbc
-
-
-configure: configure-stamp
-configure-stamp:
+clc-odbc	:= $(clc-source)/clsql-odbc
+lispdir-odbc	:= $(clc-odbc)/db-odbc
+clc-sqlite	:= $(clc-source)/clsql-sqlite
+lispdir-sqlite	:= $(clc-sqlite)/db-sqlite
+clc-sqlite3	:= $(clc-source)/clsql-sqlite3
+lispdir-sqlite3	:= $(clc-sqlite3)/db-sqlite3
+clc-oracle	:= $(clc-source)/clsql-oracle
+lispdir-oracle	:= $(clc-oracle)/db-oracle
+clc-tests	:= $(clc-source)/clsql-tests
+lispdir-tests	:= $(clc-tests)/tests
+
+
+build-arch: build-arch-stamp
+build-arch-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
-	touch configure-stamp
+	$(MAKE)
+	touch build-arch-stamp
 
+build-indep:
 
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	# Compile helper libraries
-	$(MAKE)
-	touch build-stamp
+build: build-arch
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
+	rm -f build-arch-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
+	find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
+	rm -rf doc/html
 	dh_clean
 
+install: DH_OPTIONS=
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
-	dh_installdirs --all  $(clc-systems) $(clc-source)
-	dh_installdirs -p $(pkg) $(lispdir-sql)
-	dh_installdirs -p $(pkg-base) $(lispdir-base)
+	dh_prep
+	dh_installdirs
+
+	dh_installdirs --all $(clc-source)
+	dh_installdirs -p $(pkg) $(lispdir-sql) etc
 	dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
 	dh_installdirs -p $(pkg-pg) $(lispdir-pg)
 	dh_installdirs -p $(pkg-pg-socket) $(lispdir-pg-socket)
 	dh_installdirs -p $(pkg-mysql) $(lispdir-mysql) $(sodir-mysql)
 	dh_installdirs -p $(pkg-aodbc) $(lispdir-aodbc)
+	dh_installdirs -p $(pkg-odbc) $(lispdir-odbc)
+	dh_installdirs -p $(pkg-sqlite) $(lispdir-sqlite)
+	dh_installdirs -p $(pkg-sqlite3) $(lispdir-sqlite3)
+	dh_installdirs -p $(pkg-oracle) $(lispdir-oracle)
+	dh_installdirs -p $(pkg-tests) $(lispdir-tests)
 
 	# Main package
-	dh_install -p $(pkg) $(srcs) $(lispdir-sql)
+	dh_install -p $(pkg) $(srcs-sql) $(lispdir-sql)
 	dh_install -p $(pkg) clsql.asd $(clc-clsql)
-
-	# Base
-	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
-	dh_install -p $(pkg-base) clsql-base.asd $(clc-base)
+	dh_install -p $(pkg) debian/clsql-init.lisp etc
 
 	# UFFI
 	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
@@ -117,66 +125,52 @@ install: build
 	dh_install -p $(pkg-pg-socket) clsql-postgresql-socket.asd $(clc-pg-socket)
 	dh_install -p $(pkg-aodbc) $(srcs-aodbc) $(lispdir-aodbc)
 	dh_install -p $(pkg-aodbc) clsql-aodbc.asd $(clc-aodbc)
-
-	# CLC Systems
-	dh_link -p $(pkg) $(clc-clsql)/clsql.asd $(clc-systems)/clsql.asd
-	dh_link -p $(pkg-base) $(clc-base)/clsql-base.asd $(clc-systems)/clsql-base.asd
-	dh_link -p $(pkg-uffi) $(clc-uffi)/clsql-uffi.asd $(clc-systems)/clsql-uffi.asd
-	dh_link -p $(pkg-mysql) $(clc-mysql)/clsql-mysql.asd $(clc-systems)/clsql-mysql.asd
-	dh_link -p $(pkg-pg) $(clc-pg)/clsql-postgresql.asd $(clc-systems)/clsql-postgresql.asd
-	dh_link -p $(pkg-pg-socket) $(clc-pg-socket)/clsql-postgresql-socket.asd $(clc-systems)/clsql-postgresql-socket.asd
-	dh_link -p $(pkg-aodbc) $(clc-aodbc)/clsql-aodbc.asd $(clc-systems)/clsql-aodbc.asd
-
-	# Test suite
-	dh_installdirs -p $(pkg) $(doc-dir)/html $(doc-dir)/test-suite
-	dh_install -p $(pkg) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/test-suite
+	dh_install -p $(pkg-odbc) $(srcs-odbc) $(lispdir-odbc)
+	dh_install -p $(pkg-odbc) clsql-odbc.asd $(clc-odbc)
+	dh_install -p $(pkg-sqlite) $(srcs-sqlite) $(lispdir-sqlite)
+	dh_install -p $(pkg-sqlite) clsql-sqlite.asd $(clc-sqlite)
+	dh_install -p $(pkg-sqlite3) $(srcs-sqlite3) $(lispdir-sqlite3)
+	dh_install -p $(pkg-sqlite3) clsql-sqlite3.asd $(clc-sqlite3)
+	dh_install -p $(pkg-oracle) $(srcs-oracle) $(lispdir-oracle)
+	dh_install -p $(pkg-oracle) clsql-oracle.asd $(clc-oracle)
+
+	dh_install -p $(pkg-tests) $(srcs-tests) $(lispdir-tests)
+	dh_install -p $(pkg-tests) clsql-tests.asd $(clc-tests)
 
 	# Documentation
 	rm -rf doc/html
 	(cd doc; tar xzf html.tar.gz; cd ..)
-	dh_install -p $(pkg) doc/html $(doc-dir)
-	rm -rf doc/html
-	cp doc/clsql.pdf doc/cl-sql.pdf
-	rm -f doc/cl-sql.pdf.gz
-	gzip doc/cl-sql.pdf
-	dh_install -p $(pkg) doc/cl-sql.pdf.gz $(doc-dir)
-	rm -f doc/cl-sql.pdf.gz
-
-	set -e ;\
-	for p in $(all-pkgs); do \
-                echo "processing maintainer scripts for $$p" ;\
-		l=`echo $$p | sed -e "s/^cl-/cl/;"` ;\
-		sed -e "s/%%/$$l/;" debian/preinst.template > debian/$$p.preinst ;\
-		sed -e "s/%%/$$l/;" debian/prerm.template > debian/$$p.prerm ;\
-		sed -e "s/%%/$$l/;" debian/postinst.template > debian/$$p.postinst ;\
-		chown root.root debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
-		chmod +x debian/$$p.prerm debian/$$p.prerm debian/$$p.preinst; \
-	done
-
 
-# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i -p $(pkg) doc/html doc/clsql.pdf
+	dh_installexamples -i -p $(pkg) examples/*
+	dh_installchangelogs -i
+	dh_lisp -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch: install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	dh_installchangelogs -a
+	dh_lisp -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
+binary: binary-indep binary-arch
 
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-#	dh_installexamples 
-	dh_installchangelogs ChangeLog
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install