Diff of /contrib/asdf/asdf.lisp [99b1e5] .. [82c6a8] Maximize Restore

  Switch to unified view

a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp
1
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
1
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
2
;;; This is ASDF 2.25.3: Another System Definition Facility.
2
;;; This is ASDF 2.26: Another System Definition Facility.
3
;;;
3
;;;
4
;;; Feedback, bug reports, and patches are all welcome:
4
;;; Feedback, bug reports, and patches are all welcome:
5
;;; please mail to <asdf-devel@common-lisp.net>.
5
;;; please mail to <asdf-devel@common-lisp.net>.
6
;;; Note first that the canonical source for ASDF is presently
6
;;; Note first that the canonical source for ASDF is presently
7
;;; <URL:http://common-lisp.net/project/asdf/>.
7
;;; <URL:http://common-lisp.net/project/asdf/>.
...
...
116
         ;; Relying on its automation, the version is now redundantly present on top of this file.
116
         ;; Relying on its automation, the version is now redundantly present on top of this file.
117
         ;; "2.345" would be an official release
117
         ;; "2.345" would be an official release
118
         ;; "2.345.6" would be a development version in the official upstream
118
         ;; "2.345.6" would be a development version in the official upstream
119
         ;; "2.345.0.7" would be your seventh local modification of official release 2.345
119
         ;; "2.345.0.7" would be your seventh local modification of official release 2.345
120
         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
120
         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
121
         (asdf-version "2.25.3")
121
         (asdf-version "2.26")
122
         (existing-asdf (find-class 'component nil))
122
         (existing-asdf (find-class 'component nil))
123
         (existing-version *asdf-version*)
123
         (existing-version *asdf-version*)
124
         (already-there (equal asdf-version existing-version)))
124
         (already-there (equal asdf-version existing-version)))
125
    (unless (and existing-asdf already-there)
125
    (unless (and existing-asdf already-there)
126
      (when (and existing-asdf *asdf-verbose*)
126
      (when (and existing-asdf *asdf-verbose*)
...
...
2546
                  (format s "Recompile ~a and try loading it again"
2546
                  (format s "Recompile ~a and try loading it again"
2547
                          (component-name c)))
2547
                          (component-name c)))
2548
        (perform (make-sub-operation c o c 'compile-op) c)))))
2548
        (perform (make-sub-operation c o c 'compile-op) c)))))
2549
2549
2550
(defmethod perform ((o load-op) (c cl-source-file))
2550
(defmethod perform ((o load-op) (c cl-source-file))
2551
  (map () 'load
2551
  (map () #'load
2552
       #-(or ecl mkcl)
2552
       #-(or ecl mkcl)
2553
       (input-files o c)
2553
       (input-files o c)
2554
       #+(or ecl mkcl)
2554
       #+(or ecl mkcl)
2555
       (loop :for i :in (input-files o c)
2555
       (loop :for i :in (input-files o c)
2556
         :unless (string= (pathname-type i) "fas")
2556
         :unless (string= (pathname-type i) "fas")
...
...
3908
3908
3909
(defun* compile-file-pathname* (input-file &rest keys &key output-file &allow-other-keys)
3909
(defun* compile-file-pathname* (input-file &rest keys &key output-file &allow-other-keys)
3910
  (if (absolute-pathname-p output-file)
3910
  (if (absolute-pathname-p output-file)
3911
      ;; what cfp should be doing, w/ mp* instead of mp
3911
      ;; what cfp should be doing, w/ mp* instead of mp
3912
      (let* ((type (pathname-type (apply 'compile-file-pathname "x.lisp" keys)))
3912
      (let* ((type (pathname-type (apply 'compile-file-pathname "x.lisp" keys)))
3913
             (defaults (make-pathname
3913
       (defaults (make-pathname
3914
                        :type type :defaults (merge-pathnames* input-file))))
3914
          :type type :defaults (merge-pathnames* input-file))))
3915
        (merge-pathnames* output-file defaults))
3915
  (merge-pathnames* output-file defaults))
3916
      (apply-output-translations
3916
      (apply-output-translations
3917
       (apply 'compile-file-pathname input-file keys))))
3917
       (apply 'compile-file-pathname input-file
3918
        (if output-file keys (remove-keyword :output-file keys))))))
3918
3919
3919
(defun* tmpize-pathname (x)
3920
(defun* tmpize-pathname (x)
3920
  (make-pathname
3921
  (make-pathname
3921
   :name (strcat "ASDF-TMP-" (pathname-name x))
3922
   :name (strcat "ASDF-TMP-" (pathname-name x))
3922
   :defaults x))
3923
   :defaults x))