From dc23642254dde689fc8cd69292e703366757a5fe Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Mon, 18 Mar 2013 08:08:02 -0400 Subject: [PATCH] 2.32.16: fix monolithic-fasl-op, broken by previous class refactoring. --- Makefile | 3 +++ asdf.asd | 2 +- bundle.lisp | 10 +++++----- header.lisp | 2 +- test/run-tests.sh | 2 +- test/test-bundle.script | 9 +++++++-- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 8b168080..58d4f52d 100644 --- a/Makefile +++ b/Makefile @@ -147,6 +147,9 @@ test-all: doc test-all-lisps test-all-no-stop: -make doc ; for l in ${lisps} ; do make t l=$$l ; make u l=$$l ; done ; true +extract-all-tagged-asdf: + ./test/run-tests.sh -H + # Note that the debian git at git://git.debian.org/git/pkg-common-lisp/cl-asdf.git is stale, # as we currently build directly from upstream at git://common-lisp.net/projects/asdf/asdf.git debian-package: mrproper diff --git a/asdf.asd b/asdf.asd index a2a011ed..1d2bf64b 100644 --- a/asdf.asd +++ b/asdf.asd @@ -74,7 +74,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.32.15" ;; to be automatically updated by make bump-version + :version "2.32.16" ;; to be automatically updated by make bump-version :depends-on () #+asdf3 :encoding #+asdf3 :utf-8 ;; For most purposes, asdf itself specially counts as a builtin system. diff --git a/bundle.lisp b/bundle.lisp index 05079aec..2da6f0e2 100644 --- a/bundle.lisp +++ b/bundle.lisp @@ -397,7 +397,7 @@ s))))) #-(or ecl mkcl) - (defmethod perform ((o fasl-op) (c system)) + (defmethod perform ((o basic-fasl-op) (c system)) (let* ((input-files (input-files o c)) (fasl-files (remove (compile-file-type) input-files :key #'pathname-type :test-not #'equalp)) (non-fasl-files (remove (compile-file-type) input-files :key #'pathname-type :test #'equalp)) @@ -454,13 +454,13 @@ #+mkcl (with-upgradability () (defmethod perform ((o lib-op) (s system)) - (apply #'compiler::build-static-library (first output) + (apply #'compiler::build-static-library (output-file o c) :lisp-object-files (input-files o s) (bundle-op-build-args o))) - (defmethod perform ((o fasl-op) (s system)) - (apply #'compiler::build-bundle (second output) + (defmethod perform ((o basic-fasl-op) (s system)) + (apply #'compiler::build-bundle (output-file o c) ;; second??? :lisp-object-files (input-files o s) (bundle-op-build-args o))) - +} (defun bundle-system (system &rest args &key force (verbose t) version &allow-other-keys) (declare (ignore force verbose version)) (apply #'operate 'binary-op system args))) diff --git a/header.lisp b/header.lisp index b5ec85f9..bd183396 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.32.15: Another System Definition Facility. +;;; This is ASDF 2.32.16: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/test/run-tests.sh b/test/run-tests.sh index 7920e319..feb7876d 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -327,7 +327,7 @@ valid_upgrade_test_p () { run_upgrade_tests () { cd ${ASDFDIR} mkdir -p build/results - rm -f build/*.*f* uiop/*.*f* ## Remove stale FASLs from ASDF 1.x, especially when different implementations have same name + rm -f build/*.*f* uiop/*.*f* test/*.*f* ## Remove stale FASLs from ASDF 1.x, especially when different implementations have same name ASDF_OUTPUT_TRANSLATIONS="(:output-translations (\"${ASDFDIR}\" (\"${ASDFDIR}/build/fasls/\" :implementation \"asdf/\")) (t (\"${ASDFDIR}/build/fasls/\" :implementation \"root/\")) :ignore-inherited-configuration)" export ASDF_OUTPUT_TRANSLATIONS su=test/script-support.lisp diff --git a/test/test-bundle.script b/test/test-bundle.script index 04c760ef..0a3bfd32 100644 --- a/test/test-bundle.script +++ b/test/test-bundle.script @@ -20,15 +20,20 @@ (defparameter *bundle-1* (output-file 'fasl-op :test-bundle-1)) (defparameter *bundle-2* (output-file 'fasl-op :test-bundle-2)) +(defparameter *mono-bundle-2* (output-file 'monolithic-fasl-op :test-bundle-2)) (DBG :test-bundle *bundle-1* *bundle-2*) (assert-equal (list *bundle-2*) (input-files 'load-fasl-op :test-bundle-2)) (delete-file-if-exists *bundle-1*) (delete-file-if-exists *bundle-2*) +(delete-file-if-exists *mono-bundle-2*) (operate 'load-fasl-op :test-bundle-2) -;; Check that the bundles were indeed created. +(DBG "Check that the bundles were indeed created.") (assert (probe-file *bundle-2*)) (assert (probe-file *bundle-1*)) -;; Check that the files were indeed loaded. +(DBG "Check that the files were indeed loaded.") (assert (symbol-value (find-symbol* :*file1* :test-package))) (assert (symbol-value (find-symbol* :*file3* :test-package))) +(DBG "Now for the mono-fasl") +(operate 'monolithic-fasl-op :test-bundle-2) +(assert (probe-file *mono-bundle-2*)) diff --git a/upgrade.lisp b/upgrade.lisp index f6e84458..6e998bb4 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO ;; "3.4.5.67" would be a development version in the official upstream of 3.4.5. ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67 - (asdf-version "2.32.15") + (asdf-version "2.32.16") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index 1f140651..f51c8d06 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.32.15" +"2.32.16" -- GitLab