From 0eaed82d93e9d2afbdcbdb8b49b0fc2386f86963 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 16 Sep 2002 17:58:45 +0000 Subject: [PATCH] r2732: *** empty log message *** --- ChangeLog | 4 + debian/rules | 9 ++- set-logical.cl | 90 ---------------------- {uffi/corman => src-corman}/corman-uffi.cl | 2 +- {uffi => src-main}/.cvsignore | 0 {uffi => src-main}/Makefile | 2 +- {uffi => src-main}/aggregates.cl | 2 +- {uffi => src-main}/functions.cl | 2 +- {uffi => src-main}/libraries.cl | 2 +- {uffi => src-main}/objects.cl | 2 +- {uffi => src-main}/package.cl | 0 {uffi => src-main}/primitives.cl | 2 +- {uffi => src-main}/strings.cl | 2 +- {uffi/mcl => src-mcl}/Makefile | 2 +- {uffi/mcl => src-mcl}/aggregates.cl | 2 +- {uffi/mcl => src-mcl}/functions.cl | 2 +- {uffi/mcl => src-mcl}/libraries.cl | 2 +- {uffi/mcl => src-mcl}/objects.cl | 2 +- {uffi/mcl => src-mcl}/package.cl | 0 {uffi/mcl => src-mcl}/primitives.cl | 2 +- {uffi/mcl => src-mcl}/strings.cl | 2 +- uffi.asd | 64 ++++++++------- uffi.system | 53 ------------- 23 files changed, 55 insertions(+), 195 deletions(-) delete mode 100644 set-logical.cl rename {uffi/corman => src-corman}/corman-uffi.cl (99%) rename {uffi => src-main}/.cvsignore (100%) rename {uffi => src-main}/Makefile (80%) rename {uffi => src-main}/aggregates.cl (98%) rename {uffi => src-main}/functions.cl (97%) rename {uffi => src-main}/libraries.cl (98%) rename {uffi => src-main}/objects.cl (98%) rename {uffi => src-main}/package.cl (100%) rename {uffi => src-main}/primitives.cl (99%) rename {uffi => src-main}/strings.cl (98%) rename {uffi/mcl => src-mcl}/Makefile (62%) rename {uffi/mcl => src-mcl}/aggregates.cl (98%) rename {uffi/mcl => src-mcl}/functions.cl (97%) rename {uffi/mcl => src-mcl}/libraries.cl (96%) rename {uffi/mcl => src-mcl}/objects.cl (98%) rename {uffi/mcl => src-mcl}/package.cl (100%) rename {uffi/mcl => src-mcl}/primitives.cl (97%) rename {uffi/mcl => src-mcl}/strings.cl (98%) delete mode 100644 uffi.system diff --git a/ChangeLog b/ChangeLog index 0fa5816..8ca4aa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-09-16 Kevin Rosenberg (kevin@rosenberg.net) + - Restructure directories to move to a asdf definition file + without pathnames. + 2002-08-25 Kevin Rosenberg (kevin@rosenberg.net) - Restructure directories to attempt to properly handle both Common Lisp Controller and non-CLC systems diff --git a/debian/rules b/debian/rules index c391c65..81782d8 100755 --- a/debian/rules +++ b/debian/rules @@ -46,12 +46,13 @@ install: build dh_testroot dh_clean -k dh_installdirs --all $(clc-systems) $(clc-source) - dh_installdirs -p $(debpkg) $(doc-dir) $(clc-uffi)/mcl + dh_installdirs -p $(debpkg) $(doc-dir) $(clc-uffi)/src $(clc-uffi)/src-mcl # Add here commands to install the package into debian/uffi. - dh_install uffi.system uffi.asd $(clc-systems) - dh_install "uffi/*.cl" $(clc-uffi) - dh_install "uffi/mcl/*.cl" $(clc-uffi)/mcl + dh_install uffi.asd $(clc-uffi) + dh_install "src/*.cl" $(clc-uffi)/src + dh_install "src-mcl/*.cl" $(clc-uffi)/src-mcl + dh_link $(clc-uffi)/uffi.asd $(clc-systems)/uffi.asd rm -rf doc/html (cd doc; tar xzf html.tar.gz; cd ..) diff --git a/set-logical.cl b/set-logical.cl deleted file mode 100644 index e14fa1c..0000000 --- a/set-logical.cl +++ /dev/null @@ -1,90 +0,0 @@ -;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*- -;;;; ************************************************************************* -;;;; FILE IDENTIFICATION -;;;; -;;;; Name: set-logical.cl -;;;; Purpose: Sets a logical host for src/binaries based on a pathname. -;;;; Programmer: Kevin M. Rosenberg -;;;; Date Started: Feb 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. -;;;; ************************************************************************* - - -;;; Setup logical pathname translaton with separate binary directories -;;; for each implementation - -;; push allegro case sensitivity on *features* -#+allegro -(eval-when (:compile-toplevel :load-toplevel :execute) - (if (or (eq excl:*current-case-mode* :case-sensitive-lower) - (eq excl:*current-case-mode* :case-sensitive-upper)) - (pushnew :case-sensitive cl:*features*) - (pushnew :case-insensitive cl:*features*))) - -(defconstant +set-logical-compiler-name+ - #+(and allegro ics case-sensitive) "acl-modern" - #+(and allegro (not ics) case-sensitive) "acl-modern8" - #+(and allegro ics (not case-sensitive)) "acl-ansi" - #+(and allegro (not ics) (not case-sensitive)) "acl-ansi8" - #+lispworks "lispworks" - #+clisp "clisp" - #+cmu "cmucl" - #+sbcl "sbcl" - #+corman "corman" - #+mcl "mcl" - #+openmcl "openmcl" - #-(or allegro lispworks clisp cmu sbcl corman mcl openmcl) "unknown") - -(defun set-logical-host-for-pathname (host base-pathname) - (setf (logical-pathname-translations host) - `(("ROOT;" ,(make-pathname - :host (pathname-host base-pathname) - :device (pathname-device base-pathname) - :directory (pathname-directory base-pathname))) - ("**;*.cl.*" ,(merge-pathnames - (make-pathname - :name :wild - :type :wild - :directory '(:relative :wild-inferiors)) - base-pathname)) - ("**;*.lisp.*" ,(merge-pathnames - (make-pathname - :name :wild - :type :wild - :directory '(:relative :wild-inferiors)) - base-pathname)) - ("**;*.c.*" ,(merge-pathnames - (make-pathname - :name :wild - :type :wild - :directory '(:relative :wild-inferiors)) - base-pathname)) - ("**;*.h.*" ,(merge-pathnames - (make-pathname - :name :wild - :type :wild - :directory '(:relative :wild-inferiors)) - base-pathname)) - ("**;bin;*.*.*" ,(merge-pathnames - (make-pathname - :name :wild - :type :wild - :directory - (append '(:relative :wild-inferiors - ".bin" #.+set-logical-compiler-name+))) - base-pathname)) - ;; default is to place in .bin/ directory - ("**;*.*.*" ,(merge-pathnames - (make-pathname - :name :wild - :type :wild - :directory - (append '(:relative :wild-inferiors - ".bin" #.+set-logical-compiler-name+))) - base-pathname))))) - diff --git a/uffi/corman/corman-uffi.cl b/src-corman/corman-uffi.cl similarity index 99% rename from uffi/corman/corman-uffi.cl rename to src-corman/corman-uffi.cl index ba0fd53..5694d60 100644 --- a/uffi/corman/corman-uffi.cl +++ b/src-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 19:21:54 kevin Exp $ ++;;;; $Id: corman-uffi.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ +;;;; +;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg +;;;; diff --git a/uffi/.cvsignore b/src-main/.cvsignore similarity index 100% rename from uffi/.cvsignore rename to src-main/.cvsignore diff --git a/uffi/Makefile b/src-main/Makefile similarity index 80% rename from uffi/Makefile rename to src-main/Makefile index 0dbea7d..31dc910 100644 --- a/uffi/Makefile +++ b/src-main/Makefile @@ -1,4 +1,4 @@ -SUBDIRS := mcl +SUBDIRS := include ../Makefile.common diff --git a/uffi/aggregates.cl b/src-main/aggregates.cl similarity index 98% rename from uffi/aggregates.cl rename to src-main/aggregates.cl index 341e2e3..f2df49c 100644 --- a/uffi/aggregates.cl +++ b/src-main/aggregates.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aggregates.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: aggregates.cl,v 1.1 2002/09/16 17:54:30 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/uffi/functions.cl b/src-main/functions.cl similarity index 97% rename from uffi/functions.cl rename to src-main/functions.cl index 9a4704b..a535876 100644 --- a/uffi/functions.cl +++ b/src-main/functions.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: functions.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: functions.cl,v 1.1 2002/09/16 17:54:30 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/uffi/libraries.cl b/src-main/libraries.cl similarity index 98% rename from uffi/libraries.cl rename to src-main/libraries.cl index 6fbec02..b37549b 100644 --- a/uffi/libraries.cl +++ b/src-main/libraries.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: libraries.cl,v 1.1 2002/09/16 17:54:30 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/uffi/objects.cl b/src-main/objects.cl similarity index 98% rename from uffi/objects.cl rename to src-main/objects.cl index 292caef..d9af1dc 100644 --- a/uffi/objects.cl +++ b/src-main/objects.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: objects.cl,v 1.1 2002/09/16 17:54:30 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/uffi/package.cl b/src-main/package.cl similarity index 100% rename from uffi/package.cl rename to src-main/package.cl diff --git a/uffi/primitives.cl b/src-main/primitives.cl similarity index 99% rename from uffi/primitives.cl rename to src-main/primitives.cl index 3af895c..6fe54ba 100644 --- a/uffi/primitives.cl +++ b/src-main/primitives.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.cl,v 1.4 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: primitives.cl,v 1.1 2002/09/16 17:54:30 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/uffi/strings.cl b/src-main/strings.cl similarity index 98% rename from uffi/strings.cl rename to src-main/strings.cl index e2a6f5d..f4e0e03 100644 --- a/uffi/strings.cl +++ b/src-main/strings.cl @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: strings.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: strings.cl,v 1.1 2002/09/16 17:54:30 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; diff --git a/uffi/mcl/Makefile b/src-mcl/Makefile similarity index 62% rename from uffi/mcl/Makefile rename to src-mcl/Makefile index ce6118b..31dc910 100644 --- a/uffi/mcl/Makefile +++ b/src-mcl/Makefile @@ -1,6 +1,6 @@ SUBDIRS := -include ../../Makefile.common +include ../Makefile.common .PHONY: distclean distclean: clean diff --git a/uffi/mcl/aggregates.cl b/src-mcl/aggregates.cl similarity index 98% rename from uffi/mcl/aggregates.cl rename to src-mcl/aggregates.cl index 1318769..eb4be75 100644 --- a/uffi/mcl/aggregates.cl +++ b/src-mcl/aggregates.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: aggregates.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: aggregates.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/uffi/mcl/functions.cl b/src-mcl/functions.cl similarity index 97% rename from uffi/mcl/functions.cl rename to src-mcl/functions.cl index 2968d74..2db1fd9 100644 --- a/uffi/mcl/functions.cl +++ b/src-mcl/functions.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: functions.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: functions.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/uffi/mcl/libraries.cl b/src-mcl/libraries.cl similarity index 96% rename from uffi/mcl/libraries.cl rename to src-mcl/libraries.cl index 0f1e5b5..d7075c1 100644 --- a/uffi/mcl/libraries.cl +++ b/src-mcl/libraries.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: libraries.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: libraries.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/uffi/mcl/objects.cl b/src-mcl/objects.cl similarity index 98% rename from uffi/mcl/objects.cl rename to src-mcl/objects.cl index 7f5fd9f..c339b4d 100644 --- a/uffi/mcl/objects.cl +++ b/src-mcl/objects.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: objects.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: objects.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/uffi/mcl/package.cl b/src-mcl/package.cl similarity index 100% rename from uffi/mcl/package.cl rename to src-mcl/package.cl diff --git a/uffi/mcl/primitives.cl b/src-mcl/primitives.cl similarity index 97% rename from uffi/mcl/primitives.cl rename to src-mcl/primitives.cl index 58b44b8..6e49d87 100644 --- a/uffi/mcl/primitives.cl +++ b/src-mcl/primitives.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: primitives.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: primitives.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/uffi/mcl/strings.cl b/src-mcl/strings.cl similarity index 98% rename from uffi/mcl/strings.cl rename to src-mcl/strings.cl index 7e1cbaa..ccf6b5d 100644 --- a/uffi/mcl/strings.cl +++ b/src-mcl/strings.cl @@ -7,7 +7,7 @@ ;;;; Programmers: Kevin M. Rosenberg and John DeSoi ;;;; Date Started: Feb 2002 ;;;; -;;;; $Id: strings.cl,v 1.3 2002/08/23 19:21:54 kevin Exp $ +;;;; $Id: strings.cl,v 1.1 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; and John DeSoi diff --git a/uffi.asd b/uffi.asd index edc52e0..1be5c34 100644 --- a/uffi.asd +++ b/uffi.asd @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Aug 2002 ;;;; -;;;; $Id: uffi.asd,v 1.9 2002/09/06 11:01:53 kevin Exp $ +;;;; $Id: uffi.asd,v 1.10 2002/09/16 17:57:43 kevin Exp $ ;;;; ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg ;;;; @@ -19,47 +19,45 @@ (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0))) (in-package :asdf) -;; 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 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*))))) - -(eval-when (:compile-toplevel :load-toplevel :execute) - (defconstant +uffi-logical-host+ - #+common-lisp-controller "cl-library" - #-common-lisp-controller "uffi" - "Logical hostname for loading system")) - (defsystem uffi :name "cl-uffi" :author "Kevin M. Rosenberg