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

diff --git a/debian/rules b/debian/rules
index cd4bc4d..46cdd63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,52 +12,50 @@ 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-mysql) $(pkg-pg) $(pkg-pg-socket) $(pkg-aodbc)
+all-pkgs	:= $(pkg) $(pkg-base) $(pkg-uffi) $(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-aodbc	:= debian/$(pkg-aodbc)
 
-UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog |head -1)
+UPSTREAM_VER	:= $(shell sed -n -e "s/${pkg} (\(.*\)-[0-9A-Za-z\.]).*/\1/p" < debian/changelog |head -1)
 
 ## Lisp sources
-srcs		:= $(wildcard sql/*.cl)
-srcs-base	:= $(wildcard base/*.cl)
-srcs-base-uffi	:= $(wildcard interfaces/clsql-uffi/*.cl) 
-srcs-base-uffi-so:= $(wildcard interfaces/clsql-uffi/*.so)
-srcs-mysql	:= $(wildcard interfaces/mysql/*.cl)
-srcs-mysql-so	:=  $(wildcard interfaces/mysql/*.so)
-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
-INSTALLEXECFLAGS	:= -g root -o root -m 0755
-INSTALLDIRFLAGS	:= -d -g root -o root -m 0755
+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)
 
 clc-base	:= usr/share/common-lisp
 clc-source	:= $(clc-base)/source
 clc-systems	:= $(clc-base)/systems
-doc-dir		:= $(prefix)/usr/share/doc/cl-sql
-
-clc-clsql	:= $(clc-source)/$(plain-pkg)-$(UPSTREAM_VER)
-
-lispdir		:= $(prefix)/$(clc-clsql)
-lispdir-sql	:= $(prefix)/$(clc-clsql)/sql
-lispdir-base	:= $(prefix-base)/$(clc-clsql)/base
-lispdir-base-uffi := $(prefix-base)/$(clc-clsql)/interfaces/clsql-uffi
-lispdir-mysql	:= $(prefix-mysql)/$(clc-clsql)/interfaces/mysql
-lispdir-pg	:= $(prefix-pg)/$(clc-clsql)/interfaces/postgresql
-lispdir-pg-socket := $(prefix-pg-socket)/$(clc-clsql)/interfaces/postgresql-socket
-lispdir-aodbc	:= $(prefix-aodbc)/$(clc-clsql)/interfaces/aodbc
+doc-dir		:= usr/share/doc/cl-sql-base
+
+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
+lispdir-uffi 	:= $(clc-uffi)/uffi
+sodir-uffi 	:= usr/lib/clsql
+clc-mysql	:= $(clc-source)/clsql-mysql
+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
+lispdir-pg-socket := $(clc-pg-socket)/db-postgresql-socket
+clc-aodbc	:= $(clc-source)/clsql-aodbc
+lispdir-aodbc	:= $(clc-aodbc)/db-aodbc
 
 
 configure: configure-stamp
@@ -88,54 +86,71 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs --all  $(clc-systems) $(clc-source)
-
-	$(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-base) \
-		$(lispdir-base-uffi) $(lispdir-pg) $(lispdir-pg-socket) \
-		$(lispdir-mysql) $(lispdir-sql) $(lispdir-aodbc)
+	dh_installdirs -p $(pkg) $(lispdir-sql)
+	dh_installdirs -p $(pkg-base) $(lispdir-base)
+	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)
 
 	# Main package
-	$(INSTALL) $(INSTALLDIRFLAGS) $(lispdir) $(lispdir-int)
-	$(INSTALL) $(INSTALLFLAGS) $(srcs) $(lispdir-sql)
+	dh_install -p $(pkg) $(srcs) $(lispdir-sql)
+	dh_install -p $(pkg) clsql.asd $(clc-clsql)
 
 	# Base
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-base) $(lispdir-base)
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-base-uffi) $(lispdir-base-uffi)
-	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-base-uffi-so) $(lispdir-base-uffi)
-
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-mysql) $(lispdir-mysql)
-	$(INSTALL) $(INSTALLEXECFLAGS) $(srcs-mysql-so) $(lispdir-mysql)
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg) $(lispdir-pg)
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-pg-socket) $(lispdir-pg-socket)
-	$(INSTALL) $(INSTALLFLAGS) $(srcs-aodbc) $(lispdir-aodbc)
+	dh_install -p $(pkg-base) $(srcs-base) $(lispdir-base)
+	dh_install -p $(pkg-base) clsql-base.asd $(clc-base)
+
+	# UFFI
+	dh_install -p $(pkg-uffi) $(srcs-uffi) $(lispdir-uffi)
+	dh_install -p $(pkg-uffi) $(srcs-uffi-so) $(sodir-uffi)
+	dh_install -p $(pkg-uffi) clsql-uffi.asd $(clc-uffi)
+
+	# Backends
+	dh_install -p $(pkg-mysql) $(srcs-mysql) $(lispdir-mysql)
+	dh_install -p $(pkg-mysql) clsql-mysql.asd $(clc-mysql)
+	dh_install -p $(pkg-mysql) $(srcs-mysql-so) $(sodir-mysql)
+	dh_install -p $(pkg-pg) $(srcs-pg) $(lispdir-pg)
+	dh_install -p $(pkg-pg) clsql-postgresql.asd $(clc-pg)
+	dh_install -p $(pkg-pg-socket) $(srcs-pg-socket) $(lispdir-pg-socket)
+	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
-	$(INSTALL) $(INSTALLFLAGS) clsql.system $(prefix)/$(clc-systems)
-	$(INSTALL) $(INSTALLFLAGS) clsql-base.system clsql-uffi.system $(prefix-base)/$(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)
+	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
-	$(INSTALL) $(INSTALLDIRFLAGS) $(doc-dir)/html $(doc-dir)/test-suite
- 
-	$(INSTALL) $(INSTALLFLAGS) test-suite/tester-clsql.cl test-suite/acl-compat-tester.cl $(doc-dir)/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
 
 	# Documentation
-	$(INSTALL) $(INSTALLFLAGS) doc/html/* $(doc-dir)/html
+	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
-	$(INSTALL) $(INSTALLFLAGS) doc/cl-sql.pdf.gz $(doc-dir)
+	dh_install -p $(pkg) doc/cl-sql.pdf.gz $(doc-dir)
 	rm -f doc/cl-sql.pdf.gz
 
-#	From UncommonSQL Debian package: build prerm postinst from templates
 	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
 
 
@@ -152,12 +167,6 @@ binary-arch: build install
 	dh_installdocs
 #	dh_installexamples 
 	dh_installchangelogs ChangeLog
-	dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql
-	dh_link -p $(pkg-base) $(clc-clsql) $(clc-source)/clsql-base
-	dh_link -p $(pkg-mysql) $(clc-clsql) $(clc-source)/clsql-mysql
-	dh_link -p $(pkg-pg) $(clc-clsql) $(clc-source)/clsql-postgresql
-	dh_link -p $(pkg-pg-socket) $(clc-clsql) $(clc-source)/clsql-postgresql-socket
-	dh_link -p $(pkg-aodbc) $(clc-clsql) $(clc-source)/clsql-aodbc
 	dh_strip
 	dh_compress
 	dh_fixperms