From e59d8c7edc1d6b3d3e1f8351c8d9a58bff19030a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 23 Aug 2002 19:23:19 +0000 Subject: [PATCH] r2386: *** empty log message *** --- set-cl-library.cl | 43 ---------------------------- uffi.asd | 26 ++++++++++++----- uffi.system | 44 +++++++++++------------------ {src => uffi}/.cvsignore | 0 {src => uffi}/Makefile | 0 {src => uffi}/aggregates.cl | 2 +- {src => uffi}/corman/corman-uffi.cl | 2 +- {src => uffi}/functions.cl | 2 +- {src => uffi}/libraries.cl | 2 +- {src => uffi}/mcl/Makefile | 0 {src => uffi}/mcl/aggregates.cl | 2 +- {src => uffi}/mcl/functions.cl | 2 +- {src => uffi}/mcl/libraries.cl | 2 +- {src => uffi}/mcl/objects.cl | 2 +- {src => uffi}/mcl/package.cl | 0 {src => uffi}/mcl/primitives.cl | 2 +- {src => uffi}/mcl/strings.cl | 2 +- {src => uffi}/objects.cl | 2 +- {src => uffi}/package.cl | 0 {src => uffi}/primitives.cl | 2 +- {src => uffi}/strings.cl | 2 +- 21 files changed, 49 insertions(+), 90 deletions(-) delete mode 100644 set-cl-library.cl rename {src => uffi}/.cvsignore (100%) rename {src => uffi}/Makefile (100%) rename {src => uffi}/aggregates.cl (98%) rename {src => uffi}/corman/corman-uffi.cl (99%) rename {src => uffi}/functions.cl (97%) rename {src => uffi}/libraries.cl (98%) rename {src => uffi}/mcl/Makefile (100%) rename {src => uffi}/mcl/aggregates.cl (98%) rename {src => uffi}/mcl/functions.cl (97%) rename {src => uffi}/mcl/libraries.cl (96%) rename {src => uffi}/mcl/objects.cl (98%) rename {src => uffi}/mcl/package.cl (100%) rename {src => uffi}/mcl/primitives.cl (97%) rename {src => uffi}/mcl/strings.cl (98%) rename {src => uffi}/objects.cl (98%) rename {src => uffi}/package.cl (100%) rename {src => uffi}/primitives.cl (99%) rename {src => uffi}/strings.cl (98%) diff --git a/set-cl-library.cl b/set-cl-library.cl deleted file mode 100644 index 228080c..0000000 --- a/set-cl-library.cl +++ /dev/null @@ -1,43 +0,0 @@ -;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- -;;;; ************************************************************************* -;;;; FILE IDENTIFICATION -;;;; -;;;; Name: set-cl-library.cl -;;;; Purpose: Sets CL-LIBRARY logical host name if it does not exist -;;;; Programmer: Kevin M. Rosenberg -;;;; Date Started: May 2002 -;;;; -;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg -;;;; -;;;; CLSQL users are granted the rights to distribute and use this software -;;;; as governed by the terms of the Lisp Lesser GNU Public License -;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. -;;;; ************************************************************************* - -;; Set logical pathname CL-LIBRARY to be directory above *load-truename* -;; This mirrors the expectation of Common Lisp Controller's pathnames - -(handler-case - (logical-pathname-translations "cl-library") - (error () - (let* ((dir (pathname-directory *load-truename*)) - (parent-dir (subseq dir 0 (1- (length dir))))) - (load (make-pathname :name "set-logical" :type "cl" - :defaults *load-truename*)) - (set-logical-host-for-pathname - "cl-library" - (make-pathname :host (pathname-host *load-truename*) - :device (pathname-device *load-truename*) - :directory parent-dir)))) - (:no-error (translation) - ;; Make sure that cl-library points to this installation - (let* ((dir (pathname-directory *load-truename*)) - (base-dir (car (last dir))) - (logical-dir (translate-logical-pathname - (concatenate 'string - "cl-library:" base-dir ";")))) - (unless (equalp dir (pathname-directory logical-dir)) - (let ((*print-circle* nil)) - (error "cl-library:~A; directory ~S does not equal *load-truename*'s directory ~S" - base-dir (cdr dir) - (cdr (pathname-directory logical-dir)))))))) diff --git a/uffi.asd b/uffi.asd index fd51b51..1fc30bc 100644 --- a/uffi.asd +++ b/uffi.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: uffi.asd,v 1.3 2002/08/18 02:26:01 kevin Exp $ +;;;; $Id: uffi.asd,v 1.4 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -19,11 +19,22 @@ (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :cl-user) -;; For use with non-Debian installations -(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl" +;; For use with non-Common Lisp Controller installations +#-common-lisp-controller +(let ((path (make-pathname :name "set-logical" :type "cl" :defaults *load-truename*))) - (when (probe-file helper-pathname) - (load helper-pathname))) + (when (probe-file path) + (load path) + (set-logical-host-for-pathname + "uffi" + (make-pathname :host (pathname-host *load-truename*) + :device (pathname-device *load-truename*) + :directory (pathname-directory *load-truename*))))) + +(defconstant +clsql-logical-host+ + #+common-lisp-controller "cl-library" + #-common-lisp-controller "clsql" + "Logical hostname for loading system") (in-package :asdf) @@ -41,8 +52,9 @@ :long-description "UFFI provides a universal foreign function interface (FFI) for Common Lisp. UFFI supports CMUCL, Lispworks, and AllegroCL." :default-component-class uffi-cl-source-file - :pathname #-mcl "cl-library:uffi;" - #+mcl "cl-library:uffi;mcl;" + :pathname + #-mcl #.(format nil "~A:uffi;" cl-user:+clsql-logical-host+) + #+mcl #.(format nil "~A:uffi;mcl;" cl-user:+clsql-logical-host+) :perform (load-op :after (op uffi) (pushnew :uffi cl:*features*)) :components diff --git a/uffi.system b/uffi.system index 12483e0..38c7fd1 100644 --- a/uffi.system +++ b/uffi.system @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: uffi.system,v 1.16 2002/08/23 15:29:06 kevin Exp $ +;;;; $Id: uffi.system,v 1.17 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -19,36 +19,27 @@ (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :make) -;;; UFFI system definition (for Common Lisp Controller systems) - -#+common-lisp-controller -(make:defsystem :uffi - :source-pathname #-mcl "cl-library:uffi;" - #+mcl "cl-library:uffi;mcl;" - :source-extension "cl" - :components - ((:file "package") - (:file "primitives" :depends-on ("package")) - (:file "strings" :depends-on ("primitives")) - (:file "objects" :depends-on ("primitives")) - (:file "aggregates" :depends-on ("primitives")) - (:file "functions" :depends-on ("primitives")) - (:file "libraries" :depends-on ("package"))) - :finally-do - (pushnew :uffi cl:*features*)) - ;; For use with non-Common Lisp Controller installations - #-common-lisp-controller -(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl" +(let ((path (make-pathname :name "set-logical" :type "cl" :defaults *load-truename*))) - (when (probe-file helper-pathname) - (load helper-pathname))) + (when (probe-file path) + (load path) + (set-logical-host-for-pathname + "uffi" + (make-pathname :host (pathname-host *load-truename*) + :device (pathname-device *load-truename*) + :directory (pathname-directory *load-truename*))))) + +(defconstant +clsql-logical-host+ + #+common-lisp-controller "cl-library" + #-common-lisp-controller "clsql" + "Logical hostname for loading system") -#-common-lisp-controller (make:defsystem :uffi - :source-pathname #-mcl "cl-library:uffi;src;" - #+mcl "cl-library:uffi;src;mcl;" + :source-pathname + #-mcl #.(format nil "~A:uffi;" cl-user:+clsql-logical-host+) + #+mcl #.(format nil "~A:uffi;mcl;" cl-user:+clsql-logical-host+) :source-extension "cl" :components ((:file "package") @@ -60,4 +51,3 @@ (:file "libraries" :depends-on ("package"))) :finally-do (pushnew :uffi cl:*features*)) - diff --git a/src/.cvsignore b/uffi/.cvsignore similarity index 100% rename from src/.cvsignore rename to uffi/.cvsignore diff --git a/src/Makefile b/uffi/Makefile similarity index 100% rename from src/Makefile rename to uffi/Makefile diff --git a/src/aggregates.cl b/uffi/aggregates.cl similarity index 98% rename from src/aggregates.cl rename to uffi/aggregates.cl index 84de957..341e2e3 100644 --- a/src/aggregates.cl +++ b/uffi/aggregates.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aggregates.cl,v 1.12 2002/08/23 15:28:52 kevin Exp $ +;;;; $Id: aggregates.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/src/corman/corman-uffi.cl b/uffi/corman/corman-uffi.cl similarity index 99% rename from src/corman/corman-uffi.cl rename to uffi/corman/corman-uffi.cl index b5101a2..ba0fd53 100644 --- a/src/corman/corman-uffi.cl +++ b/uffi/corman/corman-uffi.cl @@ -35,7 +35,7 @@ Content-Transfer-Encoding: 7bit +;;;; Programmer: "Joe Marshall" +;;;; Date Started: Feb 2002 +;;;; -+;;;; $Id: corman-uffi.cl,v 1.3 2002/08/23 15:28:20 kevin Exp $ ++;;;; $Id: corman-uffi.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; +;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; diff --git a/src/functions.cl b/uffi/functions.cl similarity index 97% rename from src/functions.cl rename to uffi/functions.cl index 70e1881..9a4704b 100644 --- a/src/functions.cl +++ b/uffi/functions.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: functions.cl,v 1.8 2002/08/23 15:28:52 kevin Exp $ +;;;; $Id: functions.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/src/libraries.cl b/uffi/libraries.cl similarity index 98% rename from src/libraries.cl rename to uffi/libraries.cl index 33cfa76..6fbec02 100644 --- a/src/libraries.cl +++ b/uffi/libraries.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.cl,v 1.16 2002/08/23 15:28:52 kevin Exp $ +;;;; $Id: libraries.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/src/mcl/Makefile b/uffi/mcl/Makefile similarity index 100% rename from src/mcl/Makefile rename to uffi/mcl/Makefile diff --git a/src/mcl/aggregates.cl b/uffi/mcl/aggregates.cl similarity index 98% rename from src/mcl/aggregates.cl rename to uffi/mcl/aggregates.cl index 7973d10..1318769 100644 --- a/src/mcl/aggregates.cl +++ b/uffi/mcl/aggregates.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aggregates.cl,v 1.6 2002/08/23 15:28:11 kevin Exp $ +;;;; $Id: aggregates.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/src/mcl/functions.cl b/uffi/mcl/functions.cl similarity index 97% rename from src/mcl/functions.cl rename to uffi/mcl/functions.cl index 7712caa..2968d74 100644 --- a/src/mcl/functions.cl +++ b/uffi/mcl/functions.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: functions.cl,v 1.5 2002/08/23 15:28:11 kevin Exp $ +;;;; $Id: functions.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/src/mcl/libraries.cl b/uffi/mcl/libraries.cl similarity index 96% rename from src/mcl/libraries.cl rename to uffi/mcl/libraries.cl index ba0107f..0f1e5b5 100644 --- a/src/mcl/libraries.cl +++ b/uffi/mcl/libraries.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.cl,v 1.7 2002/08/23 15:28:11 kevin Exp $ +;;;; $Id: libraries.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/src/mcl/objects.cl b/uffi/mcl/objects.cl similarity index 98% rename from src/mcl/objects.cl rename to uffi/mcl/objects.cl index db4d536..7f5fd9f 100644 --- a/src/mcl/objects.cl +++ b/uffi/mcl/objects.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.cl,v 1.6 2002/08/23 15:28:11 kevin Exp $ +;;;; $Id: objects.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/src/mcl/package.cl b/uffi/mcl/package.cl similarity index 100% rename from src/mcl/package.cl rename to uffi/mcl/package.cl diff --git a/src/mcl/primitives.cl b/uffi/mcl/primitives.cl similarity index 97% rename from src/mcl/primitives.cl rename to uffi/mcl/primitives.cl index 4dac954..58b44b8 100644 --- a/src/mcl/primitives.cl +++ b/uffi/mcl/primitives.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.cl,v 1.6 2002/08/23 15:28:11 kevin Exp $ +;;;; $Id: primitives.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/src/mcl/strings.cl b/uffi/mcl/strings.cl similarity index 98% rename from src/mcl/strings.cl rename to uffi/mcl/strings.cl index ed311a2..7e1cbaa 100644 --- a/src/mcl/strings.cl +++ b/uffi/mcl/strings.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: strings.cl,v 1.5 2002/08/23 15:28:11 kevin Exp $ +;;;; $Id: strings.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/src/objects.cl b/uffi/objects.cl similarity index 98% rename from src/objects.cl rename to uffi/objects.cl index 7cd3cb1..292caef 100644 --- a/src/objects.cl +++ b/uffi/objects.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.cl,v 1.22 2002/08/23 15:28:52 kevin Exp $ +;;;; $Id: objects.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/src/package.cl b/uffi/package.cl similarity index 100% rename from src/package.cl rename to uffi/package.cl diff --git a/src/primitives.cl b/uffi/primitives.cl similarity index 99% rename from src/primitives.cl rename to uffi/primitives.cl index c107664..3af895c 100644 --- a/src/primitives.cl +++ b/uffi/primitives.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.cl,v 1.22 2002/08/23 15:28:52 kevin Exp $ +;;;; $Id: primitives.cl,v 1.4 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/src/strings.cl b/uffi/strings.cl similarity index 98% rename from src/strings.cl rename to uffi/strings.cl index 39c8572..e2a6f5d 100644 --- a/src/strings.cl +++ b/uffi/strings.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: strings.cl,v 1.20 2002/08/23 15:28:52 kevin Exp $ +;;;; $Id: strings.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; -- 2.34.1