From 41ad564bbc0c7310977b5be1a0ac536bc23dd6b6 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Mon, 17 Mar 2014 15:11:19 -0400 Subject: [PATCH] Try to fix bitrotted prebuilt-system, based on initial MKCL support. prebuilt-system isn't currently tested, and will bitrot again if it is kept this way. --- TODO | 1 + bundle.lisp | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/TODO b/TODO index 174a06a8..bea53d0f 100644 --- a/TODO +++ b/TODO @@ -185,6 +185,7 @@ *** have a function verify-strict-asd that can verify a asd is pure lp#541562 Then if it passes, use load-strict-asd. If not, optionally issue a warning. Start migrating people toward that. +*** Include tests for prebuilt-system in test-bundle and in test-program. * Learn to use cl-grid-test ** So we can easily make sure ASDF changes don't break stuff, diff --git a/bundle.lisp b/bundle.lisp index 5df9499e..27696b57 100644 --- a/bundle.lisp +++ b/bundle.lisp @@ -353,22 +353,24 @@ itself.")) ;; operation on a system and its dependencies (defmethod trivial-system-p ((s prebuilt-system)) t) - (defmethod perform ((o lib-op) (c prebuilt-system)) + (defmethod perform ((o link-op) (c prebuilt-system)) nil) - (defmethod component-depends-on ((o lib-op) (c prebuilt-system)) - nil) + (defmethod perform ((o basic-fasl-op) (c prebuilt-system)) + nil)) - (defmethod component-depends-on ((o monolithic-lib-op) (c prebuilt-system)) + (defmethod perform ((o lib-op) (c prebuilt-system)) nil) - #+mkcl - (defmethod perform ((o fasl-op) (c prebuilt-system)) + (defmethod perform ((o dll-op) (c prebuilt-system)) + nil)) + + (defmethod component-depends-on ((o gather-op) (c prebuilt-system)) nil) - #+mkcl (defmethod output-files ((o lib-op) (c prebuilt-system)) - (list (prebuilt-system-static-library c)))) + (values (list (prebuilt-system-static-library c)) t)) + ;;; -- GitLab