X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi.system;h=df0cd1e4f31cbc568d99d6d3110ec02912063155;hb=5dc129239d09223102bd58d6a4cf72efadde8eca;hp=d16817e752a7176e056ef924e30bd6238caf2d80;hpb=e6ead14af8cd0833a49d7cd33c8bc33d3404da6d;p=uffi.git

diff --git a/uffi.system b/uffi.system
index d16817e..df0cd1e 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.19 2002/08/23 19:46:16 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,33 +17,30 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
-
-(load (make-pathname :name "set-logical" :type "cl"
-		     :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")
-
-;;; UFFI system definition
-
-#+(or cmu allegro lispworks)
-(mk:defsystem :uffi
-    :source-pathname "UFFI:src;"
+(in-package :make)
+
+;; 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*)))))
+
+(defconstant +uffi-logical-host+
+  #+common-lisp-controller "cl-library"
+  #-common-lisp-controller "uffi"
+  "Logical hostname for loading system")
+
+(make:defsystem :uffi
+    :source-pathname 
+    #-mcl #.(format nil "~A:uffi;" +uffi-logical-host+)
+    #+mcl  #.(format nil "~A:uffi;mcl;" +uffi-logical-host+)
     :source-extension "cl"
-    :binary-pathname "UFFI:src;bin;"
     :components 
     ((:file "package")
      (:file "primitives" :depends-on ("package"))
@@ -54,24 +51,3 @@
      (:file "libraries" :depends-on ("package")))
     :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"))))
-
- 
-
-
-
-
-