From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 7 Apr 2002 02:10:18 +0000 (+0000)
Subject: r1750:  Simplied logical pathnames and MCL loading
X-Git-Tag: v1.6.1~506
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=0478b4b594e10314faac124e12573f45eb9cb432

r1750:  Simplied logical pathnames and MCL loading
---

diff --git a/ChangeLog b/ChangeLog
index c317358..f71a69d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	Added authorship for John DeSoi
 	* doc/ref.sgml:
 	Added documentation for find-foreign-library
+	* uffi.system:
+	Simplied logical pathnames and MCL loading
 	
 2002-04-04 John DeSoi (desoi@mac.com)
 	* src/mcl/*.cl
diff --git a/uffi.system b/uffi.system
index d16817e..02373ca 100644
--- a/uffi.system
+++ b/uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: uffi.system,v 1.10 2002/04/03 00:31:32 kevin Exp $
+;;;; $Id: uffi.system,v 1.11 2002/04/07 02:10:18 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,27 +23,23 @@
 		     :defaults *load-truename*))
 
 (set-logical-host-for-pathname "UFFI" *load-truename*)
-
-(defconstant +uffi-src-dir+ 
-  (format nil "UFFI:src;~A;"
-	  #+allegro "allegro"
-	  #+lispworks "lispworks"
-	  #+cmu "cmucl"
-	  #+mcl "mcl"
-          #+clisp "clisp"
-	  #+corman "corman")
-  "Logical pathname for source")
-
-(defconstant +uffi-bin-dir+ (concatenate 'string +uffi-src-dir+ "bin;")
-  "Logical pathname for binaries")
+(set-logical-host-for-pathname "UFFI-SRC" 
+			       (merge-pathnames
+				(make-pathname
+				 :directory
+				 #+(or cmu allegro lispworks)
+				 '(:relative "src")
+				 #+mcl
+				 '(:relative "src" "mcl")
+				 )
+				*load-truename*))
 
 ;;; UFFI system definition
 
-#+(or cmu allegro lispworks)
 (mk:defsystem :uffi
-    :source-pathname "UFFI:src;"
+    :source-pathname "UFFI-SRC:"
     :source-extension "cl"
-    :binary-pathname "UFFI:src;bin;"
+    :binary-pathname "UFFI-SRC:bin;"
     :components 
     ((:file "package")
      (:file "primitives" :depends-on ("package"))
@@ -55,23 +51,3 @@
     :finally-do
     (pushnew :uffi cl:*features*))
 
-#-(or cmu allegro lispworks)
-(mk:defsystem :uffi
-    :source-pathname #.+uffi-src-dir+
-    :source-extension "cl"
-    :binary-pathname #.+uffi-bin-dir+
-    :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"))))
-
- 
-
-
-
-
-