Skip to content

Commit

Permalink
0.9.11.42:
Browse files Browse the repository at this point in the history
	Merge fix from upstream ASDF, keeping (for now) the local win32
	modification which should have been sent upstream
  • Loading branch information
csrhodes committed Apr 20, 2006
1 parent c5aeb88 commit 11e1cd9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions contrib/asdf/asdf.lisp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;;; This is asdf: Another System Definition Facility. 1.93
;;; This is asdf: Another System Definition Facility. 1.94
;;;
;;; Feedback, bug reports, and patches are all welcome: please mail to
;;; <cclan-list@lists.sf.net>. But note first that the canonical
Expand Down Expand Up @@ -109,7 +109,7 @@

(in-package #:asdf)

(defvar *asdf-revision* (let* ((v "1.93")
(defvar *asdf-revision* (let* ((v "1.94")
(colon (or (position #\: v) -1))
(dot (position #\. v)))
(and v colon dot
Expand Down Expand Up @@ -442,7 +442,10 @@ system."))
(defmethod component-relative-pathname ((component source-file))
(let ((relative-pathname (slot-value component 'relative-pathname)))
(if relative-pathname
relative-pathname
(merge-pathnames
relative-pathname
(make-pathname
:type (source-file-type component (component-system component))))
(let* ((*default-pathname-defaults*
(component-parent-pathname component))
(name-type
Expand Down Expand Up @@ -1065,10 +1068,9 @@ output to *verbose-out*. Returns the shell's exit code."
#+sbcl
(sb-impl::process-exit-code
(sb-ext:run-program
#-win32 "/bin/sh"
#+win32 "sh"
#+win32 "sh" #-win32 "/bin/sh"
(list "-c" command)
:search #-win32 nil #+win32 t
#+win32 #+win32 :search t
:input nil :output *verbose-out*))

#+(or cmu scl)
Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Original file line number Diff line number Diff line change
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.9.11.41"
"0.9.11.42"

0 comments on commit 11e1cd9

Please sign in to comment.