Commit e641dd25 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.26.58: Fix ECL breakage introduced by previous output-files/input-files refactoring.

parent 0d20c719
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.57" ;; to be automatically updated by bin/bump-revision :version "2.26.58" ;; to be automatically updated by bin/bump-revision
:depends-on () :depends-on ()
:components :components
((:file "asdf"))) ((:file "asdf")))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.57: Another System Definition Facility. ;;; This is ASDF 2.26.58: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
;; "2.345.6" would be a development version in the official upstream ;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345 ;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.57") (asdf-version "2.26.58")
(existing-asdf (find-class 'component nil)) (existing-asdf (find-class 'component nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version))) (already-there (equal asdf-version existing-version)))
...@@ -2657,8 +2657,8 @@ in some previous image, or T if it needs to be done.") ...@@ -2657,8 +2657,8 @@ in some previous image, or T if it needs to be done.")
#+mkcl (o (compile-file-pathname i :fasl-p nil))) ;; object file #+mkcl (o (compile-file-pathname i :fasl-p nil))) ;; object file
#+ecl (if (use-ecl-byte-compiler-p) #+ecl (if (use-ecl-byte-compiler-p)
(list f) (list f)
(list (compile-file-pathname i :type :object) f)) (list f (compile-file-pathname i :type :object)))
#+mkcl (list o f) #+mkcl (list f o)
#-(or ecl mkcl) (list f))) #-(or ecl mkcl) (list f)))
(defmethod component-depends-on ((o compile-op) (c component)) (defmethod component-depends-on ((o compile-op) (c component))
...@@ -4600,17 +4600,17 @@ with a different configuration, so the configuration would be re-read then." ...@@ -4600,17 +4600,17 @@ with a different configuration, so the configuration would be re-read then."
(setf *compile-op-compile-file-function* 'compile-file-keeping-object) (setf *compile-op-compile-file-function* 'compile-file-keeping-object)
(defun* compile-file-keeping-object (input-file &rest keys &key &allow-other-keys) (defun* compile-file-keeping-object (input-file &rest keys &key output-file &allow-other-keys)
(#+ecl if #+ecl (use-ecl-byte-compiler-p) #+ecl (apply 'compile-file* input-file keys) (#+ecl if #+ecl (use-ecl-byte-compiler-p) #+ecl (apply 'compile-file* input-file keys)
#+mkcl progn #+mkcl progn
(multiple-value-bind (object-file flags1 flags2) (multiple-value-bind (object-file flags1 flags2)
(apply 'compile-file* input-file (apply 'compile-file* input-file
#+ecl :system-p #+ecl t #+mkcl :fasl-p #+mkcl nil keys) #+ecl :system-p #+ecl t #+mkcl :fasl-p #+mkcl nil
:output-file (compile-file-pathname
output-file . #+ecl (:type :object) #+mkcl (:fasl-p nil)) keys)
(values (and object-file (values (and object-file
(compiler::build-fasl (compiler::build-fasl
(compile-file-pathname object-file output-file #+ecl :lisp-files #+mkcl :lisp-object-files (list object-file))
#+ecl :type #+ecl :fasl #+mkcl :fasl-p #+mkcl t)
#+ecl :lisp-files #+mkcl :lisp-object-files (list object-file))
object-file) object-file)
flags1 flags1
flags2))))) flags2)))))
......
...@@ -67,6 +67,9 @@ ...@@ -67,6 +67,9 @@
(load old-asdf)))) (load old-asdf))))
(defun configure-asdf () (defun configure-asdf ()
#+ecl (eval `(trace ,@(loop :for s :in '(:COMPILE-FILE* :perform-lisp-compilation)
:collect (find-symbol (string s) :asdf))
c::builder))
(funcall (find-symbol (string :initialize-source-registry) :asdf) (funcall (find-symbol (string :initialize-source-registry) :asdf)
`(:source-registry :ignore-inherited-configuration)) `(:source-registry :ignore-inherited-configuration))
(let ((registry (find-symbol (string :*central-registry*) :asdf))) (let ((registry (find-symbol (string :*central-registry*) :asdf)))
...@@ -157,6 +160,7 @@ is bound, write a message and exit on an error. If ...@@ -157,6 +160,7 @@ is bound, write a message and exit on an error. If
#+sbcl (sb-debug:backtrace 69) #+sbcl (sb-debug:backtrace 69)
#+clozure (ccl:print-call-history :count 69 :start-frame-number 1) #+clozure (ccl:print-call-history :count 69 :start-frame-number 1)
#+clisp (system::print-backtrace) #+clisp (system::print-backtrace)
#+ecl (si::tpl-backtrace)
(format *error-output* "~&ABORTING:~% ~A~%" c) (format *error-output* "~&ABORTING:~% ~A~%" c)
(finish-output *error-output*) (finish-output *error-output*)
(finish-output *standard-output*) (finish-output *standard-output*)
...@@ -261,7 +265,6 @@ outputs a tag plus a list of variable and their values, returns the last value" ...@@ -261,7 +265,6 @@ outputs a tag plus a list of variable and their values, returns the last value"
(DBG :script-support *package* *test-directory* *asdf-directory* *asdf-lisp* *asdf-fasl* (DBG :script-support *package* *test-directory* *asdf-directory* *asdf-lisp* *asdf-fasl*
)) ))
#| #|
(DBG :cas o c just-done plan stamp-lookup out-files in-files out-op op-time dep-stamp out-stamps in-stamps missing-in missing-out all-present earliest-out latest-in up-to-date-p done-stamp (operation-done-p o c)) (DBG :cas o c just-done plan stamp-lookup out-files in-files out-op op-time dep-stamp out-stamps in-stamps missing-in missing-out all-present earliest-out latest-in up-to-date-p done-stamp (operation-done-p o c))
|# |#
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
(assert-equal (assert-equal
(output-files mcso sys) (output-files mcso sys)
(input-files mccso sys)) (input-files mccso sys))
(assert-equal (assert-equal ;; on ECL, we get un-equal pathnames.
(output-file mccso sys) (princ-to-string (output-file mccso sys))
(apply-output-translations (compile-file-pathname (asdf::subpathname *test-directory* "test-concatenate-source.lisp")))) (princ-to-string (apply-output-translations (compile-file-pathname (asdf::subpathname *test-directory* "test-concatenate-source.lisp")))))
(assert-equal (assert-equal
(output-files mccso sys) (output-files mccso sys)
(input-files mlccso sys)) (input-files mlccso sys))
......
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
(handler-bind ((error (lambda (c) (handler-bind ((error (lambda (c)
(format t "~&Caught error ~s" c) (format t "~&Caught error ~s" c)
(setf *caught-error* t) (setf *caught-error* t)
(asdf:run-shell-command (asdf::concatenate-files
"cp try-reloading-dependency.hidden try-reloading-dependency.asd") '("try-reloading-dependency.hidden")
"try-reloading-dependency.asd")
(DBG "trlc1 5") (DBG "trlc1 5")
(multiple-value-bind (name mode) (multiple-value-bind (name mode)
(find-symbol (symbol-name 'retry) :asdf) (find-symbol (symbol-name 'retry) :asdf)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment