From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Thu, 14 Aug 2003 14:06:25 +0000 (+0000)
Subject: 0.8.2.27:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=559d980f6576f18a6d73344eca54182622b05604;p=sbcl.git

0.8.2.27:
	Build fixes for asdf-install.  Has installed a module via cliki for
	me, so maybe it works now.
---

diff --git a/contrib/asdf-install/asdf-install.asd b/contrib/asdf-install/asdf-install.asd
index cdcec0a..c918173 100644
--- a/contrib/asdf-install/asdf-install.asd
+++ b/contrib/asdf-install/asdf-install.asd
@@ -10,8 +10,7 @@
 ;;; kind of example.  this shouldn't be a compile-op, or if it is, should
 ;;; define output-files properly instead oif leaving it be the fasl
 (defclass exe-file (cl-source-file) ())
-(defmethod perform ((o compile-op) (c exe-file))
-  (call-next-method)
+(defmethod perform :after ((o compile-op) (c exe-file))
   (sb-executable:make-executable
    (make-pathname :name "asdf-install"
 		  :type nil
@@ -25,8 +24,8 @@
   :depends-on (sb-posix sb-bsd-sockets)
   :version "0.2"
   :components ((:file "defpackage")
-	       (exe-file "loader")
-	       (:file "installer")))
+	       (:exe-file "loader" :depends-on ("installer"))
+	       (:file "installer" :depends-on ("defpackage"))))
 	       
 (defmethod perform :after ((o load-op) (c (eql (find-system :asdf-install))))
   (provide 'asdf-install))
diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp
index c8a3551..799da0f 100644
--- a/contrib/asdf-install/installer.lisp
+++ b/contrib/asdf-install/installer.lisp
@@ -84,6 +84,7 @@ and doesn't begin with one of the prefixes in *SAFE-URL-PREFIXES*")
   (let ((s (make-instance 'inet-socket :type :stream :protocol :tcp))
 	(host (url-host url))
 	(port (url-port url)))
+    (declare (ignore port))
     (socket-connect
      s (car (host-ent-addresses (get-host-by-name (url-host (or *proxy* url)))))
      (url-port (or  *proxy* url)))
@@ -212,6 +213,7 @@ and doesn't begin with one of the prefixes in *SAFE-URL-PREFIXES*")
 	   (make-pathname :directory
 			  `(:relative ,(subseq tar 0 pos-slash)))
 	   source)))
+    (declare (ignore dummy))
     (loop for asd in (directory
 		      (make-pathname :name :wild :type "asd"))
 	  do (let ((target (merge-pathnames
diff --git a/contrib/asdf-install/loader.lisp b/contrib/asdf-install/loader.lisp
index 7d1211f..317185d 100644
--- a/contrib/asdf-install/loader.lisp
+++ b/contrib/asdf-install/loader.lisp
@@ -1,15 +1,13 @@
-
 (in-package :cl-user)
-(eval-when (:compile-toplevel :load-toplevel :execute)
+
+(eval-when (:load-toplevel)
   (require 'asdf)
-  (asdf:operate 'asdf:load-op 'asdf-install :verbose nil))
+  (require 'asdf-install))
 
 (defun run ()
   (handler-case
       (apply #'asdf-install:install (cdr *posix-argv*))
     (error (c)
-      (princ "Install failed due to error:") (terpri)
-      (princ c) (terpri)
-      (quit :unix-status 1))))
+      (format *error-output* "Install failed due to error:~%  ~A~%" c)
+      (sb-ext:quit :unix-status 1))))
 
-;(quit)
\ No newline at end of file
diff --git a/version.lisp-expr b/version.lisp-expr
index cb7b15c..b1fa40d 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.8.2.26"
+"0.8.2.27"