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

Merge branch 'master' into minimakefile

parents 933106c4 38e41ab8
......@@ -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.4.19" ;; to be automatically updated by make bump-version
:version "3.1.4.20" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
:class #+asdf3.1 package-inferred-system #-asdf3.1 system
......
Subproject commit 0653be203724285e1590426b139354251e3df35d
Subproject commit 9d1a4930b4da48030bb74a80db443b6ec4254712
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.4.19: Another System Definition Facility.
;;; This is ASDF 3.1.4.20: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -26,8 +26,8 @@
(initialize-source-registry ""))
(unless (find-system :lisp-invocation nil)
(leave-test "Couldn't find lisp-invocation. Probably your ASDF ext/ directory needs submodule update." 1))
(load-system :lisp-invocation)
(unless (version-satisfies (find-system :lisp-invocation) "1.0.8")
(load-system "lisp-invocation")
(unless (version-satisfies (find-system "lisp-invocation") "1.0.11")
(leave-test "Lisp-invocation library isn't new enough to test successfully. Probably your ASDF ext/ directory needs submodule update." 1))
;; Disable any user source registry.
(initialize-source-registry `(:source-registry :ignore-inherited-configuration))
......
......@@ -578,6 +578,10 @@ NILs."
(when pathname
(ensure-directories-exist (physicalize-pathname pathname)))))
(defun delete-file-if-exists (x)
"Delete a file X if it already exists"
(when x (handler-case (delete-file x) (file-error () nil))))
(defun rename-file-overwriting-target (source target)
"Rename a file, overwriting any previous file with the TARGET name,
in an atomic way if the implementation allows."
......@@ -589,10 +593,6 @@ in an atomic way if the implementation allows."
(rename-file source target
#+(or clasp clozure ecl) :if-exists #+clozure :rename-and-delete #+(or clasp ecl) t))
(defun delete-file-if-exists (x)
"Delete a file X if it already exists"
(when x (handler-case (delete-file x) (file-error () nil))))
(defun delete-empty-directory (directory-pathname)
"Delete an empty directory"
#+(or abcl digitool gcl) (delete-file directory-pathname)
......
......@@ -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.4.19")
(asdf-version "3.1.4.20")
(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