From be50554ae4801fd4c4259869470ca20f2e3a3905 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Sat, 23 Mar 2013 23:08:21 -0400 Subject: [PATCH] 2.32.27: tweak an assertion. Also, stop trying to test asdf 1 on Allegro: it only brings grief for no good reason, since Allegro has been shipping ASDF 2 for some time. --- asdf.asd | 2 +- bundle.lisp | 3 +-- header.lisp | 2 +- test/run-tests.sh | 2 ++ upgrade.lisp | 2 +- version.lisp-expr | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/asdf.asd b/asdf.asd index 1f30bd9a..682496d7 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.26" ;; to be automatically updated by make bump-version + :version "2.32.27" ;; 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 38bda015..32392c11 100644 --- a/bundle.lisp +++ b/bundle.lisp @@ -394,9 +394,8 @@ (non-fasl-files (remove (compile-file-type) input-files :key #'pathname-type :test #'equalp)) (output-files (output-files o c)) (output-file (first output-files))) - ;;(unless input-files (format t "WTF no input-files for ~S on ~S !???" o c)) + (assert (eq (not input-files) (not output-files))) (when input-files - (assert output-files) (when non-fasl-files (error "On ~A, asdf-bundle can only bundle FASL files, but these were also produced: ~S" (implementation-type) non-fasl-files)) diff --git a/header.lisp b/header.lisp index ca60428f..d674a6d8 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.26: Another System Definition Facility. +;;; This is ASDF 2.32.27: 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 06381fa6..aa0536c5 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -302,6 +302,8 @@ valid_upgrade_test_p () { # It's damn slow. Also, for some reason, we punt on anything earlier than 2.25, # and only need to test it once, below for 2.24. abcl:1.*|abcl:2.00[0-9]:*|abcl:201[0-9]:*|abcl:2.2[0-3]:*) : ;; + # Skip allegro modern on 1.x -- fails for rpgoldman on his mac (!) + allegromodern:1.*) : ;; # ccl fasl numbering broke loading of old asdf 2.0 ccl:2.0[01]*) : ;; # my old ubuntu clisp 2.44.1 is wired in diff --git a/upgrade.lisp b/upgrade.lisp index 6e03b159..91c47094 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.26") + (asdf-version "2.32.27") (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 6975e7d9..fb6d2860 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.32.26" +"2.32.27" -- GitLab