[cells-gtk-cvs] CVS update: root/config.lisp root/load.lisp

[Kenny Tilton]

Update of /project/cells-gtk/cvsroot/root
In directory common-lisp.net:/tmp/cvs-serv23336

Modified Files:
	load.lisp 
Added Files:
	config.lisp 
Log Message:
Apply Andras SImon's patches from Jan 6, 2004 to get things working on CMU and ACL/Linux
Date: Tue Jan 25 07:57:31 2005
Author: ktilton



Index: root/load.lisp
diff -u root/load.lisp:1.4 root/load.lisp:1.5
--- root/load.lisp:1.4	Thu Dec 16 08:36:25 2004
+++ root/load.lisp	Tue Jan 25 07:57:31 2005
@@ -11,48 +11,17 @@
 #-asdf
 
 (eval-when (compile load eval)
-  (load (make-pathname :directory '(:absolute "00" "root")
-                       :name "asdf" :type "lisp")))
+  (load (merge-pathnames
+         (make-pathname :name "asdf" :type "lisp")
+         *load-pathname*)))
 
-#| Step Two: Tell ASDF where to find stuff
+;;;; Step 2: Modify config.lisp, then load: 
 
-   Again, adjust pathnames to match the locations of the various bits of source
-
-|#
-
-(progn
-  #+lispworks
-  (setq *HANDLE-EXISTING-DEFPACKAGE* '(:modify))
-
-  (push (make-pathname :directory '(:absolute "cell-cultures" "utils-kt"))
-        asdf:*central-registry*)
-  
-  (push (make-pathname :directory '(:absolute "cell-cultures" "cells"))
-        asdf:*central-registry*)
-  
-  (push (make-pathname :directory '(:absolute "cell-cultures" "hello-c"))
-        asdf:*central-registry*)
-  
-  (defparameter *cells-gtk-root*
-    (make-pathname :directory '(:absolute "00" "root")))
-  
-  (push (merge-pathnames
-         (make-pathname :directory '(:relative "gtk-ffi"))
-         *cells-gtk-root*)
-        asdf:*central-registry*)
-
-  (push (merge-pathnames
-         (make-pathname :directory '(:relative "cells-gtk"))
-       *cells-gtk-root*)
-  asdf:*central-registry*)
-
-  (push (merge-pathnames
-         (make-pathname :directory '(:relative "cells-gtk" "test-gtk"))
-         *cells-gtk-root*)
-        asdf:*central-registry*))
-
-#| Step 3: Compile and load via ASDF
+(load (merge-pathnames
+         (make-pathname :name "config" :type "lisp")
+         *load-pathname*))
 
+;;;; Step 3: Compile and load via ASDF
 ; these are handy when one is first working up to getting things to build at all
 ; but the "test-gtk" ASDF has dependencies which will load everything else, so
 ; you can just execute that.
@@ -62,11 +31,10 @@
 ;(Asdf:operate 'asdf:load-op :hello-c :force nil)
 ;(Asdf:operate 'asdf:load-op :gtk-ffi :force t)
 ;(Asdf:operate 'asdf:load-op :cells-gtk :force nil)
-|#
 
 (Asdf:operate 'asdf:load-op :test-gtk :force nil)
 
-#+Step-4: 
+#+Step-4
 
 (test-gtk::gtk-demo)