/[slime]/slime/swank-loader.lisp
ViewVC logotype

Diff of /slime/swank-loader.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.83 by heller, Mon Feb 25 17:23:00 2008 UTC revision 1.84 by heller, Thu Mar 27 11:46:41 2008 UTC
# Line 199  If LOAD is true, load the fasl file." Line 199  If LOAD is true, load the fasl file."
199  (defun contrib-dir (base-dir)  (defun contrib-dir (base-dir)
200    (append-dir base-dir "contrib"))    (append-dir base-dir "contrib"))
201    
202    (defun q (s) (read-from-string s))
203    
204  (defun load-swank (&key (src-dir *source-directory*)  (defun load-swank (&key (src-dir *source-directory*)
205                     (fasl-dir *fasl-directory*))                     (fasl-dir *fasl-directory*))
206    (compile-files (src-files *swank-files* src-dir) fasl-dir t))    (compile-files (src-files *swank-files* src-dir) fasl-dir t)
207      (funcall (q "swank::before-init")
208               (slime-version-string)
209               (list (contrib-dir fasl-dir)
210                     (contrib-dir src-dir))))
211    
212  (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*))  (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*))
213                           (fasl-dir (contrib-dir *fasl-directory*))                           (fasl-dir (contrib-dir *fasl-directory*))
214                           load)                           load)
215    (compile-files (src-files *contribs* src-dir) fasl-dir load))    (compile-files (src-files *contribs* src-dir) fasl-dir load))
216    
217  (defun loadup ()  (defun loadup ()
218    (load-swank)    (load-swank)
219    (compile-contribs :load t))    (compile-contribs :load t))
220    
221  (defun setup ()  (defun setup ()
222    (flet ((q (s) (read-from-string s)))    (load-site-init-file *source-directory*)
223      (load-site-init-file *source-directory*)    (load-user-init-file)
224      (load-user-init-file)    (eval `(pushnew 'compile-contribs ,(q "swank::*after-init-hook*")))
225      (eval `(pushnew 'compile-contribs ,(q "swank::*after-init-hook*")))    (funcall (q "swank::init")))
     (funcall (q "swank::setup")  
              (slime-version-string)  
              (list (contrib-dir *fasl-directory*)  
                    (contrib-dir *source-directory*)))))  
226    
227  (defun init (&key delete reload load-contribs (setup t))  (defun init (&key delete reload load-contribs (setup t))
228    (when (and delete (find-package :swank))    (when (and delete (find-package :swank))

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.84

  ViewVC Help
Powered by ViewVC 1.1.5