Skip to content
Snippets Groups Projects
Commit d8b99de5 authored by Robert P. Goldman's avatar Robert P. Goldman
Browse files

Merge branch 'master' into docs

Non-trivial merge necessary because there were updates to the ASDF
manual on master corresponding to the (renamed) package-inferred-system
facility.
parents d5f314c9 1cec1baf
No related branches found
No related tags found
No related merge requests found
;; This file is missing a defpackage form, and loading it as a package-system should trigger an error.
;; This file is missing a defpackage form, and loading it as a package-inferred-system should trigger an error.
(in-package :asdf-test)
(in-package :asdf)
(defsystem package-inferred-system-test
:class package-inferred-system
:defsystem-depends-on
#.(unless (find-class 'package-inferred-system nil) '(:asdf-package-inferred-system)))
(register-directory (subpathname *test-directory* "package-system-test/"))
(load-system :package-system-test/a/x)
(load-system :package-system-test/d)
(signals package-system-missing-package-error (load-system :package-system-test/e))
;; No such file.
(signals missing-component (load-system :package-system-test/f))
(defpackage package-system-test/a (:use cl))
(defpackage package-system-test/a/x (:use common-lisp package-system-test/c))
(defpackage package-system-test/b (:use cl package-system-test/a))
(defpackage package-system-test/c (:use cl package-system-test/a))
(defpackage package-system-test/d (:use cl package-system-test/b package-system-test/c))
(in-package :asdf)
(defsystem package-system-test
:class package-system
:defsystem-depends-on
#.(unless (find-class 'package-system nil) '(:asdf-package-system)))
......@@ -339,7 +339,7 @@ upgrade_tags () {
#
# The 3.1 series provides the 3.1 feature, meaning users can rely on
# all the stabilization work done in 3.0 so far, plus extra developments
# in UIOP, package-system, and more robustification.
# in UIOP, package-inferred-system, and more robustification.
#
# We return the above designated versions in order of decreasing relevance,
# which pretty much means REQUIRE and most recent first.
......@@ -411,8 +411,8 @@ valid_upgrade_test_p () {
ecl*:1.*|ecl*:2.0[01]*|ecl*:2.20:*) : ;;
# GCL 2.7.0 from late November 2013 is required, with ASDF 3.1.1
gcl:REQUIRE:*|gcl:1.*|gcl:2.*|gcl:3.0*) : ;;
# MKCL is only supported starting with 2.24, so skip earlier versions
mkcl:1.*|mkcl:2.0[01]*|mkcl:2.2[0-3]:*) : ;;
# MKCL is only supported starting with specific versions 2.24, 2.26.x, 3.0.3.0.x, so skip.
mkcl:[12]*|mkcl:3.0*) : ;;
# XCL support starts with ASDF 2.014.2
# — It also dies during upgrade trying to show the backtrace.
xcl:1.*|xcl:2.00*|xcl:2.01[0-4]:*|xcl:*) : ;;
......
......@@ -2,7 +2,7 @@
(:use :cl :asdf))
(in-package :test-asdf-system)
(defsystem :test-asdf :class package-system)
(defsystem :test-asdf :class package-inferred-system)
(defsystem :test-asdf/all
:version "0"
......
......@@ -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.0.113")
(asdf-version "3.1.0.116")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
......
"3.1.0.113"
"3.1.0.116"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment