Skip to content
Snippets Groups Projects
Commit 1f087347 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

ASDF-DEPENDENCY-GROVEL 1.100: Depend on ASDF 2. Give this version a number.

parent bd5a2617
No related branches found
No related tags found
No related merge requests found
...@@ -497,9 +497,6 @@ ...@@ -497,9 +497,6 @@
;; Used by maybe-translated-component-name and output-component-file. ;; Used by maybe-translated-component-name and output-component-file.
(defvar *asdf-has-sensible-component-names-p*
#+asdf2 t #-asdf2 nil)
(defun strip/ (name) (defun strip/ (name)
(subseq name (1+ (or (position #\/ name :from-end t) -1)))) (subseq name (1+ (or (position #\/ name :from-end t) -1))))
(defun strip-extension (name extension) (defun strip-extension (name extension)
...@@ -521,16 +518,7 @@ ...@@ -521,16 +518,7 @@
(defun enough-component-spec (c &optional pn-p) (defun enough-component-spec (c &optional pn-p)
(multiple-value-bind (name pn) (normalized-component-name c) (multiple-value-bind (name pn) (normalized-component-name c)
(if (or *asdf-has-sensible-component-names-p* ;; means ASDF 2. (write-to-string name)))
(equal pn
(ignore-errors
(namestring (make-pathname
:name (strip/ name)
:type (asdf:source-file-type c (asdf:component-system c)))))))
(write-to-string name)
;; XXX: make-pathname forms are more portable, but namestrings
;; are more readable. People should be using a recent ASDF, anyway.
(format nil "~S~:[~; :pathname #p~S~]" name pn-p pn))))
;; Used by additional-dependencies* and overridden-dependencies*. ;; Used by additional-dependencies* and overridden-dependencies*.
(defun map-over-instrumented-component-and-parents (component slot-name) (defun map-over-instrumented-component-and-parents (component slot-name)
......
#+xcvb (module ()) #+xcvb (module ())
(cl:defpackage #:asdf-dependency-grovel (cl:in-package :asdf)
(defpackage #:asdf-dependency-grovel
(:use #:cl) (:use #:cl)
(:export #:reload (:export #:reload
#:component-file #:component-file
...@@ -21,8 +23,22 @@ ...@@ -21,8 +23,22 @@
#:fine-grain-instrumented-load #:fine-grain-instrumented-load
#:print-big-ol-dependency-report)) #:print-big-ol-dependency-report))
(cl:defpackage #:asdf-dependency-grovel.packages (defpackage #:asdf-dependency-grovel.packages
(:use)) (:use))
(cl:defpackage #:asdf-dependency-grovel.lambdas (defpackage #:asdf-dependency-grovel.lambdas
(:use)) (:use))
(in-package #:asdf-dependency-grovel)
(defparameter *asdf-dependency-grovel-version* "1.100")
(defparameter *asdf-version-required-by-adg* "1.702")
#-asdf2
(error "ASDF-DEPENDENCY-GROVEL requires ASDF2.")
#+asdf2
(unless (asdf:version-satisfies (asdf:asdf-version) *asdf-version-required-by-adg*)
(error "POIU ~A requires ASDF ~A or later."
*asdf-dependency-grovel-version*
*asdf-version-required-by-adg*))
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