From 27b114cdb74dce81bdf123a713855bcc3bdcae78 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <tunes@google.com> Date: Wed, 3 Apr 2013 17:59:57 -0400 Subject: [PATCH] 2.32.37: combine-fasls support for ABCL This requires current trunk, i.e. future ABCL 1.2.0. --- asdf.asd | 2 +- bundle.lisp | 2 +- header.lisp | 2 +- uiop/lisp-build.lisp | 5 +++-- upgrade.lisp | 2 +- version.lisp-expr | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/asdf.asd b/asdf.asd index d16a3d16..4ba5ec77 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.36" ;; to be automatically updated by make bump-version + :version "2.32.37" ;; 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 568f894f..24fbf907 100644 --- a/bundle.lisp +++ b/bundle.lisp @@ -185,7 +185,7 @@ (or #+ecl (or (equalp type (compile-file-type :type :object)) (equalp type (compile-file-type :type :static-library))) #+mkcl (equalp type (compile-file-type :fasl-p nil)) - #+(or allegro clisp clozure cmu lispworks sbcl scl xcl) (equalp type (compile-file-type))))) + #+(or abcl allegro clisp clozure cmu lispworks sbcl scl xcl) (equalp type (compile-file-type))))) (defgeneric* (trivial-system-p) (component)) diff --git a/header.lisp b/header.lisp index 3f2c8e20..c70563d9 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.36: Another System Definition Facility. +;;; This is ASDF 2.32.37: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/uiop/lisp-build.lisp b/uiop/lisp-build.lisp index e2e376db..789f6d1a 100644 --- a/uiop/lisp-build.lisp +++ b/uiop/lisp-build.lisp @@ -669,11 +669,12 @@ it will filter them appropriately." ;;; Links FASLs together (with-upgradability () (defun combine-fasls (inputs output) - #-(or allegro clisp clozure cmu lispworks sbcl scl xcl) + #-(or abcl allegro clisp clozure cmu lispworks sbcl scl xcl) (error "~A does not support ~S~%inputs ~S~%output ~S" (implementation-type) 'combine-fasls inputs output) - #+clozure (ccl:fasl-concatenate output inputs :if-exists :supersede) + #+abcl (funcall 'sys::concatenate-fasls inputs output) ; requires ABCL 1.2.0 #+(or allegro clisp cmu sbcl scl xcl) (concatenate-files inputs output) + #+clozure (ccl:fasl-concatenate output inputs :if-exists :supersede) #+lispworks (let (fasls) (unwind-protect diff --git a/upgrade.lisp b/upgrade.lisp index 6fdc0c2a..15082a6f 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.36") + (asdf-version "2.32.37") (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 a883aead..af7ee546 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.32.36" +"2.32.37" -- GitLab