2.26.130: fix compile-file* for ecl_bytecodes

Also, make script re-loadable in a debug session.

diff --git a/asdf.asd b/asdf.asd
index 1d8e18a..a9225af 100644 (file)
--- a/asdf.asd
+++ b/asdf.asd
@@ -15,7 +15,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.26.129" ;; to be automatically updated by make bump-version
+  :version "2.26.130" ;; to be automatically updated by make bump-version
   :depends-on ()
   :components ((:module "build" :components ((:file "asdf"))))
   :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem))))

diff --git a/header.lisp b/header.lisp
index 507b4f6..c1daecc 100644 (file)
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.26.129: Another System Definition Facility.
+;;; This is ASDF 2.26.130: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.

diff --git a/lisp-build.lisp b/lisp-build.lisp
index 4f31d58..786d4d7 100644 (file)
--- a/lisp-build.lisp
+++ b/lisp-build.lisp
@@ -448,10 +448,16 @@ If WARNINGS-FILE is defined, deferred warnings are saved to that file.
 On ECL or MKCL, it creates both the linkable object and loadable fasl files.
 On implementations that erroneously do not recognize standard keyword arguments,
 it will filter them appropriately."
+  #+ecl (when (and object-file (equal (compile-file-type) (pathname object-file)))
+          (format t "Whoa, some funky ASDF upgrade switched ~S calling convention for ~S and ~S~%"
+                  'compile-file* output-file object-file)
+          (rotatef output-file object-file))
   (let* ((keywords (remove-plist-keys
-                    `(:compile-check :warnings-file #+(or ecl mkcl) :object-file
+                    `(:compile-check :warnings-file #+(or ecl mkcl) :object-file :output-file
                       #+gcl<2.7 ,@'(:external-format :print :verbose)) keys))
-         (output-file (apply 'compile-file-pathname* input-file :output-file output-file keywords))
+         (output-file
+           (or output-file
+               (apply 'compile-file-pathname* input-file :output-file output-file keywords)))
          #+ecl
          (object-file
            (unless (use-ecl-byte-compiler-p)
@@ -462,17 +468,13 @@ it will filter them appropriately."
            (or object-file
                (compile-file-pathname output-file :fasl-p nil)))
          (tmp-file (tmpize-pathname output-file)))
-    #+ecl (when (and object-file (equal (compile-file-type) (pathname object-file)))
-            (format t "Whoa, funky upgrade API switching happening in ~S with ~S ~S~%"
-                    'compile-file* output-file object-file)
-            (rotatef output-file object-file))
     (multiple-value-bind (output-truename warnings-p failure-p)
         (with-saved-deferred-warnings (warnings-file)
           (or #-(or ecl mkcl) (apply 'compile-file input-file :output-file tmp-file keywords)
               #+ecl (apply 'compile-file input-file :output-file
                            (if object-file
                                (list* object-file :system-p t keywords)
-                               (list* output-file keywords)))
+                               (list* tmp-file keywords)))
               #+mkcl (apply 'compile-file input-file
                             :output-file object-file :fasl-p nil keywords)))
       (cond

diff --git a/test/asdf-pathname-test.script b/test/asdf-pathname-test.script
index 8d06d5e..e8bb1cd 100644 (file)
--- a/test/asdf-pathname-test.script
+++ b/test/asdf-pathname-test.script
@@ -1,7 +1,7 @@
 ;;; -*- Lisp -*-
 
 (in-package :asdf-test)
-(load-asdf)
+
 
 ;;(setf *unspecific-pathname-type* nil)
 

diff --git a/test/run-tests.sh b/test/run-tests.sh
index b21c050..e401ec5 100755 (executable)
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -90,7 +90,7 @@ do_tests() {
       echo "Testing: $i" >&2
       test_count=`expr "$test_count" + 1`
       rm -f ~/.cache/common-lisp/"`pwd`"/* || true
-      if DO $cmd $debugp $eval "(load \"script-support.lisp\")" $eval "(asdf-test::with-test () (load \"$i\"))" ; then
+      if DO $cmd $debugp $eval "(load \"script-support.lisp\")" $eval "(asdf-test::load-asdf)" $eval "(asdf-test::with-test () (load \"$i\"))" ; then
         echo "Using $command, $i passed" >&2
        test_pass=`expr "$test_pass" + 1`
       else
@@ -102,7 +102,7 @@ do_tests() {
         echo "or more interactively (and maybe with rlwrap or in emacs), start with:" >&2
         echo "(cd test ; $cmd )" >&2
         echo "then copy/paste:" >&2
-        echo "'(#.(load \"script-support.lisp\") #.(asdf-test::da) #.(asdf-test::with-test () (load \"$i\")))" >&2
+        echo "'(#.(load \"script-support.lisp\") #.(asdf-test::da) #.(load-asdf) #.(load \"$i\"))" >&2
       fi
       echo >&2
       echo >&2

diff --git a/test/test-around-compile.script b/test/test-around-compile.script
index 299c12f..babd00e 100644 (file)
--- a/test/test-around-compile.script
+++ b/test/test-around-compile.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (defun call-in-base-2 (thunk)
   (let ((*read-base* 2))

diff --git a/test/test-builtin-source-file-type.script b/test/test-builtin-source-file-type.script
index 21536a4..058a251 100644 (file)
--- a/test/test-builtin-source-file-type.script
+++ b/test/test-builtin-source-file-type.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 ;;(trace source-file-type)
 

diff --git a/test/test-bundle.script b/test/test-bundle.script
index a23144f..04c760e 100644 (file)
--- a/test/test-bundle.script
+++ b/test/test-bundle.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 (in-package :asdf-test)
 
 ;;;---------------------------------------------------------------------------

diff --git a/test/test-compile-file-failure.script b/test/test-compile-file-failure.script
index e3b7ca5..51dfb74 100644 (file)
--- a/test/test-compile-file-failure.script
+++ b/test/test-compile-file-failure.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (progn
  #-gcl<2.7

diff --git a/test/test-concatenate-source.script b/test/test-concatenate-source.script
index b096bdb..6c3781f 100644 (file)
--- a/test/test-concatenate-source.script
+++ b/test/test-concatenate-source.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (def-test-system :test-concatenate-source
   :depends-on (:file3-only)

diff --git a/test/test-configuration.script b/test/test-configuration.script
index a7342b1..1682c87 100644 (file)
--- a/test/test-configuration.script
+++ b/test/test-configuration.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (in-package :asdf)
 (use-package :asdf-test)

diff --git a/test/test-encodings.script b/test/test-encodings.script
index d4f37b2..64957e4 100644 (file)
--- a/test/test-encodings.script
+++ b/test/test-encodings.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (defparameter *lambda-string* nil)
 

diff --git a/test/test-force.script b/test/test-force.script
index 584896f..014a4d1 100644 (file)
--- a/test/test-force.script
+++ b/test/test-force.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (asdf:operate 'asdf:load-op 'test-force)
 

diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script
index 317f5f8..11c33af 100644 (file)
--- a/test/test-logical-pathname.script
+++ b/test/test-logical-pathname.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 #-gcl<2.7
 (setf (logical-pathname-translations "ASDF")

diff --git a/test/test-missing-lisp-file.script b/test/test-missing-lisp-file.script
index b715463..317794f 100644 (file)
--- a/test/test-missing-lisp-file.script
+++ b/test/test-missing-lisp-file.script
@@ -7,7 +7,7 @@
 ;;;---------------------------------------------------------------------------
 
 
-(load-asdf)
+
 
 
 (def-test-system test-missing-lisp-file

diff --git a/test/test-module-depend.script b/test/test-module-depend.script
index db7842e..6ba5c56 100644 (file)
--- a/test/test-module-depend.script
+++ b/test/test-module-depend.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (asdf:load-system 'test-module-depend)
 

diff --git a/test/test-module-excessive-depend.script b/test/test-module-excessive-depend.script
index dc938bc..1a71858 100644 (file)
--- a/test/test-module-excessive-depend.script
+++ b/test/test-module-excessive-depend.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 ;;;---------------------------------------------------------------------------
 ;;; Here's what we are trying to test.  Let us say we have a system X that

diff --git a/test/test-module-pathnames.script b/test/test-module-pathnames.script
index f2fb061..43ce911 100644 (file)
--- a/test/test-module-pathnames.script
+++ b/test/test-module-pathnames.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (progn
  (asdf:load-system 'test-module-pathnames)

diff --git a/test/test-multiple.script b/test/test-multiple.script
index 649bba2..2680c93 100644 (file)
--- a/test/test-multiple.script
+++ b/test/test-multiple.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (in-package :asdf)
 (use-package :asdf-test)

diff --git a/test/test-nested-components.script b/test/test-nested-components.script
index 9f3f0c3..933fd9e 100644 (file)
--- a/test/test-nested-components.script
+++ b/test/test-nested-components.script
@@ -3,7 +3,7 @@
 ;;; check that added nesting via modules doesn't confuse ASDF
 
 
-(load-asdf)
+
 
 (progn
  (setf asdf:*central-registry* nil)

diff --git a/test/test-package.script b/test/test-package.script
index c6a3f9e..b8c1b68 100644 (file)
--- a/test/test-package.script
+++ b/test/test-package.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 (in-package :cl-user)
 (asdf-test::with-test ()
  (defun module () 1)

diff --git a/test/test-program.script b/test/test-program.script
index 8487524..6db1a51 100644 (file)
--- a/test/test-program.script
+++ b/test/test-program.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (progn
 

diff --git a/test/test-redundant-recompile.asd b/test/test-redundant-recompile.asd
deleted file mode 100644 (file)
index a69d558..0000000
--- a/test/test-redundant-recompile.asd
+++ /dev/null
@@ -1,16 +0,0 @@
-;;; -*- Lisp -*-
-(asdf:defsystem test-redundant-recompile
-  :components ((:file "file2" :in-order-to ((compile-op (load-op "file1"))
-                                            (load-op (load-op "file1"))))
-               (:file "file1")))
-
-#|
-;;;This test system definition attempts to replicate the excess dependencies
-;;;that seem to give rise to launchpad bug 590517
-;;;(https://bugs.launchpad.net/asdf/+bug/590517)
-
-1) from clean, check that all fasl files build and that some function
-   defined in the second file is present
-
-2) load again.  Check to make sure that nothing is recompiled.
-|#

diff --git a/test/test-redundant-recompile.script b/test/test-redundant-recompile.script
index 52d9257..81cd198 100644 (file)
--- a/test/test-redundant-recompile.script
+++ b/test/test-redundant-recompile.script
@@ -1,8 +1,22 @@
 ;;; -*- Lisp -*-
+#|
+;;;This test system definition attempts to replicate the excess dependencies
+;;;that seem to give rise to launchpad bug 590517
+;;;(https://bugs.launchpad.net/asdf/+bug/590517)
 
-(load-asdf)
+1) from clean, check that all fasl files build and that some function
+   defined in the second file is present
 
-(asdf:operate 'asdf:load-op 'test-redundant-recompile)
+2) load again.  Check to make sure that nothing is recompiled.
+|#
+
+(def-test-system test-redundant-recompile
+  :components ((:file "file2" :in-order-to ((compile-op (load-op "file1"))
+                                            (load-op (load-op "file1"))))
+               (:file "file1")))
+
+
+(load-system 'test-redundant-recompile)
 ;; test that it compiled
 (defparameter file1 (test-fasl "file1"))
 (defparameter file2 (test-fasl "file2"))

diff --git a/test/test-retry-loading-component-1.script b/test/test-retry-loading-component-1.script
index 871fadf..a6e87dc 100644 (file)
--- a/test/test-retry-loading-component-1.script
+++ b/test/test-retry-loading-component-1.script
@@ -3,7 +3,7 @@
 ;;; test asdf:try-recompiling restart
 
 
-(load-asdf)
+
 (defvar *caught-error* nil)
 (progn
  (DBG "trlc1 1")

diff --git a/test/test-run-program.script b/test/test-run-program.script
index 2c7ffa2..e84dc1a 100644 (file)
--- a/test/test-run-program.script
+++ b/test/test-run-program.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 ;;; TODO: write tests for run-program/ instead -- and/or
 ;;; import those from the original xcvb-driver-test

diff --git a/test/test-samedir-modules.script b/test/test-samedir-modules.script
index b9ec483..6e31146 100644 (file)
--- a/test/test-samedir-modules.script
+++ b/test/test-samedir-modules.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (DBG "loading test-samedir-modules")
 (asdf:operate 'asdf:load-op 'test-samedir-modules)

diff --git a/test/test-source-file-type.script b/test/test-source-file-type.script
index e924e1d..2d93ebd 100644 (file)
--- a/test/test-source-file-type.script
+++ b/test/test-source-file-type.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 ;;(trace asdf::source-file-type asdf::source-file-explicit-type)
 

diff --git a/test/test-static-and-serial.script b/test/test-static-and-serial.script
index 56cc2e4..e075e40 100644 (file)
--- a/test/test-static-and-serial.script
+++ b/test/test-static-and-serial.script
@@ -4,7 +4,7 @@ make sure that serial t and static-files
 don't cause full rebuilds all the time...
 |#
 
-(load-asdf)
+
 
 (in-package :asdf-test)
 

diff --git a/test/test-sysdef-asdf.script b/test/test-sysdef-asdf.script
index 4c55519..60f0c71 100644 (file)
--- a/test/test-sysdef-asdf.script
+++ b/test/test-sysdef-asdf.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (progn
  (asdf:initialize-source-registry '(:source-registry :ignore-inherited-configuration))

diff --git a/test/test-system-pathnames.script b/test/test-system-pathnames.script
index 606b0d0..94722b7 100644 (file)
--- a/test/test-system-pathnames.script
+++ b/test/test-system-pathnames.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (progn
  (asdf:load-system 'test-system-pathnames)

diff --git a/test/test-touch-system-1.script b/test/test-touch-system-1.script
index 8d1cf14..cd21863 100644 (file)
--- a/test/test-touch-system-1.script
+++ b/test/test-touch-system-1.script
@@ -3,7 +3,7 @@
 ;;; test system def reloading if touched
 ;;; system that can be found using *system-definition-search-functions*
 
-(load-asdf)
+
 
 (defun system-load-time (name)
   (if-let (data (asdf::system-registered-p name))

diff --git a/test/test-touch-system-2.script b/test/test-touch-system-2.script
index 6078bfe..1065981 100644 (file)
--- a/test/test-touch-system-2.script
+++ b/test/test-touch-system-2.script
@@ -4,7 +4,7 @@
 ;;; system that canNOT be found using *system-definition-search-functions*
 
 
-(load-asdf)
+
 (progn
  (flet ((system-load-time (name)
           (let ((data (asdf::system-registered-p name)))

diff --git a/test/test-try-recompiling-1.script b/test/test-try-recompiling-1.script
index 3906248..4e4a102 100644 (file)
--- a/test/test-try-recompiling-1.script
+++ b/test/test-try-recompiling-1.script
@@ -3,7 +3,7 @@
 ;;; test asdf:try-recompiling restart
 
 
-(load-asdf)
+
 (defparameter *caught-error* nil)
 
 (delete-file-if-exists (test-fasl "try-recompiling-1"))

diff --git a/test/test-urls-1.script b/test/test-urls-1.script
index a5e12a9..0da1d9b 100644 (file)
--- a/test/test-urls-1.script
+++ b/test/test-urls-1.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 #+scl
 (require :http-library)
 

diff --git a/test/test-urls-2.script b/test/test-urls-2.script
index 532136a..f7b1435 100644 (file)
--- a/test/test-urls-2.script
+++ b/test/test-urls-2.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 #+scl
 (require :http-library)
 

diff --git a/test/test-utilities.script b/test/test-utilities.script
index 4ff33cd..435540c 100644 (file)
--- a/test/test-utilities.script
+++ b/test/test-utilities.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (in-package :asdf)
 (use-package :asdf-test)

diff --git a/test/test-version.script b/test/test-version.script
index 250e0c9..0c5d32e 100644 (file)
--- a/test/test-version.script
+++ b/test/test-version.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (progn
  (def-test-system :versioned-system-1

diff --git a/test/test-weakly-depends-on-present.script b/test/test-weakly-depends-on-present.script
index 1296e70..4ff0fdf 100644 (file)
--- a/test/test-weakly-depends-on-present.script
+++ b/test/test-weakly-depends-on-present.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 ;;;---------------------------------------------------------------------------
 ;;; Check to see if a weakly-depended-on system, which is present in the

diff --git a/test/test-weakly-depends-on-unpresent.script b/test/test-weakly-depends-on-unpresent.script
index da079d9..8896388 100644 (file)
--- a/test/test-weakly-depends-on-unpresent.script
+++ b/test/test-weakly-depends-on-unpresent.script
@@ -7,7 +7,7 @@
 ;;;---------------------------------------------------------------------------
 
 
-(load-asdf)
+
 
 (asdf:load-system 'test-weakly-depends-on-unpresent)
 ;; test that it compiled

diff --git a/test/test-xach-update-bug.script b/test/test-xach-update-bug.script
index 161f907..563fabb 100644 (file)
--- a/test/test-xach-update-bug.script
+++ b/test/test-xach-update-bug.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 #+gcl (trace load compile-file asdf:perform asdf::perform-plan)
 (progn

diff --git a/test/test1.script b/test/test1.script
index e35548f..4b25d44 100644 (file)
--- a/test/test1.script
+++ b/test/test1.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (touch-file (test-source "test1.asd") :offset -3600) ;; touch test1.asd an hour ago.
 (defparameter *date* (file-write-date (test-source "test1.asd")))

diff --git a/test/test2.script b/test/test2.script
index b175caf..1101b6a 100644 (file)
--- a/test/test2.script
+++ b/test/test2.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (DBG "test2: loading test2b1")
 (asdf:load-system 'test2b1)

diff --git a/test/test3.script b/test/test3.script
index ba4e222..f57636c 100644 (file)
--- a/test/test3.script
+++ b/test/test3.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 
 (defparameter *fasl1* (test-fasl "file1.lisp"))
 (defparameter *fasl2* (test-fasl "file2.lisp"))

diff --git a/test/test8.script b/test/test8.script
index a76c320..eb01c6b 100644 (file)
--- a/test/test8.script
+++ b/test/test8.script
@@ -3,7 +3,7 @@
 ;;; make sure we get a missing-component error
 
 
-(load-asdf)
+
 (in-package :asdf-test)
 
 (progn

diff --git a/test/test9.script b/test/test9.script
index 4463130..1598f5a 100644 (file)
--- a/test/test9.script
+++ b/test/test9.script
@@ -3,7 +3,7 @@
 ;;; make sure we get a missing-component-of-version error
 
 
-(load-asdf)
+
 
 (progn
   (handler-case

diff --git a/test/wild-module.script b/test/wild-module.script
index 2bf412b..48c372e 100644 (file)
--- a/test/wild-module.script
+++ b/test/wild-module.script
@@ -1,6 +1,6 @@
 ;;; -*- Lisp -*-
 
-(load-asdf)
+
 (progn
  (load (asdf::subpathname *asdf-directory* "contrib/wild-modules.lisp"))
  (def-test-system :wild-module

diff --git a/upgrade.lisp b/upgrade.lisp
index 1eab736..8c679a9 100644 (file)
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -35,7 +35,7 @@
          ;; "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.6.7" would be your seventh local modification of development version 2.345.6
-         (asdf-version "2.26.129")
+         (asdf-version "2.26.130")
          (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version))

diff --git a/version.lisp-expr b/version.lisp-expr
index 3a86b41..ad20ed5 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.129"
+"2.26.130"