From: Kevin M. Rosenberg Date: Thu, 26 Jun 2003 18:02:08 +0000 (+0000) Subject: r5209: Auto commit for Debian build X-Git-Tag: v1.6.1~203 X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=cf57d11caa2750f8a1777865f235089ac2a11cfb;p=uffi.git r5209: Auto commit for Debian build --- diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index 9d172f2..0000000 --- a/COPYRIGHT +++ /dev/null @@ -1,13 +0,0 @@ -UFFI is written and Copyright (c) 2002 by Kevin M. Rosenberg. - -UFFI is licensed under the terms of the Lisp Lesser GNU -Public License (http://opensource.franz.com/preamble.html), known as -the LLGPL. The LLGPL consists of a preamble (see above URL) and the -LGPL. Where these conflict, the preamble takes precedence. -UFFI is referenced in the preamble as the "LIBRARY." - -UFFI is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3eb1b80 --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 2001-2003 Kevin M. Rosenberg and contributors. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author nor the names of the contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. diff --git a/debian/changelog b/debian/changelog index 285e228..3144efd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-uffi (1.2.18-1) unstable; urgency=low + + * New BSD license + + -- Kevin M. Rosenberg Thu, 26 Jun 2003 12:01:24 -0600 + cl-uffi (1.2.17-1) unstable; urgency=low * New upstream diff --git a/debian/copyright b/debian/copyright index 9aebf9a..d112662 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,88 +1,34 @@ Debian Copyright Section ======================== -Upstream Source URL: ftp://uffi.med-info.com -Upstream Author: Kevin M. Rosenberg -Debian Maintainer: (Same as upstream) - - -Upstream Copyright Statement -============================ -UFFI is written and Copyright (c) 2002 by Kevin M. Rosenberg. - -UFFI is licensed under the terms of the Lisp Lesser GNU Public -License, known as the LLGPL. The LLGPL consists of a preamble (see -below) and the Lessor GNU Public License 2.1 (LGPL-2.1). Where these -conflict, the preamble takes precedence. UFFI is referenced in the -preamble as the "LIBRARY." The LGPL-2.1 is stored on a Debian system -in the file /usr/share/common-licenses/LGPL-2.1. - -UFFI is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. - - - -Preamble to the Gnu Lesser General Public License -------------------------------------------------- -Copyright (c) 2000 Franz Incorporated, Berkeley, CA 94704 - -The concept of the GNU Lesser General Public License version 2.1 -("LGPL") has been adopted to govern the use and distribution of -above-mentioned application. However, the LGPL uses terminology that -is more appropriate for a program written in C than one written in -Lisp. Nevertheless, the LGPL can still be applied to a Lisp program if -certain clarifications are made. This document details those -clarifications. Accordingly, the license for the open-source Lisp -applications consists of this document plus the LGPL. Wherever there -is a conflict between this document and the LGPL, this document takes -precedence over the LGPL. - -A "Library" in Lisp is a collection of Lisp functions, data and -foreign modules. The form of the Library can be Lisp source code (for -processing by an interpreter) or object code (usually the result of -compilation of source code or built with some other -mechanisms). Foreign modules are object code in a form that can be -linked into a Lisp executable. When we speak of functions we do so in -the most general way to include, in addition, methods and unnamed -functions. Lisp "data" is also a general term that includes the data -structures resulting from defining Lisp classes. A Lisp application -may include the same set of Lisp objects as does a Library, but this -does not mean that the application is necessarily a "work based on the -Library" it contains. - -The Library consists of everything in the distribution file set before -any modifications are made to the files. If any of the functions or -classes in the Library are redefined in other files, then those -redefinitions ARE considered a work based on the Library. If -additional methods are added to generic functions in the Library, -those additional methods are NOT considered a work based on the -Library. If Library classes are subclassed, these subclasses are NOT -considered a work based on the Library. If the Library is modified to -explicitly call other functions that are neither part of Lisp itself -nor an available add-on module to Lisp, then the functions called by -the modified Library ARE considered a work based on the Library. The -goal is to ensure that the Library will compile and run without -getting undefined function errors. - -It is permitted to add proprietary source code to the Library, but it -must be done in a way such that the Library will still run without -that proprietary code present. Section 5 of the LGPL distinguishes -between the case of a library being dynamically linked at runtime and -one being statically linked at build time. Section 5 of the LGPL -states that the former results in an executable that is a "work that -uses the Library." Section 5 of the LGPL states that the latter -results in one that is a "derivative of the Library", which is -therefore covered by the LGPL. Since Lisp only offers one choice, -which is to link the Library into an executable at build time, we -declare that, for the purpose applying the LGPL to the Library, an -executable that results from linking a "work that uses the Library" -with the Library is considered a "work that uses the Library" and is -therefore NOT covered by the LGPL. - -Because of this declaration, section 6 of LGPL is not applicable to -the Library. However, in connection with each distribution of this -executable, you must also deliver, in accordance with the terms and -conditions of the LGPL, the source code of Library (or your derivative -thereof) that is incorporated into this executable. - +Upstream Source URL: ftp://uffi.b9.com +Upstream Author: Kevin Rosenberg +Debian Maintainer: Kevin M. Rosenberg + + +Copyright (c) 2001-2003 Kevin M. Rosenberg and contributors. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the author nor the names of the contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. diff --git a/src/libraries.lisp b/src/libraries.lisp index 1344d9d..65f9f57 100644 --- a/src/libraries.lisp +++ b/src/libraries.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.lisp,v 1.7 2003/06/06 21:59:18 kevin Exp $ +;;;; $Id: libraries.lisp,v 1.8 2003/06/26 18:02:08 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -85,12 +85,12 @@ library type if type is not specified." (progn #+cmu (let ((type (pathname-type (parse-namestring filename)))) - (if (equal type "so") + (if (string-equal type "so") (sys::load-object-file filename) - (alien:load-foreign filename - :libraries - (convert-supporting-libraries-to-string - supporting-libraries)))) + (alien:load-foreign filename + :libraries + (convert-supporting-libraries-to-string + supporting-libraries)))) #+scl (let ((type (pathname-type (parse-namestring filename)))) (alien:load-foreign filename @@ -98,10 +98,12 @@ library type if type is not specified." (convert-supporting-libraries-to-string supporting-libraries))) #+sbcl - (sb-alien:load-foreign filename - :libraries - (convert-supporting-libraries-to-string - supporting-libraries)) + (if (string-equal type "so") + (sb-alien::load-1-foreign filename) + (sb-alien:load-foreign filename + :libraries + (convert-supporting-libraries-to-string + supporting-libraries))) #+lispworks (fli:register-module module :real-name filename) #+allegro (load filename) #+openmcl (ccl:open-shared-library filename) diff --git a/src/objects.lisp b/src/objects.lisp index cb6cd7f..2efacf1 100644 --- a/src/objects.lisp +++ b/src/objects.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.lisp,v 1.13 2003/06/06 21:59:18 kevin Exp $ +;;;; $Id: objects.lisp,v 1.14 2003/06/26 18:02:08 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -118,11 +118,11 @@ an array of TYPE with size SIZE. The TYPE parameter is evaluated." #+mcl (defsetf deref-pointer deref-pointer-set) -#+(or (and mcl (not openmcl))) ;; with LW, deref is a character +#+(or lispworks (and mcl (not openmcl))) ;; with LW, deref is a character (defmacro ensure-char-character (obj) obj) -#+(or allegro lispworks cmu sbcl scl openmcl) +#+(or allegro cmu sbcl scl openmcl) (defmacro ensure-char-character (obj) `(code-char ,obj)) diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp index 9351fb7..eea4794 100644 --- a/tests/foreign-loader.lisp +++ b/tests/foreign-loader.lisp @@ -7,7 +7,7 @@ ;;;; Author: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: foreign-loader.lisp,v 1.2 2003/05/05 14:56:46 kevin Exp $ +;;;; $Id: foreign-loader.lisp,v 1.3 2003/06/26 18:02:08 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -37,8 +37,9 @@ (unless (uffi:load-foreign-library (uffi:find-foreign-library "uffi-c-test-lib" - (list *load-truename* - "/usr/lib/uffi/")) + (list + (pathname-directory *load-truename*) + "/usr/lib/uffi/")) :supporting-libraries '("c")) (warn "Unable to load uffi-c-test-lib library"))