r1750: Simplied logical pathnames and MCL loading

diff --git a/ChangeLog b/ChangeLog
index c317358fd9d13dda7202defbce37960bad051ccd..f71a69de94b7e771bb62eba4e266a3fa65f5203f 100644 (file)
--- 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 d16817e752a7176e056ef924e30bd6238caf2d80..02373ca6ae478a4f253424ef55f524fd5a2888df 100644 (file)
--- 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"))))
-
- 
-
-
-
-
-