[armedbear-cvs] r14397 - in trunk/abcl: doc/asdf src/org/armedbear/lisp
mevenson at common-lisp.net
mevenson at common-lisp.net
Thu Feb 21 10:29:14 UTC 2013
Author: mevenson
Date: Thu Feb 21 02:29:13 2013
New Revision: 14397
Log:
Upgrade to asdf-2.30.
Modified:
trunk/abcl/doc/asdf/asdf.texinfo
trunk/abcl/src/org/armedbear/lisp/asdf.lisp
Modified: trunk/abcl/doc/asdf/asdf.texinfo
==============================================================================
--- trunk/abcl/doc/asdf/asdf.texinfo Sat Feb 16 08:26:25 2013 (r14396)
+++ trunk/abcl/doc/asdf/asdf.texinfo Thu Feb 21 02:29:13 2013 (r14397)
@@ -124,6 +124,7 @@
@c * Operations::
@c * Components::
+ at c * Functions::
@c Operations
@@ -1089,6 +1090,14 @@
to use this component option except at the @code{defsystem} level, as
this anomalous behavior may be removed without warning.
+Finally, you might look into the @code{asdf-system-connections} extension,
+that will let you define additional code to be loaded
+when two systems are simultaneously loaded.
+It may or may not be considered good style, but at least it can be used
+in a way that has deterministic behavior independent of load order,
+unlike @code{weakly-depends-on}.
+
+
@subsection Pathname specifiers
@cindex pathname specifiers
Modified: trunk/abcl/src/org/armedbear/lisp/asdf.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/asdf.lisp Sat Feb 16 08:26:25 2013 (r14396)
+++ trunk/abcl/src/org/armedbear/lisp/asdf.lisp Thu Feb 21 02:29:13 2013 (r14397)
@@ -1,5 +1,5 @@
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 2.29: Another System Definition Facility.
+;;; This is ASDF 2.30: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel at common-lisp.net>.
@@ -54,7 +54,7 @@
(declaim (optimize (speed 1) (safety 3) (debug 3)))
(setf ext:*gc-verbose* nil))
-#+(or abcl clisp cmu ecl xcl)
+#+(or abcl clisp clozure cmu ecl xcl)
(eval-when (:load-toplevel :compile-toplevel :execute)
(unless (member :asdf3 *features*)
(let* ((existing-version
@@ -71,7 +71,8 @@
(existing-version-number (and existing-version (read-from-string existing-major-minor)))
(away (format nil "~A-~A" :asdf existing-version)))
(when (and existing-version (< existing-version-number
- #+abcl 2.25 #+clisp 2.27 #+cmu 2.018 #+ecl 2.21 #+xcl 2.27))
+ #+abcl 2.25 #+clisp 2.27 #+clozure 2.27
+ #+cmu 2.018 #+ecl 2.21 #+xcl 2.27))
(rename-package :asdf away)
(when *load-verbose*
(format t "; Renamed old ~A package away to ~A~%" :asdf away))))))
@@ -991,7 +992,6 @@
#:call-function #:call-functions #:register-hook-function
#:match-condition-p #:match-any-condition-p ;; conditions
#:call-with-muffled-conditions #:with-muffled-conditions
- #:load-string #:load-stream
#:lexicographic< #:lexicographic<=
#:parse-version #:unparse-version #:version< #:version<= #:version-compatible-p)) ;; version
(in-package :asdf/utility)
@@ -1362,9 +1362,6 @@
;;; Condition control
(with-upgradability ()
- (defvar *uninteresting-conditions* nil
- "Uninteresting conditions, as per MATCH-CONDITION-P")
-
(defparameter +simple-condition-format-control-slot+
#+abcl 'system::format-control
#+allegro 'excl::format-control
@@ -1401,8 +1398,8 @@
(muffle-warning c)))))
(funcall thunk)))
- (defmacro with-muffled-uninteresting-conditions ((conditions) &body body)
- `(call-with-muffled-uninteresting-conditions #'(lambda () , at body) ,conditions)))
+ (defmacro with-muffled-conditions ((conditions) &body body)
+ `(call-with-muffled-conditions #'(lambda () , at body) ,conditions)))
;;;; ---------------------------------------------------------------------------
@@ -1596,7 +1593,7 @@
(with-upgradability ()
(defun hostname ()
;; Note: untested on RMCL
- #+(or abcl clozure cmucl ecl genera lispworks mcl mkcl sbcl scl xcl) (machine-instance)
+ #+(or abcl clozure cmu ecl genera lispworks mcl mkcl sbcl scl xcl) (machine-instance)
#+cormanlisp "localhost" ;; is there a better way? Does it matter?
#+allegro (symbol-call :excl.osi :gethostname)
#+clisp (first (split-string (machine-instance) :separator " "))
@@ -1657,75 +1654,74 @@
;;;; Jesse Hager: The Windows Shortcut File Format.
;;;; http://www.wotsit.org/list.asp?fc=13
+#-(or clisp genera) ; CLISP doesn't need it, and READ-SEQUENCE annoys old Genera.
(with-upgradability ()
- #-(or clisp genera) ; CLISP doesn't need it, and READ-SEQUENCE annoys old Genera.
- (progn
- (defparameter *link-initial-dword* 76)
- (defparameter *link-guid* #(1 20 2 0 0 0 0 0 192 0 0 0 0 0 0 70))
+ (defparameter *link-initial-dword* 76)
+ (defparameter *link-guid* #(1 20 2 0 0 0 0 0 192 0 0 0 0 0 0 70))
- (defun read-null-terminated-string (s)
- (with-output-to-string (out)
- (loop :for code = (read-byte s)
- :until (zerop code)
- :do (write-char (code-char code) out))))
-
- (defun read-little-endian (s &optional (bytes 4))
- (loop :for i :from 0 :below bytes
- :sum (ash (read-byte s) (* 8 i))))
-
- (defun parse-file-location-info (s)
- (let ((start (file-position s))
- (total-length (read-little-endian s))
- (end-of-header (read-little-endian s))
- (fli-flags (read-little-endian s))
- (local-volume-offset (read-little-endian s))
- (local-offset (read-little-endian s))
- (network-volume-offset (read-little-endian s))
- (remaining-offset (read-little-endian s)))
- (declare (ignore total-length end-of-header local-volume-offset))
- (unless (zerop fli-flags)
- (cond
- ((logbitp 0 fli-flags)
- (file-position s (+ start local-offset)))
- ((logbitp 1 fli-flags)
- (file-position s (+ start
- network-volume-offset
- #x14))))
- (strcat (read-null-terminated-string s)
- (progn
- (file-position s (+ start remaining-offset))
- (read-null-terminated-string s))))))
-
- (defun parse-windows-shortcut (pathname)
- (with-open-file (s pathname :element-type '(unsigned-byte 8))
- (handler-case
- (when (and (= (read-little-endian s) *link-initial-dword*)
- (let ((header (make-array (length *link-guid*))))
- (read-sequence header s)
- (equalp header *link-guid*)))
- (let ((flags (read-little-endian s)))
- (file-position s 76) ;skip rest of header
- (when (logbitp 0 flags)
- ;; skip shell item id list
- (let ((length (read-little-endian s 2)))
- (file-position s (+ length (file-position s)))))
- (cond
- ((logbitp 1 flags)
- (parse-file-location-info s))
- (t
- (when (logbitp 2 flags)
- ;; skip description string
- (let ((length (read-little-endian s 2)))
- (file-position s (+ length (file-position s)))))
- (when (logbitp 3 flags)
- ;; finally, our pathname
- (let* ((length (read-little-endian s 2))
- (buffer (make-array length)))
- (read-sequence buffer s)
- (map 'string #'code-char buffer)))))))
- (end-of-file (c)
- (declare (ignore c))
- nil))))))
+ (defun read-null-terminated-string (s)
+ (with-output-to-string (out)
+ (loop :for code = (read-byte s)
+ :until (zerop code)
+ :do (write-char (code-char code) out))))
+
+ (defun read-little-endian (s &optional (bytes 4))
+ (loop :for i :from 0 :below bytes
+ :sum (ash (read-byte s) (* 8 i))))
+
+ (defun parse-file-location-info (s)
+ (let ((start (file-position s))
+ (total-length (read-little-endian s))
+ (end-of-header (read-little-endian s))
+ (fli-flags (read-little-endian s))
+ (local-volume-offset (read-little-endian s))
+ (local-offset (read-little-endian s))
+ (network-volume-offset (read-little-endian s))
+ (remaining-offset (read-little-endian s)))
+ (declare (ignore total-length end-of-header local-volume-offset))
+ (unless (zerop fli-flags)
+ (cond
+ ((logbitp 0 fli-flags)
+ (file-position s (+ start local-offset)))
+ ((logbitp 1 fli-flags)
+ (file-position s (+ start
+ network-volume-offset
+ #x14))))
+ (strcat (read-null-terminated-string s)
+ (progn
+ (file-position s (+ start remaining-offset))
+ (read-null-terminated-string s))))))
+
+ (defun parse-windows-shortcut (pathname)
+ (with-open-file (s pathname :element-type '(unsigned-byte 8))
+ (handler-case
+ (when (and (= (read-little-endian s) *link-initial-dword*)
+ (let ((header (make-array (length *link-guid*))))
+ (read-sequence header s)
+ (equalp header *link-guid*)))
+ (let ((flags (read-little-endian s)))
+ (file-position s 76) ;skip rest of header
+ (when (logbitp 0 flags)
+ ;; skip shell item id list
+ (let ((length (read-little-endian s 2)))
+ (file-position s (+ length (file-position s)))))
+ (cond
+ ((logbitp 1 flags)
+ (parse-file-location-info s))
+ (t
+ (when (logbitp 2 flags)
+ ;; skip description string
+ (let ((length (read-little-endian s 2)))
+ (file-position s (+ length (file-position s)))))
+ (when (logbitp 3 flags)
+ ;; finally, our pathname
+ (let* ((length (read-little-endian s 2))
+ (buffer (make-array length)))
+ (read-sequence buffer s)
+ (map 'string #'code-char buffer)))))))
+ (end-of-file (c)
+ (declare (ignore c))
+ nil)))))
;;;; -------------------------------------------------------------------------
@@ -2484,47 +2480,48 @@
(null nil)
(string (probe-file* (parse-namestring p) :truename truename))
(pathname
- (handler-case
- (or
- #+allegro
- (probe-file p :follow-symlinks truename)
- #-(or allegro clisp gcl2.6)
- (if truename
- (probe-file p)
- (and (not (wild-pathname-p p))
+ (and (not (wild-pathname-p p))
+ (handler-case
+ (or
+ #+allegro
+ (probe-file p :follow-symlinks truename)
+ #-(or allegro clisp gcl2.6)
+ (if truename
+ (probe-file p)
(ignore-errors
(let ((pp (translate-logical-pathname p)))
- #+(or cmu scl) (unix:unix-stat (ext:unix-namestring pp))
- #+(and lispworks unix) (system:get-file-stat pp)
- #+sbcl (sb-unix:unix-stat (sb-ext:native-namestring pp))
- #-(or cmu (and lispworks unix) sbcl scl) (file-write-date pp)))
- p))
- #+(or clisp gcl2.6)
- #.(flet ((probe (probe)
- `(let ((foundtrue ,probe))
- (cond
- (truename foundtrue)
- (foundtrue p)))))
- #+gcl2.6
- (probe '(or (probe-file p)
- (and (directory-pathname-p p)
- (ignore-errors
- (ensure-directory-pathname
- (truename* (subpathname
- (ensure-directory-pathname p) ".")))))))
- #+clisp
- (let* ((fs (find-symbol* '#:file-stat :posix nil))
- (pp (find-symbol* '#:probe-pathname :ext nil))
- (resolve (if pp
- `(ignore-errors (,pp p))
- '(or (truename* p)
- (truename* (ignore-errors (ensure-directory-pathname p)))))))
- (if fs
- `(if truename
- ,resolve
- (and (ignore-errors (,fs p)) p))
- (probe resolve)))))
- (file-error () nil))))))
+ (and
+ #+(or cmu scl) (unix:unix-stat (ext:unix-namestring pp))
+ #+(and lispworks unix) (system:get-file-stat pp)
+ #+sbcl (sb-unix:unix-stat (sb-ext:native-namestring pp))
+ #-(or cmu (and lispworks unix) sbcl scl) (file-write-date pp)
+ p))))
+ #+(or clisp gcl2.6)
+ #.(flet ((probe (probe)
+ `(let ((foundtrue ,probe))
+ (cond
+ (truename foundtrue)
+ (foundtrue p)))))
+ #+gcl2.6
+ (probe '(or (probe-file p)
+ (and (directory-pathname-p p)
+ (ignore-errors
+ (ensure-directory-pathname
+ (truename* (subpathname
+ (ensure-directory-pathname p) ".")))))))
+ #+clisp
+ (let* ((fs (find-symbol* '#:file-stat :posix nil))
+ (pp (find-symbol* '#:probe-pathname :ext nil))
+ (resolve (if pp
+ `(ignore-errors (,pp p))
+ '(or (truename* p)
+ (truename* (ignore-errors (ensure-directory-pathname p)))))))
+ (if fs
+ `(if truename
+ ,resolve
+ (and (ignore-errors (,fs p)) p))
+ (probe resolve)))))
+ (file-error () nil)))))))
(defun directory* (pathname-spec &rest keys &key &allow-other-keys)
(apply 'directory pathname-spec
@@ -2858,7 +2855,8 @@
(with-upgradability ()
(defun ensure-all-directories-exist (pathnames)
(dolist (pathname pathnames)
- (ensure-directories-exist (translate-logical-pathname pathname))))
+ (when pathname
+ (ensure-directories-exist (translate-logical-pathname pathname)))))
(defun rename-file-overwriting-target (source target)
#+clisp ;; But for a bug in CLISP 2.48, we should use :if-exists :overwrite and be atomic
@@ -2887,7 +2885,6 @@
#:with-input-file #:call-with-input-file
#:finish-outputs #:format! #:safe-format!
#:copy-stream-to-stream #:concatenate-files
- #:copy-stream-to-stream-line-by-line
#:slurp-stream-string #:slurp-stream-lines #:slurp-stream-line
#:slurp-stream-forms #:slurp-stream-form
#:read-file-string #:read-file-lines #:read-file-forms #:read-file-form #:safe-read-file-form
@@ -3335,7 +3332,7 @@
#:*image-dumped-p* #:raw-command-line-arguments #:*command-line-arguments*
#:command-line-arguments #:raw-command-line-arguments #:setup-command-line-arguments
#:*lisp-interaction*
- #:fatal-conditions #:fatal-condition-p #:handle-fatal-condition
+ #:*fatal-conditions* #:fatal-condition-p #:handle-fatal-condition
#:call-with-fatal-condition-handler #:with-fatal-condition-handler
#:*image-restore-hook* #:*image-prelude* #:*image-entry-point*
#:*image-postlude* #:*image-dump-hook*
@@ -3343,7 +3340,7 @@
#:shell-boolean-exit
#:register-image-restore-hook #:register-image-dump-hook
#:call-image-restore-hook #:call-image-dump-hook
- #:initialize-asdf-utilities #:restore-image #:dump-image #:create-image
+ #:restore-image #:dump-image #:create-image
))
(in-package :asdf/image)
@@ -3436,7 +3433,7 @@
(let ((*debug-io* stream))
(ccl:print-call-history :count count :start-frame-number 1)
(finish-output stream))
- #+(or cmucl scl)
+ #+(or cmu scl)
(let ((debug:*debug-print-level* *print-level*)
(debug:*debug-print-length* *print-length*))
(debug:backtrace most-positive-fixnum stream))
@@ -4234,12 +4231,15 @@
(etypecase sexp
(symbol (reify-symbol sexp))
((or number character simple-string pathname) sexp)
- (cons (cons (reify-simple-sexp (car sexp)) (reify-simple-sexp (cdr sexp))))))
+ (cons (cons (reify-simple-sexp (car sexp)) (reify-simple-sexp (cdr sexp))))
+ (simple-vector (vector (mapcar 'reify-simple-sexp (coerce sexp 'list))))))
+
(defun unreify-simple-sexp (sexp)
(etypecase sexp
((or symbol number character simple-string pathname) sexp)
(cons (cons (unreify-simple-sexp (car sexp)) (unreify-simple-sexp (cdr sexp))))
- ((simple-vector 2) (unreify-symbol sexp))))
+ ((simple-vector 2) (unreify-symbol sexp))
+ ((simple-vector 1) (coerce (mapcar 'unreify-simple-sexp (aref sexp 0)) 'vector))))
#+clozure
(progn
@@ -4256,16 +4256,14 @@
(ccl::make-source-note :filename filename :start-pos start-pos :end-pos end-pos
:source (unreify-source-note source)))))
(defun reify-function-name (function-name)
- (reify-simple-sexp
- (if-let (setfed (gethash function-name ccl::%setf-function-name-inverses%))
- `(setf ,setfed)
- function-name)))
+ (if-let (setfed (gethash function-name ccl::%setf-function-name-inverses%))
+ `(setf ,setfed)
+ function-name))
(defun unreify-function-name (function-name)
- (let ((name (unreify-simple-sexp function-name)))
- (if (and (consp name) (eq (first name) 'setf))
- (let ((setfed (second name)))
- (gethash setfed ccl::%setf-function-names%))
- name)))
+ (if (and (consp function-name) (eq (first function-name) 'setf))
+ (let ((setfed (second function-name)))
+ (gethash setfed ccl::%setf-function-names%))
+ function-name))
(defun reify-deferred-warning (deferred-warning)
(with-accessors ((warning-type ccl::compiler-warning-warning-type)
(args ccl::compiler-warning-args)
@@ -4274,7 +4272,7 @@
(list :warning-type warning-type :function-name (reify-function-name function-name)
:source-note (reify-source-note source-note)
:args (destructuring-bind (fun . formals) args
- (cons (reify-function-name fun) (reify-simple-sexp formals))))))
+ (cons (reify-function-name fun) formals)))))
(defun unreify-deferred-warning (reified-deferred-warning)
(destructuring-bind (&key warning-type function-name source-note args)
reified-deferred-warning
@@ -4284,7 +4282,7 @@
:source-note (unreify-source-note source-note)
:warning-type warning-type
:args (destructuring-bind (fun . formals) args
- (cons (unreify-function-name fun) (unreify-simple-sexp formals)))))))
+ (cons (unreify-function-name fun) formals))))))
#+(or cmu scl)
(defun reify-undefined-warning (warning)
;; Extracting undefined-warnings from the compilation-unit
@@ -4330,9 +4328,8 @@
using READ within a WITH-SAFE-IO-SYNTAX, that represents the warnings currently deferred by
WITH-COMPILATION-UNIT. One of three functions required for deferred-warnings support in ASDF."
#+allegro
- (reify-simple-sexp
- (list :functions-defined excl::.functions-defined.
- :functions-called excl::.functions-called.))
+ (list :functions-defined excl::.functions-defined.
+ :functions-called excl::.functions-called.)
#+clozure
(mapcar 'reify-deferred-warning
(if-let (dw ccl::*outstanding-deferred-warnings*)
@@ -4374,7 +4371,7 @@
(declare (ignorable reified-deferred-warnings))
#+allegro
(destructuring-bind (&key functions-defined functions-called)
- (unreify-simple-sexp reified-deferred-warnings)
+ reified-deferred-warnings
(setf excl::.functions-defined.
(append functions-defined excl::.functions-defined.)
excl::.functions-called.
@@ -5118,7 +5115,7 @@
;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
- (asdf-version "2.29")
+ (asdf-version "2.30")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
@@ -5679,7 +5676,7 @@
#:*central-registry* #:probe-asd #:sysdef-central-registry-search
#:find-system-if-being-defined #:*systems-being-defined*
#:contrib-sysdef-search #:sysdef-find-asdf ;; backward compatibility symbols, functions removed
- #:system-find-preloaded-system #:register-preloaded-system #:*preloaded-systems*
+ #:sysdef-preloaded-system-search #:register-preloaded-system #:*preloaded-systems*
#:clear-defined-systems #:*defined-systems*
;; defined in source-registry, but specially mentioned here:
#:initialize-source-registry #:sysdef-source-registry-search))
@@ -5762,6 +5759,7 @@
(setf *defined-systems* (make-hash-table :test 'equal))
(when asdf
(setf (component-version asdf) *asdf-version*)
+ (setf (builtin-system-p asdf) t)
(register-system asdf)))
(values))
@@ -5801,7 +5799,7 @@
(remove-if #'(lambda (x) (member x *system-definition-search-functions*))
'(sysdef-central-registry-search
sysdef-source-registry-search
- sysdef-find-preloaded-systems)))))
+ sysdef-preloaded-system-search)))))
(cleanup-system-definition-search-functions)
(defun search-for-system-definition (system)
@@ -5917,11 +5915,17 @@
(defmacro with-system-definitions ((&optional) &body body)
`(call-with-system-definitions #'(lambda () , at body)))
- (defun load-asd (pathname &key name (external-format (encoding-external-format (detect-encoding pathname))))
+ (defun load-asd (pathname &key name (external-format (encoding-external-format (detect-encoding pathname))) &aux (readtable *readtable*) (print-pprint-dispatch *print-pprint-dispatch*))
;; Tries to load system definition with canonical NAME from PATHNAME.
(with-system-definitions ()
(with-standard-io-syntax
(let ((*package* (find-package :asdf-user))
+ ;; Note that our backward-compatible *readtable* is
+ ;; a global readtable that gets globally side-effected. Ouch.
+ ;; Same for the *print-pprint-dispatch* table.
+ ;; We should do something about that for ASDF3 if possible, or else ASDF4.
+ (*readtable* readtable)
+ (*print-pprint-dispatch* print-pprint-dispatch)
(*print-readably* nil)
(*default-pathname-defaults*
;; resolve logical-pathnames so they won't wreak havoc in parsing namestrings.
@@ -6002,7 +6006,7 @@
(defvar *preloaded-systems* (make-hash-table :test 'equal))
- (defun sysdef-find-preloaded-systems (requested)
+ (defun sysdef-preloaded-system-search (requested)
(let ((name (coerce-name requested)))
(multiple-value-bind (keys foundp) (gethash name *preloaded-systems*)
(when foundp
@@ -6783,7 +6787,7 @@
#:circular-dependency #:circular-dependency-actions
#:node-for #:needed-in-image-p
#:action-index #:action-planned-p #:action-valid-p
- #:plan-record-dependency #:visiting-action-p
+ #:plan-record-dependency
#:normalize-forced-systems #:action-forced-p #:action-forced-not-p
#:map-direct-dependencies #:reduce-direct-dependencies #:direct-dependencies
#:visit-dependencies #:compute-action-stamp #:traverse-action
@@ -7218,12 +7222,11 @@
:asdf/find-system :asdf/find-component :asdf/lisp-action :asdf/plan)
(:export
#:operate #:oos
- #:*systems-being-operated* #:*asdf-upgrade-already-attempted*
+ #:*systems-being-operated*
#:build-system
#:load-system #:load-systems #:compile-system #:test-system #:require-system
#:*load-system-operation* #:module-provide-asdf
- #:component-loaded-p #:already-loaded-systems
- #:upgrade-asdf #:cleanup-upgraded-asdf #:*post-upgrade-hook*))
+ #:component-loaded-p #:already-loaded-systems))
(in-package :asdf/operate)
(with-upgradability ()
@@ -7374,7 +7377,7 @@
(clrhash *systems-being-defined*)
(dolist (s l) (find-system s nil)))))
- (pushnew 'restart-upgraded-asdf *post-upgrade-restart-hook*))
+ (register-hook-function '*post-upgrade-restart-hook* 'restart-upgraded-asdf))
;;;; ---------------------------------------------------------------------------
@@ -7700,11 +7703,11 @@
(:recycle :asdf/source-registry :asdf)
(:use :asdf/common-lisp :asdf/driver :asdf/upgrade :asdf/find-system)
(:export
- #:*source-registry* #:*source-registry-parameter* #:*default-source-registries*
+ #:*source-registry-parameter* #:*default-source-registries*
#:invalid-source-registry
- #:source-registry #:source-registry-initialized-p
+ #:source-registry-initialized-p
#:initialize-source-registry #:clear-source-registry #:*source-registry*
- #:disable-source-registry #:ensure-source-registry #:*source-registry-parameter*
+ #:ensure-source-registry #:*source-registry-parameter*
#:*default-source-registry-exclusions* #:*source-registry-exclusions*
#:*wild-asd* #:directory-asd-files #:register-asd-directory
#:collect-asds-in-directory #:collect-sub*directories-asd-files
@@ -8795,9 +8798,7 @@
#:monolithic-concatenate-source-op
#:monolithic-load-concatenated-source-op
#:monolithic-compile-concatenated-source-op
- #:monolithic-load-compiled-concatenated-source-op
- #:component-concatenated-source-file
- #:concatenated-source-file))
+ #:monolithic-load-compiled-concatenated-source-op))
(in-package :asdf/concatenate-source)
;;;
@@ -9094,7 +9095,7 @@
#:component #:parent-component #:child-component #:system #:module
#:file-component #:source-file #:c-source-file #:java-source-file
#:cl-source-file #:cl-source-file.cl #:cl-source-file.lsp
- #:static-file #:doc-file #:html-file :text-file
+ #:static-file #:doc-file #:html-file
#:source-file-type
#:component-children ; component accessors
@@ -9123,8 +9124,8 @@
#:system-source-directory
#:system-relative-pathname
#:system-homepage
+ #:system-mailto
#:system-bug-tracker
- #:system-developers-email
#:system-long-name
#:system-source-control
#:map-systems
More information about the armedbear-cvs
mailing list