Skip to content

Commit

Permalink
0.8.2.27:
Browse files Browse the repository at this point in the history
	Build fixes for asdf-install.  Has installed a module via cliki for
	me, so maybe it works now.
  • Loading branch information
csrhodes committed Aug 14, 2003
1 parent 9874300 commit 559d980
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
7 changes: 3 additions & 4 deletions contrib/asdf-install/asdf-install.asd
Expand Up @@ -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
Expand All @@ -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))
Expand Down
2 changes: 2 additions & 0 deletions contrib/asdf-install/installer.lisp
Expand Up @@ -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)))
Expand Down Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions 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)
2 changes: 1 addition & 1 deletion version.lisp-expr
Expand Up @@ -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"

0 comments on commit 559d980

Please sign in to comment.