Commit c7632900 authored by Robert Goldman's avatar Robert Goldman

Merge branch 'master' into launchpad-1437480

* master:
  Update submodule URLs
  Bump version to 3.1.4.5
  Fix for launchpad bug 1445638.
  Added FORCE to test for repeatability.
  Test case for launchpad bug 1445638.
parents 14a14cff 55faaf72
[submodule "ext/fare-utils"]
path = ext/fare-utils
url = git://common-lisp.net/users/frideau/fare-utils.git
url = https://gitlab.common-lisp.net/frideau/fare-utils.git
[submodule "ext/fare-quasiquote"]
path = ext/fare-quasiquote
url = git://common-lisp.net/users/frideau/fare-quasiquote.git
url = https://gitlab.common-lisp.net/frideau/fare-quasiquote.git
[submodule "ext/fare-mop"]
path = ext/fare-mop
url = git://common-lisp.net/users/frideau/fare-mop.git
url = https://gitlab.common-lisp.net/frideau/fare-mop.git
[submodule "ext/closer-closer-mop"]
path = ext/closer-closer-mop
url = git://git.code.sf.net/p/closer/closer-mop
[submodule "ext/alexandria"]
path = ext/alexandria
url = git://common-lisp.net/projects/alexandria/alexandria.git
url = https://gitlab.common-lisp.net/alexandria/alexandria.git
[submodule "ext/optima"]
path = ext/optima
url = https://github.com/m2ym/optima.git
......@@ -21,13 +21,13 @@
url = https://github.com/melisgl/named-readtables.git
[submodule "ext/inferior-shell"]
path = ext/inferior-shell
url = git://common-lisp.net/projects/qitab/inferior-shell.git
url = https://gitlab.common-lisp.net/qitab/inferior-shell.git
[submodule "ext/lisp-invocation"]
path = ext/lisp-invocation
url = git://common-lisp.net/projects/qitab/lisp-invocation.git
url = https://gitlab.common-lisp.net/qitab/lisp-invocation.git
[submodule "ext/cl-ppcre"]
path = ext/cl-ppcre
url = https://github.com/edicl/cl-ppcre
[submodule "ext/asdf-encodings"]
path = ext/asdf-encodings
url = git://common-lisp.net/projects/asdf/asdf-encodings.git
url = https://gitlab.common-lisp.net/asdf/asdf-encodings.git
......@@ -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.4" ;; to be automatically updated by make bump-version
:version "3.1.4.5" ;; 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)
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.4.4: Another System Definition Facility.
;;; This is ASDF 3.1.4.5: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -250,8 +250,9 @@ system names contained using COERCE-NAME. Return the result."
:name name :source-file source-file))
(component-options
(remove-plist-keys '(:defsystem-depends-on :class) options))
(defsystem-dependencies (loop :for spec :in defsystem-depends-on :collect
(resolve-dependency-spec nil spec))))
(defsystem-dependencies (loop :for spec :in defsystem-depends-on
:when (resolve-dependency-spec nil spec)
:collect :it)))
;; cache defsystem-depends-on in canonical form
(when defsystem-depends-on
(setf component-options
......
......@@ -102,7 +102,7 @@
#+(or cmu scl) compile-warned-error
#+sbcl compile-failed-error
(let ((*compile-file-warnings-behaviour* :error))
(load-system :undefined-variables)))
(load-system :undefined-variables :force t)))
(errors #+(or allegro clozure) compile-file-error
#+(or cmu scl) null
#+sbcl compile-failed-error
......
;;-*- Lisp -*-
(in-package :asdf-test)
(def-test-system test-defsystem-depends-on-1
:defsystem-depends-on (test-asdf/l-file)
:default-component-class "l-file:cl-source-file.l"
......@@ -28,3 +30,11 @@
:components ((:file "file3")))
(signals asdf::formatted-system-definition-error (make :test-defsystem-depends-on-3))
(defparameter *newsym* (gentemp (symbol-name 'feature) :keyword))
;;; FIXME: the following form triggers bug https://bugs.launchpad.net/asdf/+bug/1445638
(eval `(def-test-system test-defsystem-depends-on-4
:defsystem-depends-on ((:feature ,*newsym* "test-defsystem-depends-on-3"))))
(assert (find-system "test-defsystem-depends-on-4"))
......@@ -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.4")
(asdf-version "3.1.4.5")
(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