Changeset 925


Ignore:
Timestamp:
Feb 16, 2005, 7:53:11 PM (17 years ago)
Author:
bryan
Message:

import latest ASDF from clocc repository.

identical (besides revision number) to asdf.lisp found in SBCL 0.8.18.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/ccl/tools/asdf.lisp

    r503 r925  
    9191           
    9292           #:operation-error #:compile-failed #:compile-warned #:compile-error
     93           #:error-component #:error-operation
    9394           #:system-definition-error
    9495           #:missing-component
     
    169170   (operation :reader error-operation :initarg :operation))
    170171  (:report (lambda (c s)
    171              (format s (formatter "~@<erred while invoking ~A on ~A~@:>")
     172             (format s "~@<erred while invoking ~A on ~A~@:>"
    172173                     (error-operation c) (error-component c)))))
    173174(define-condition compile-error (operation-error) ())
     
    200201
    201202(defmethod print-object ((c missing-dependency) s)
    202   (format s (formatter "~@<~A, required by ~A~@:>")
    203           (call-next-method c nil)
    204           (missing-required-by c)))
     203  (format s "~@<~A, required by ~A~@:>"
     204          (call-next-method c nil) (missing-required-by c)))
    205205
    206206(defun sysdef-error (format &rest arguments)
     
    210210
    211211(defmethod print-object ((c missing-component) s)
    212   (format s (formatter "~@<component ~S not found~
    213                         ~@[ or does not match version ~A~]~
    214                         ~@[ in ~A~]~@:>")
     212  (format s "~@<component ~S not found~
     213             ~@[ or does not match version ~A~]~
     214             ~@[ in ~A~]~@:>"
    215215          (missing-requires c)
    216216          (missing-version c)
     
    327327     (symbol (string-downcase (symbol-name name)))
    328328     (string name)
    329      (t (sysdef-error (formatter "~@<invalid component designator ~A~@:>")
    330                       name))))
     329     (t (sysdef-error "~@<invalid component designator ~A~@:>" name))))
    331330
    332331;;; for the sake of keeping things reasonably neat, we adopt a
     
    365364               (or (not in-memory)
    366365                   (< (car in-memory) (file-write-date on-disk))))
    367       (let ((*package* (make-package (gensym (package-name #.*package*))
     366      (let ((*package* (make-package (gensym #.(package-name *package*))
    368367                                     :use '(:cl :asdf))))
    369368        (format *verbose-out*
    370                 (formatter "~&~@<; ~@;loading system definition from ~A into ~A~@:>~%")
     369                "~&~@<; ~@;loading system definition from ~A into ~A~@:>~%"
    371370                ;; FIXME: This wants to be (ENOUGH-NAMESTRING
    372371                ;; ON-DISK), but CMUCL barfs on that.
     
    381380
    382381(defun register-system (name system)
    383   (format *verbose-out*
    384           (formatter "~&~@<; ~@;registering ~A as ~A~@:>~%") system name)
     382  (format *verbose-out* "~&~@<; ~@;registering ~A as ~A~@:>~%" system name)
    385383  (setf (gethash (coerce-name  name) *defined-systems*)
    386384        (cons (get-universal-time) system)))
     
    677675(defmethod perform ((operation operation) (c source-file))
    678676  (sysdef-error
    679    (formatter "~@<required method PERFORM not implemented~
    680                for operation ~A, component ~A~@:>")
     677   "~@<required method PERFORM not implemented ~
     678    for operation ~A, component ~A~@:>"
    681679   (class-of operation) (class-of c)))
    682680
     
    685683
    686684(defmethod explain ((operation operation) (component component))
    687   (format *verbose-out* "~&;;; ~A on ~A~%"
    688           operation component))
     685  (format *verbose-out* "~&;;; ~A on ~A~%" operation component))
    689686
    690687;;; compile-op
     
    707704;;; its answers, in case it has been overridden for site policy
    708705(defmethod perform ((operation compile-op) (c cl-source-file))
     706  #-:broken-fasl-loader
    709707  (let ((source-file (component-pathname c))
    710708        (output-file (car (output-files operation c))))
     
    716714        (case (operation-on-warnings operation)
    717715          (:warn (warn
    718                   (formatter "~@<COMPILE-FILE warned while ~
    719                               performing ~A on ~A.~@:>")
     716                  "~@<COMPILE-FILE warned while performing ~A on ~A.~@:>"
    720717                  operation c))
    721718          (:error (error 'compile-warned :component c :operation operation))
     
    724721        (case (operation-on-failure operation)
    725722          (:warn (warn
    726                   (formatter "~@<COMPILE-FILE failed while ~
    727                               performing ~A on ~A.~@:>")
     723                  "~@<COMPILE-FILE failed while performing ~A on ~A.~@:>"
    728724                  operation c))
    729725          (:error (error 'compile-failed :component c :operation operation))
     
    733729
    734730(defmethod output-files ((operation compile-op) (c cl-source-file))
    735   (list (compile-file-pathname (component-pathname c))))
     731  #-:broken-fasl-loader (list (compile-file-pathname (component-pathname c)))
     732  #+:broken-fasl-loader (list (component-pathname c)))
    736733
    737734(defmethod perform ((operation compile-op) (c static-file))
     
    818815                 :report
    819816                 (lambda (s)
    820                    (format s
    821                            (formatter "~@<Retry performing ~S on ~S.~@:>")
     817                   (format s "~@<Retry performing ~S on ~S.~@:>"
    822818                           op component)))
    823819               (accept ()
     
    825821                 (lambda (s)
    826822                   (format s
    827                            (formatter "~@<Continue, treating ~S on ~S as ~
    828                                        having been successful.~@:>")
     823                           "~@<Continue, treating ~S on ~S as ~
     824                            having been successful.~@:>"
    829825                           op component))
    830826                 (setf (gethash (type-of op)
     
    879875
    880876(defun class-for-type (parent type)
    881   (let ((class (find-class
    882                 (or (find-symbol (symbol-name type) *package*)
    883                     (find-symbol (symbol-name type) #.*package*)) nil)))
     877  (let ((class
     878         (find-class
     879          (or (find-symbol (symbol-name type) *package*)
     880              (find-symbol (symbol-name type) #.(package-name *package*)))
     881          nil)))
    884882    (or class
    885883        (and (eq type :file)
    886884             (or (module-default-component-class parent)
    887885                 (find-class 'cl-source-file)))
    888         (sysdef-error (formatter "~@<don't recognize component type ~A~@:>")
    889                       type))))
     886        (sysdef-error "~@<don't recognize component type ~A~@:>" type))))
    890887
    891888(defun maybe-add-tree (tree op1 op2 c)
     
    10541051                                 :input nil :output *verbose-out*
    10551052                                 :wait t)))
    1056 
    1057     #-(or openmcl clisp lispworks allegro scl cmu sbcl)
     1053    #+ecl ;; courtesy of Juan Jose Garcia Ripoll
     1054    (si:system command)
     1055    #-(or openmcl clisp lispworks allegro scl cmu sbcl ecl)
    10581056    (error "RUN-SHELL-PROGRAM not implemented for this Lisp")
    10591057    ))
Note: See TracChangeset for help on using the changeset viewer.