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

2.26.175: Give shorter names to new slots. Tweak source-registry.

:website-url ==> :homepage
:developers-email ==> :mailto
:bug-tracker-url ==> :bug-tracker
parent 6f97e9e0
No related branches found
No related tags found
No related merge requests found
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
:long-description "ASDF/DEFSYSTEM is the standard DEFSYSTEM facility for Common Lisp, :long-description "ASDF/DEFSYSTEM is the standard DEFSYSTEM facility for Common Lisp,
a successor to Dan Barlow's ASDF and Francois-Rene Rideau's ASDF2. a successor to Dan Barlow's ASDF and Francois-Rene Rideau's ASDF2.
For bootstrap purposes, it comes bundled with ASDF/DRIVER in a single file asdf.lisp." For bootstrap purposes, it comes bundled with ASDF/DRIVER in a single file asdf.lisp."
:website-url "http://common-lisp.net/projects/asdf/" :homepage "http://common-lisp.net/projects/asdf/"
:bug-tracker-url "https://launchpad.net/asdf/" :bug-tracker "https://launchpad.net/asdf/"
:developers-email "asdf-devel@common-lisp.net" :mailto "asdf-devel@common-lisp.net"
:source-control (:git "git://common-lisp.net/projects/asdf/asdf.git") :source-control (:git "git://common-lisp.net/projects/asdf/asdf.git")
:version (:read-file-form "version.lisp-expr") :version (:read-file-form "version.lisp-expr")
:build-operation monolithic-concatenate-source-op :build-operation monolithic-concatenate-source-op
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
:licence "MIT" :licence "MIT"
:description "Another System Definition Facility" :description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems." :long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.26.174" ;; to be automatically updated by make bump-version :version "2.26.175" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8 #+asdf3 :encoding #+asdf3 :utf-8
;; For most purposes, asdf itself specially counts as a builtin system. ;; For most purposes, asdf itself specially counts as a builtin system.
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.26.174: Another System Definition Facility. ;;; This is ASDF 2.26.175: Another System Definition Facility.
;;; ;;;
;;; Feedback, bug reports, and patches are all welcome: ;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>. ;;; please mail to <asdf-devel@common-lisp.net>.
......
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
#:system-source-file #:system-source-file
#:system-source-directory #:system-source-directory
#:system-relative-pathname #:system-relative-pathname
#:system-website-url #:system-homepage
#:system-bug-tracker-url #:system-bug-tracker
#:system-developers-email #:system-developers-email
#:system-long-name #:system-long-name
#:system-source-control #:system-source-control
......
...@@ -273,8 +273,9 @@ and NIL NAME, TYPE and VERSION components" ...@@ -273,8 +273,9 @@ and NIL NAME, TYPE and VERSION components"
(make-pathname :name nil :type nil :version nil :defaults pathname))) (make-pathname :name nil :type nil :version nil :defaults pathname)))
(defun* pathname-parent-directory-pathname (pathname) (defun* pathname-parent-directory-pathname (pathname)
"Returns a new pathname with same HOST, DEVICE, DIRECTORY as PATHNAME, "Returns a new pathname that corresponds to the parent of the current pathname's directory,
and NIL NAME, TYPE and VERSION components" i.e. removing one level of depth in the DIRECTORY component. e.g. if pathname is
Unix pathname /foo/bar/baz/file.type then return /foo/bar/"
(when pathname (when pathname
(make-pathname* :name nil :type nil :version nil (make-pathname* :name nil :type nil :version nil
:directory (merge-pathname-directory-components :directory (merge-pathname-directory-components
......
...@@ -51,7 +51,7 @@ system names to pathnames of .asd files") ...@@ -51,7 +51,7 @@ system names to pathnames of .asd files")
(register-clear-configuration-hook 'clear-source-registry) (register-clear-configuration-hook 'clear-source-registry)
(defparameter *wild-asd* (defparameter *wild-asd*
(make-pathname* :directory nil :name *wild* :type "asd")) (make-pathname* :directory nil :name *wild* :type "asd" :version :newest))
(defun* directory-asd-files (directory) (defun* directory-asd-files (directory)
(directory-files directory *wild-asd*)) (directory-files directory *wild-asd*))
...@@ -64,7 +64,7 @@ system names to pathnames of .asd files") ...@@ -64,7 +64,7 @@ system names to pathnames of .asd files")
(collect-sub*directories (collect-sub*directories
directory directory
(constantly t) (constantly t)
#'(lambda (x) (not (member (car (last (pathname-directory x))) exclude :test #'equal))) #'(lambda (x &aux (l (car (last (pathname-directory x))))) (not (member l exclude :test #'equal)))
#'(lambda (dir) (collect-asds-in-directory dir collect)))) #'(lambda (dir) (collect-asds-in-directory dir collect))))
(defun* validate-source-registry-directive (directive) (defun* validate-source-registry-directive (directive)
......
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
#:system-defsystem-depends-on #:system-defsystem-depends-on
#:component-build-pathname #:build-pathname #:component-build-pathname #:build-pathname
#:component-entry-point #:entry-point #:component-entry-point #:entry-point
#:website-url #:system-website-url #:homepage #:system-homepage
#:bug-tracker-url #:system-bug-tracker-url #:bug-tracker #:system-bug-tracker
#:developers-email #:system-developers-email #:mailto #:system-mailto
#:long-name #:system-long-name #:long-name #:system-long-name
#:source-control #:system-source-control #:source-control #:system-source-control
#:find-system #:builtin-system-p)) ;; forward-reference, defined in find-system #:find-system #:builtin-system-p)) ;; forward-reference, defined in find-system
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
(maintainer :accessor system-maintainer :initarg :maintainer :initform nil) (maintainer :accessor system-maintainer :initarg :maintainer :initform nil)
(licence :accessor system-licence :initarg :licence (licence :accessor system-licence :initarg :licence
:accessor system-license :initarg :license :initform nil) :accessor system-license :initarg :license :initform nil)
(website-url :accessor system-website-url :initarg :website-url :initform nil) (homepage :accessor system-homepage :initarg :homepage :initform nil)
(bug-tracker-url :accessor system-bug-tracker-url :initarg :bug-tracker-url :initform nil) (bug-tracker :accessor system-bug-tracker :initarg :bug-tracker :initform nil)
(developers-email :accessor system-developers-email :initarg :developers-email :initform nil) (mailto :accessor system-mailto :initarg :mailto :initform nil)
(long-name :accessor system-long-name :initarg :long-name :initform nil) (long-name :accessor system-long-name :initarg :long-name :initform nil)
;; Conventions for this slot aren't clear yet as of ASDF 2.27, but whenever they are, they will be enforced. ;; Conventions for this slot aren't clear yet as of ASDF 2.27, but whenever they are, they will be enforced.
;; I'm introducing the slot before the conventions are set for maximum compatibility. ;; I'm introducing the slot before the conventions are set for maximum compatibility.
......
...@@ -51,7 +51,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO ...@@ -51,7 +51,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.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.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 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
(asdf-version "2.26.174") (asdf-version "2.26.175")
(existing-version (asdf-version))) (existing-version (asdf-version)))
(setf *asdf-version* asdf-version) (setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version))) (when (and existing-version (not (equal asdf-version existing-version)))
......
"2.26.174" "2.26.175"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment