Commit 865f9081 authored by Robert P. Goldman's avatar Robert P. Goldman
parents 24a07575 c4b6506d
......@@ -75,7 +75,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "3.1.3.1" ;; to be automatically updated by make bump-version
:version "3.1.3.2" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
:class #.(if (find-class 'package-inferred-system nil) 'package-inferred-system 'system)
......
(uiop:define-package :asdf/contrib/fasl-op
(:use :common-lisp :uiop
:asdf :asdf/component :asdf/operation :asdf/lisp-action :asdf/bundle))
(in-package :asdf/contrib/fasl-op)
;;; Backward compatibility with pre-3.1.2 names
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun frob-symbol (sym)
(loop :for dest :in '(:asdf/bundle :asdf/interface) :do
(uiop/package::ensure-import
(symbol-name sym) (find-package dest) (symbol-package sym)
(make-hash-table :test 'equal) (make-hash-table :test 'equal)))))
(defmacro declare-ops (&rest ops)
`(progn
,@(loop :for (compat-name current-name) :in ops :append
`((defclass ,compat-name (selfward-operation)
((selfward-operation :initform ',current-name :allocation :class)))
(defmethod output-files ((o ,compat-name) (c component))
(output-files (find-operation o ',current-name) c))
(frob-symbol ',compat-name)))))
(declare-ops
(fasl-op compile-bundle-op)
(load-fasl-op load-bundle-op)
(binary-op deliver-asd-op)
(monolithic-fasl-op monolithic-compile-bundle-op)
(monolithic-load-fasl-op monolithic-load-bundle-op)
(monolithic-binary-op monolithic-deliver-asd-op))
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.3.1: Another System Definition Facility.
;;; This is ASDF 3.1.3.2: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -262,7 +262,7 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie
#+ecl (ext:getcwd)
#+gcl (let ((*default-pathname-defaults* #p"")) (truename #p""))
#+genera *default-pathname-defaults* ;; on a Lisp OS, it *is* canonical!
#+lispworks (system:current-directory)
#+lispworks (hcl:get-working-directory)
#+mkcl (mk-ext:getcwd)
#+sbcl (sb-ext:parse-native-namestring (sb-unix:posix-getcwd/))
#+xcl (extensions:current-directory)
......
......@@ -12,7 +12,7 @@
#:encoding-external-format #:*encoding-external-format-hook* #:default-encoding-external-format
#:*default-encoding* #:*utf-8-external-format*
#:with-safe-io-syntax #:call-with-safe-io-syntax #:safe-read-from-string
#:with-output #:output-string #:with-input
#:with-output #:output-string #:with-input #:input-string
#:with-input-file #:call-with-input-file #:with-output-file #:call-with-output-file
#:null-device-pathname #:call-with-null-input #:with-null-input
#:call-with-null-output #:with-null-output
......@@ -263,8 +263,14 @@ Otherwise, signal an error."
(defmacro with-input ((input-var &optional (value input-var)) &body body)
"Bind INPUT-VAR to an input stream, coercing VALUE (default: previous binding of INPUT-VAR)
as per CALL-WITH-INPUT, and evaluate BODY within the scope of this binding."
`(call-with-input ,value #'(lambda (,input-var) ,@body))))
`(call-with-input ,value #'(lambda (,input-var) ,@body)))
(defun input-string (&optional input)
"If the desired INPUT is a string, return that string; otherwise slurp the INPUT into a string
and return that"
(if (stringp input)
input
(with-input (input) (funcall 'slurp-stream-string input)))))
;;; Null device
(with-upgradability ()
......
......@@ -67,7 +67,7 @@ previously-loaded version of ASDF."
;; "3.4.5.67" would be a development version in the official branch, on top 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 "3.1.3.1")
(asdf-version "3.1.3.2")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment