From 16cd39e6972569159208794bf66939c2f0f5f449 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Sun, 24 Feb 2013 23:08:03 -0500 Subject: [PATCH] 2.30.9: restore require integration for ECL. --- asdf.asd | 2 +- footer.lisp | 11 ++++++----- header.lisp | 2 +- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/asdf.asd b/asdf.asd index 31a2225c6..9df7b28ea 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.30.8" ;; to be automatically updated by make bump-version + :version "2.30.9" ;; 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/footer.lisp b/footer.lisp index 5301c7002..76469c60b 100644 --- a/footer.lisp +++ b/footer.lisp @@ -34,11 +34,12 @@ (setf #+ecl ext:*module-provider-functions* #+mkcl mk-ext::*module-provider-functions* (loop :for f :in #+ecl ext:*module-provider-functions* #+mkcl mk-ext::*module-provider-functions* - :unless (eq f 'module-provide-asdf) - :collect #'(lambda (name) - (let ((l (multiple-value-list (funcall f name)))) - (and (first l) (register-pre-built-system (coerce-name name))) - (values-list l))))))) + :collect + (if (eq f 'module-provide-asdf) f + #'(lambda (name) + (let ((l (multiple-value-list (funcall f name)))) + (and (first l) (register-pre-built-system (coerce-name name))) + (values-list l)))))))) ;;;; Done! diff --git a/header.lisp b/header.lisp index fdc3004c6..f965cd93d 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- -;;; This is ASDF 2.30.8: Another System Definition Facility. +;;; This is ASDF 2.30.9: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/upgrade.lisp b/upgrade.lisp index 723d04e28..0b01a89fc 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.30.8") + (asdf-version "2.30.9") (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 2511bdf39..327715d98 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.30.8" +"2.30.9" -- GitLab