[slime-cvs] CVS slime

[mbaringer]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv20408

Modified Files:
	swank-loader.lisp ChangeLog 
Log Message:


--- /project/slime/cvsroot/slime/swank-loader.lisp	2007/11/24 08:18:59	1.75
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2008/02/03 18:00:31	1.76
@@ -18,6 +18,13 @@
 ;;   (defparameter swank-loader::*fasl-directory* "/tmp/fasl/")
 ;;   (load ".../swank-loader.lisp")
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (when (find-package :swank)
+    (delete-package :swank)
+    (delete-package :swank-io-package)
+    (delete-package :swank-loader)
+    (delete-package :swank-backend)))
+
 (cl:defpackage :swank-loader
   (:use :cl)
   (:export :load-swank
@@ -60,14 +67,9 @@
     :sparc64 :sparc :hppa64 :hppa))
 
 (defun lisp-version-string ()
-  #+cmu       (substitute-if #\_ (lambda (x) (find x " /"))
+  #+(or openmcl cmu)       (substitute-if #\_ (lambda (x) (find x " /"))
                              (lisp-implementation-version))
-  #+scl       (lisp-implementation-version)
-  #+sbcl      (lisp-implementation-version)
-  #+ecl       (lisp-implementation-version)
-  #+openmcl   (format nil "~d.~d"
-                      ccl::*openmcl-major-version*
-                      ccl::*openmcl-minor-version*)
+  #+(or cormanlisp scl sbcl ecl)       (lisp-implementation-version)
   #+lispworks (lisp-implementation-version)
   #+allegro   (format nil
                       "~A~A~A"
@@ -76,8 +78,7 @@
                       (if (member :64bit *features*) "-64bit" ""))
   #+clisp     (let ((s (lisp-implementation-version)))
                 (subseq s 0 (position #\space s)))
-  #+armedbear (lisp-implementation-version)
-  #+cormanlisp (lisp-implementation-version))
+  #+armedbear (lisp-implementation-version))
 
 (defun unique-directory-name ()
   "Return a name that can be used as a directory name that is
--- /project/slime/cvsroot/slime/ChangeLog	2008/01/27 15:34:27	1.1274
+++ /project/slime/cvsroot/slime/ChangeLog	2008/02/03 18:00:31	1.1275
@@ -1,3 +1,12 @@
+2008-02-03  Marco Baringer  <mb at bese.it>
+
+	* swank-loader.lisp: When loading swank delete all swank packages
+	first. This protects the lisp from broken reloads of swank.
+	(lisp-version-string): On openmcl use the full
+	cl:lisp-implementation-version, ccl::*openmcl-major-version* and
+	ccl::*openmcl-minor-version* aren't sufficently precise to notice
+	changes in openmcl's cvs.
+
 2008-01-27  Helmut Eller  <heller at common-lisp.net>
 
 	Make it easier to start a non-default Lisp from ELisp code.