From 21d0b1a60cd138b710bb1df8c1a9d01ef49ff036 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 28 Apr 2002 06:03:13 +0000 Subject: [PATCH] r1816: debian updates --- debian/control | 2 +- debian/postinst | 3 ++- debian/prerm | 3 ++- debian/rules | 12 +++++++----- doc/Makefile | 4 ++-- src/primitives.cl | 9 +++++---- src/strings.cl | 6 ++++-- uffi.system.debian | 9 +++------ 8 files changed, 26 insertions(+), 22 deletions(-) diff --git a/debian/control b/debian/control index 7822ce9..2f84810 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cl-uffi Section: devel Priority: optional Maintainer: Kevin Rosenberg -Build-Depends: debhelper (>> 3.0.0) +Build-Depends-Indep: debhelper (>> 3.0.0) Standards-Version: 3.5.2 Package: cl-uffi diff --git a/debian/postinst b/debian/postinst index eceeca2..b3dd8b6 100644 --- a/debian/postinst +++ b/debian/postinst @@ -6,7 +6,7 @@ set -e # package name according to lisp -LISP_PKG=%% +LISP_PKG=uffi # summary of how this script can be called: # * `configure' @@ -28,6 +28,7 @@ LISP_PKG=%% case "$1" in configure) + ln -sf ../repositories/uffi /usr/share/common-lisp/source/uffi /usr/sbin/register-common-lisp-source ${LISP_PKG} ;; diff --git a/debian/prerm b/debian/prerm index ef7d09f..86f8f66 100644 --- a/debian/prerm +++ b/debian/prerm @@ -6,7 +6,7 @@ set -e # package name according to lisp -LISP_PKG=%% +LISP_PKG=uffi # summary of how this script can be called: # * `remove' @@ -23,6 +23,7 @@ LISP_PKG=%% case "$1" in remove|upgrade|deconfigure) /usr/sbin/unregister-common-lisp-source ${LISP_PKG} + rm -rf /usr/share/common-lisp/source/uffi /usr/share/common-lisp/repositories/uffi ;; failed-upgrade) ;; diff --git a/debian/rules b/debian/rules index 8a02b41..84910cc 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,8 @@ INSTALL := install INSTALLFLAGS := -g root -o root -m 0644 INSTALLDIRFLAGS := -d -g root -o root -m 0755 -SOURCESDEST := $(prefix)/usr/share/common-lisp/repositories/uffi +SOURCEDIR := $(prefix)/usr/share/common-lisp/source +REPOSITORYDIR := $(prefix)/usr/share/common-lisp/repositories/uffi SYSDIR := $(prefix)/usr/share/common-lisp/systems DOCDIR := $(prefix)/usr/share/doc/cl-uffi @@ -56,11 +57,11 @@ install: build dh_installdirs # Add here commands to install the package into debian/uffi. - $(INSTALL) $(INSTALLDIRFLAGS) $(SOURCESDEST) $(SOURCESDEST)/mcl $(SYSDIR) $(DOCDIR) $(DOCDIR)/html + $(INSTALL) $(INSTALLDIRFLAGS) $(REPOSITORYDIR) $(REPOSITORYDIR)/mcl $(SYSDIR) $(DOCDIR) $(DOCDIR)/html $(SOURCEDIR) $(INSTALL) $(INSTALLFLAGS) uffi.system.debian $(SYSDIR) mv $(SYSDIR)/uffi.system.debian $(SYSDIR)/uffi.system - $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl) $(SOURCESDEST) - $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(SOURCESDEST)/mcl + $(INSTALL) $(INSTALLFLAGS) $(shell echo src/*.cl) $(REPOSITORYDIR) + $(INSTALL) $(INSTALLFLAGS) $(shell echo src/mcl/*.cl) $(REPOSITORYDIR)/mcl $(INSTALL) $(INSTALLFLAGS) doc/html/* $(DOCDIR)/html cp doc/uffi.ps doc/cl-uffi.ps rm -f doc/cl-uffi.ps.gz @@ -70,7 +71,8 @@ install: build # Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. + + # Build architecture-dependent files here. binary-arch: build install diff --git a/doc/Makefile b/doc/Makefile index 8f18094..6b377eb 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -5,7 +5,7 @@ # Programer: Kevin M. Rosenberg # Date Started: Mar 2002 # -# CVS Id: $Id: Makefile,v 1.17 2002/04/28 04:08:22 kevin Exp $ +# CVS Id: $Id: Makefile,v 1.18 2002/04/28 06:03:13 kevin Exp $ # # This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg # @@ -103,11 +103,11 @@ ${PSFILE}: ${DVIFILE} clean: @rm -rf html @rm -f *~ *.bak *.orig "#*" - @rm -f ${PSFILE} ${PDFFILE} ${DVIFILE} ${TEXFILE} @rm -f ${TMPFILES} .PHONY: distclean distclean: clean + @rm -f ${PSFILE} ${PDFFILE} ${DVIFILE} ${TEXFILE} diff --git a/src/primitives.cl b/src/primitives.cl index c61f6dd..009c1fc 100644 --- a/src/primitives.cl +++ b/src/primitives.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.cl,v 1.16 2002/04/06 19:53:08 kevin Exp $ +;;;; $Id: primitives.cl,v 1.17 2002/04/28 06:03:13 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -68,9 +68,10 @@ supports takes advantage of this optimization." ) "Conversions in CMUCL or def-foreign-type are different thatn in def-function") +(defparameter +type-conversion-list+ nil) #+cmu -(defconstant +type-conversion-list+ +(setq +type-conversion-list+ '((* . *) (:void . c-call:void) (:short . c-call:short) (:pointer-void . (* t)) @@ -85,7 +86,7 @@ supports takes advantage of this optimization." (:float . c-call:float) (:double . c-call:double) (:array . alien:array))) #+allegro -(defconstant +type-conversion-list+ +(setq +type-conversion-list+ '((* . *) (:void . :void) (:short . :short) (:pointer-void . (* :void)) @@ -98,7 +99,7 @@ supports takes advantage of this optimization." (:float . :float) (:double . :double) (:array . :array))) #+lispworks -(defconstant +type-conversion-list+ +(setq +type-conversion-list+ '((* . :pointer) (:void . :void) (:short . :short) (:pointer-void . (:pointer :void)) diff --git a/src/strings.cl b/src/strings.cl index 8bd95bd..06ffa52 100644 --- a/src/strings.cl +++ b/src/strings.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: strings.cl,v 1.17 2002/04/06 19:53:08 kevin Exp $ +;;;; $Id: strings.cl,v 1.18 2002/04/28 06:03:13 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -23,7 +23,9 @@ (def-constant +null-cstring-pointer+ #+cmu nil #+allegro 0 - #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char))) + #+lispworks (fli:make-pointer :address 0 :type '(:unsigned :char)) + #-(or cmu allegro lispworks) nil +) (defmacro convert-from-cstring (obj) "Converts a string from a c-call. Same as convert-from-foreign-string, except diff --git a/uffi.system.debian b/uffi.system.debian index 42ba566..16f7d8c 100644 --- a/uffi.system.debian +++ b/uffi.system.debian @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: uffi.system.debian,v 1.1 2002/04/28 03:52:01 kevin Exp $ +;;;; $Id: uffi.system.debian,v 1.2 2002/04/28 06:03:13 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -20,14 +20,11 @@ (in-package :mk) - ;;; UFFI system definition (mk:defsystem :uffi - :source-pathname - #+(or cmu allegro lispworks) "cl-library:" - #+mcl "cl-library:mcl;" - #-(or cmu allegro lispworks) nil + :source-pathname #-mcl "cl-library:uffi;" + #+mcl "cl-library:uffi;mcl;" :source-extension "cl" :components ((:file "package") -- 2.34.1