Commit ed0f2545 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Merge branch 'master' into minimakefile

parents ae33ec33 d805373e
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "3.1.4.17" ;; to be automatically updated by make bump-version :version "3.1.4.18" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8 #+asdf3 :encoding #+asdf3 :utf-8
:class #+asdf3.1 package-inferred-system #-asdf3.1 system :class #+asdf3.1 package-inferred-system #-asdf3.1 system
......
This diff is collapsed.
Subproject commit 567ec1111e515d12cd01be5baa34dacec6a8b0cc Subproject commit 0653be203724285e1590426b139354251e3df35d
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.4.17: Another System Definition Facility. ;;; This is ASDF 3.1.4.18: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
(defparameter *versioned-files* (defparameter *versioned-files*
'(("version.lisp-expr" "\"" "\"") '(("version.lisp-expr" "\"" "\"")
("uiop/version.lisp-expr" "\"" "\"")
("asdf.asd" " :version \"" "\" ;; to be automatically updated by make bump-version") ("asdf.asd" " :version \"" "\" ;; to be automatically updated by make bump-version")
("header.lisp" "This is ASDF " ": Another System Definition Facility.") ("header.lisp" "This is ASDF " ": Another System Definition Facility.")
("upgrade.lisp" " (asdf-version \"" "\")"))) ("upgrade.lisp" " (asdf-version \"" "\")")))
......
...@@ -327,7 +327,7 @@ Programmers are encouraged to define their own methods for this generic function ...@@ -327,7 +327,7 @@ Programmers are encouraged to define their own methods for this generic function
(command :initform nil :initarg :command :reader subprocess-error-command) (command :initform nil :initarg :command :reader subprocess-error-command)
(process :initform nil :initarg :process :reader subprocess-error-process)) (process :initform nil :initarg :process :reader subprocess-error-process))
(:report (lambda (condition stream) (:report (lambda (condition stream)
(format stream "Subprocess~@[ ~S~]~@[ run with command ~S~] exited with error~@[ code ~D~]" (format stream "Subprocess ~@[~S~% ~]~@[with command ~S~% ~]exited with error~@[ code ~D~]"
(subprocess-error-process condition) (subprocess-error-process condition)
(subprocess-error-command condition) (subprocess-error-command condition)
(subprocess-error-code condition))))) (subprocess-error-code condition)))))
...@@ -775,7 +775,7 @@ It returns a process-info plist with possible keys: ...@@ -775,7 +775,7 @@ It returns a process-info plist with possible keys:
(reduce/strcat (reduce/strcat
(os-cond (os-cond
((os-unix-p) `(,@(when redirections `("exec " ,@redirections " ; ")) ,@chdir ,normalized)) ((os-unix-p) `(,@(when redirections `("exec " ,@redirections " ; ")) ,@chdir ,normalized))
((os-windows-p) `(,@chdir ,@redirections ,normalized))))))) ((os-windows-p) `(,@chdir ,@redirections " " ,normalized)))))))
(defun %system (command &rest keys (defun %system (command &rest keys
&key input output error-output directory &allow-other-keys) &key input output error-output directory &allow-other-keys)
......
../version.lisp-expr
\ No newline at end of file
...@@ -67,7 +67,7 @@ previously-loaded version of ASDF." ...@@ -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.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.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 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "3.1.4.17") (asdf-version "3.1.4.18")
(existing-version (asdf-version))) (existing-version (asdf-version)))
(setf *asdf-version* asdf-version) (setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-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