Commit 0ffa98e6 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.31.8: Intern require-system's.

parent faae2d80
......@@ -74,7 +74,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.31.7" ;; to be automatically updated by make bump-version
:version "2.31.8" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system.
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.31.7: Another System Definition Facility.
;;; This is ASDF 2.31.8: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -171,9 +171,15 @@ for how to load or compile stuff")
(error (compatfmt "~@<Bad dependency ~S for ~S. ~S takes only one argument~@:>")
(cons combinator arguments) component combinator))
(let* ((module (car arguments))
(name (string-downcase module)))
(name (string-downcase module))
(system (find-system name nil)))
(assert module)
(make-instance 'require-system :name name)))
;;(unless (typep system '(or null require-system))
;; (warn "~S depends on ~S but ~S is registered as a ~S"
;; component (cons combinator arguments) module (type-of system)))
(or system (let ((system (make-instance 'require-system :name name)))
(register-system system)
system))))
(defun module-provide-asdf (name)
(let ((module (string-downcase name)))
......
......@@ -35,7 +35,8 @@
((:feature :sbcl (:require :sb-posix))
(:feature :allegro (:require "osi")))
:components
((:file "file1")
((:file "file1" :if-feature :common-lisp)
(:file "doesnt-exist" :if-feature (:not :common-lisp))
(:module "quux"
:pathname ""
:depends-on ("file1")
......
(load-system "test-asdf/test-module-depend")
(defparameter *plan* (traverse 'load-op "test-asdf/test-module-depend"))
(DBG :foo *plan*
(component-depends-on 'compile-op '("test-asdf/test-module-depend" "quux" "file3mod" "file3"))
(asdf::component-if-feature (find-component "test-asdf/test-module-depend" '("quux" "file3mod" "file3"))))
(assert (not (in-plan-p *plan* '(compile-op "test-asdf/test-module-depend" "file1"))))
......@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
;; "3.4.5.67" would be a development version in the official upstream 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 "2.31.7")
(asdf-version "2.31.8")
(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