Commit 0a6a0e77 authored by Robert Goldman's avatar Robert Goldman
Browse files

Merge branch 'master' into 'master' 

Two more changes for Genera

See merge request !172
parents 6e2df328 d6d7d423

bundle.lisp

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ which is probably not what you want; you probably need to tweak your output tran 
  (defmethod component-depends-on :around ((o image-op) (c system))

    (let* ((next (call-next-method))

           (deps (make-hash-table :test 'equal))

           (linkable (loop* :for (do . dcs) :in next :collect

           (linkable (loop :for (do . dcs) :in next :collect

                       (cons do

                             (loop :for dc :in dcs

                               :for dep = (and dc (resolve-dependency-spec c dc))

find-system.lisp

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
  (defmethod component-depends-on ((o define-op) (s system))

    `(;;NB: 1- ,@(system-defsystem-depends-on s)) ; Should be already included in the below.

      ;; 2- We don't call-next-method to avoid other methods

      ,@(loop* :for (o . c) :in (definition-dependency-list s) :collect (list o c))))

      ,@(loop :for (o . c) :in (definition-dependency-list s) :collect (list o c))))



  (defmethod component-depends-on ((o operation) (s system))

    `(,@(when (and (not (typep o 'define-op))

header.lisp

+1 −1
Original line number Diff line number Diff line 
;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-

;;; -*- mode: Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; Package: CL-USER ; buffer-read-only: t; -*-

;;; This is ASDF 3.3.4.14: Another System Definition Facility.

;;;

;;; Feedback, bug reports, and patches are all welcome:

output-translations.lisp

+13 −13
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ effectively disabling the output translation facility." 
       path)

      ((or pathname string)

       (ensure-output-translations)

       (loop* :with p = (resolve-symlinks* path)

       (loop :with p = (resolve-symlinks* path)

             :for (source destination) :in (car *output-translations*)

             :for root = (when (or (eq source t)

                                   (and (pathnamep source)

package-inferred-system.lisp

+11 −11
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ the DEFPACKAGE-FORM uses it or imports a symbol from it." 
    (assert (defpackage-form-p defpackage-form))

    (remove-duplicates

     (while-collecting (dep)

       (loop* :for (option . arguments) :in (cddr defpackage-form) :do

       (loop :for (option . arguments) :in (cddr defpackage-form) :do

         (ecase option

           ((:use :mix :reexport :use-reexport :mix-reexport)

            (dolist (p arguments) (dep (string p))))
@@ -77,7 +77,7 @@ the DEFPACKAGE-FORM uses it or imports a symbol from it." 
            (dep (string (first arguments))))

           #+package-local-nicknames

           ((:local-nicknames)

                 (loop* :for (nil actual-package-name) :in arguments :do

            (loop :for (nil actual-package-name) :in arguments :do

              (dep (string actual-package-name))))

           ((:nicknames :documentation :shadow :export :intern :unintern :recycle)))))

     :from-end t :test 'equal))