From 56a7f00b79f897235db7dc4f6afffe29a0b2a377 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Fri, 7 Mar 2003 15:14:51 +0000 Subject: [PATCH] 0.7.13.18: contrib/ frobs ... install newer asdf, which fixes my stupid thinko for .sbcl/systems (though in point of fact there would be an argument, I think, for resolving user-homedir-pathname/SBCL_HOME later than we are. ... apply KMR patches (sbcl-devel 2003-03-04) for sb-aclrepl (and turn *CMD-CHAR* into *COMMAND-CHAR* in the process) --- contrib/asdf/asdf.lisp | 37 +++++++++++++++++++++++++++++++------ contrib/sb-aclrepl/sb-aclrepl.lisp | 17 ++++++++++------- version.lisp-expr | 2 +- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp index 775410013..94e235f18 100644 --- a/contrib/asdf/asdf.lisp +++ b/contrib/asdf/asdf.lisp @@ -1,4 +1,4 @@ -;;; This is asdf: Another System Definition Facility. $\Revision: 1.59 $ +;;; This is asdf: Another System Definition Facility. $\Revision: 1.62 $ ;;; ;;; Feedback, bug reports, and patches are all welcome: please mail to ;;; . But note first that the canonical @@ -87,7 +87,7 @@ (in-package #:asdf) -(defvar *asdf-revision* (let* ((v "$\Revision: 1.59 $") +(defvar *asdf-revision* (let* ((v "$\Revision: 1.62 $") (colon (position #\: v)) (dot (position #\. v))) (and v colon dot @@ -709,7 +709,32 @@ system.")) (defclass load-source-op (operation) ()) (defmethod perform ((o load-source-op) (c cl-source-file)) - (load (component-pathname c))) + (let ((source (component-pathname c))) + (setf (component-property c 'last-loaded-as-source) + (and (load source) + (get-universal-time))))) + +(defmethod perform ((operation load-source-op) (c static-file)) + nil) + +(defmethod output-files ((operation load-source-op) (c component)) + nil) + +;;; FIXME: we simply copy load-op's dependencies. this is Just Not Right. +(defmethod component-depends-on ((o load-source-op) (c component)) + (let ((what-would-load-op-do (cdr (assoc 'load-op + (slot-value c 'in-order-to))))) + (mapcar (lambda (dep) + (if (eq (car dep) 'load-op) + (cons 'load-source-op (cdr dep)) + dep)) + what-would-load-op-do))) + +(defmethod operation-done-p ((o load-source-op) (c source-file)) + (if (or (not (component-property c 'last-loaded-as-source)) + (> (file-write-date (component-pathname c)) + (component-property c 'last-loaded-as-source))) + nil t)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -960,12 +985,12 @@ output to *trace-output*. Returns the shell's exit code." (pushnew (merge-pathnames "site-systems/" - (truename (sb-ext:posix-getenv "SBCL_HOME"))) + (truename (sb-ext:posix-getenv "SBCL_HOME"))) *central-registry*) (pushnew - (merge-pathnames ".sbcl/systems" - (user-homedir-pathname)) + (merge-pathnames ".sbcl/systems/" + (user-homedir-pathname)) *central-registry*) (pushnew 'module-provide-asdf sb-ext:*module-provider-functions*)) diff --git a/contrib/sb-aclrepl/sb-aclrepl.lisp b/contrib/sb-aclrepl/sb-aclrepl.lisp index cc89cf5ce..6fdf05932 100644 --- a/contrib/sb-aclrepl/sb-aclrepl.lisp +++ b/contrib/sb-aclrepl/sb-aclrepl.lisp @@ -3,14 +3,16 @@ ;;;; SBCL-specific hooks like SB-INT:*REPL-READ-FUN* and ;;;; SB-INT:*REPL-PROMPT-FUN*. ;;;; -;;;; The documentation for this functionality is on the ACL website, +;;;; The documentation, which may or may not apply in its entirety at +;;;; any given time, for this functionality is on the ACL website: ;;;; . (cl:defpackage :sb-aclrepl (:use :cl :sb-ext) - (:export :*prompt*) - ;; (what else should we be exporting?) - ) + ;; FIXME: should we be exporting anything else? + (:export #:*prompt* #:*exit-on-eof* #:*max-history* + #:*use-short-package-name* #:*command-char* + #:alias)) (cl:in-package :sb-aclrepl) @@ -23,11 +25,11 @@ "when T, use the shortnest package nickname in a prompt") (defparameter *dir-stack* nil "The top-level directory stack") -(defparameter *cmd-char* #\: +(defparameter *command-char* #\: "Prefix character for a top-level command") (defvar *max-history* 24 "Maximum number of history commands to remember") -(defvar *exit-on-eof* +(defvar *exit-on-eof* t "If T, then exit when the EOF character is entered.") (defparameter *history* nil "History list") @@ -66,7 +68,7 @@ collect arg)))))) (let ((next-char (peek-char-non-whitespace input-stream))) (cond - ((eql next-char *cmd-char*) + ((eql next-char *command-char*) (let* ((line (string-trim-whitespace (read-line input-stream))) (first-space-pos (position #\space line)) (cmd-string (subseq line 1 first-space-pos)) @@ -482,6 +484,7 @@ (fresh-line) t) ; Ayup. (t + (add-to-history user-cmd) nil))) ; nope, not in my job description (defun repl-read-form-fun (input-stream output-stream) diff --git a/version.lisp-expr b/version.lisp-expr index 6a50335d0..8815e3353 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -18,4 +18,4 @@ ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.7.13.17" +"0.7.13.18" -- 2.11.4.GIT