diff --git a/asdf.asd b/asdf.asd index ee14a6e9da9778c4ebf1c1f47362c148327f166e..21ece2b07d1cee7997c4dc62bb9d319aeaa36147 100644 --- a/asdf.asd +++ b/asdf.asd @@ -32,9 +32,9 @@ :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. For bootstrap purposes, it comes bundled with ASDF/DRIVER in a single file asdf.lisp." - :website-url "http://common-lisp.net/projects/asdf/" - :bug-tracker-url "https://launchpad.net/asdf/" - :developers-email "asdf-devel@common-lisp.net" + :homepage "http://common-lisp.net/projects/asdf/" + :bug-tracker "https://launchpad.net/asdf/" + :mailto "asdf-devel@common-lisp.net" :source-control (:git "git://common-lisp.net/projects/asdf/asdf.git") :version (:read-file-form "version.lisp-expr") :build-operation monolithic-concatenate-source-op @@ -74,7 +74,7 @@ :licence "MIT" :description "Another System Definition Facility" :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 () #+asdf3 :encoding #+asdf3 :utf-8 ;; For most purposes, asdf itself specially counts as a builtin system. diff --git a/header.lisp b/header.lisp index c9eb29e562c9342f7f6236874d30c57e4078d896..ef4e464add09d72b0f2bd102494b6c3ca7113df3 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;;; -*- 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: ;;; please mail to <asdf-devel@common-lisp.net>. diff --git a/interface.lisp b/interface.lisp index 6e110bf35bfbc460efa71ae13f9fc7691c9d291c..89e76417ec1d746a7fe7f70f2492e5727ad93019 100644 --- a/interface.lisp +++ b/interface.lisp @@ -80,8 +80,8 @@ #:system-source-file #:system-source-directory #:system-relative-pathname - #:system-website-url - #:system-bug-tracker-url + #:system-homepage + #:system-bug-tracker #:system-developers-email #:system-long-name #:system-source-control diff --git a/pathname.lisp b/pathname.lisp index bfa713ea13094981d119d410e0e735465de6071a..0cd51cab5db8d87b578b3faff3bb6f06d5db445b 100644 --- a/pathname.lisp +++ b/pathname.lisp @@ -273,8 +273,9 @@ and NIL NAME, TYPE and VERSION components" (make-pathname :name nil :type nil :version nil :defaults pathname))) (defun* pathname-parent-directory-pathname (pathname) - "Returns a new pathname with same HOST, DEVICE, DIRECTORY as PATHNAME, -and NIL NAME, TYPE and VERSION components" + "Returns a new pathname that corresponds to the parent of the current pathname's directory, +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 (make-pathname* :name nil :type nil :version nil :directory (merge-pathname-directory-components diff --git a/source-registry.lisp b/source-registry.lisp index ac04b4cf0925372829b75543e9f55a43095bd412..5a5b4703f4f8bda161ca759133c5f8b5f1ca83db 100644 --- a/source-registry.lisp +++ b/source-registry.lisp @@ -51,7 +51,7 @@ system names to pathnames of .asd files") (register-clear-configuration-hook 'clear-source-registry) (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) (directory-files directory *wild-asd*)) @@ -64,7 +64,7 @@ system names to pathnames of .asd files") (collect-sub*directories directory (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)))) (defun* validate-source-registry-directive (directive) diff --git a/system.lisp b/system.lisp index 09449716dfc1d60e7e46514b23c6de51dd8bfae1..c6bfb9c7dfd977156c7d75c63e97a77fa61b52f6 100644 --- a/system.lisp +++ b/system.lisp @@ -13,9 +13,9 @@ #:system-defsystem-depends-on #:component-build-pathname #:build-pathname #:component-entry-point #:entry-point - #:website-url #:system-website-url - #:bug-tracker-url #:system-bug-tracker-url - #:developers-email #:system-developers-email + #:homepage #:system-homepage + #:bug-tracker #:system-bug-tracker + #:mailto #:system-mailto #:long-name #:system-long-name #:source-control #:system-source-control #:find-system #:builtin-system-p)) ;; forward-reference, defined in find-system @@ -48,9 +48,9 @@ (maintainer :accessor system-maintainer :initarg :maintainer :initform nil) (licence :accessor system-licence :initarg :licence :accessor system-license :initarg :license :initform nil) - (website-url :accessor system-website-url :initarg :website-url :initform nil) - (bug-tracker-url :accessor system-bug-tracker-url :initarg :bug-tracker-url :initform nil) - (developers-email :accessor system-developers-email :initarg :developers-email :initform nil) + (homepage :accessor system-homepage :initarg :homepage :initform nil) + (bug-tracker :accessor system-bug-tracker :initarg :bug-tracker :initform nil) + (mailto :accessor system-mailto :initarg :mailto :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. ;; I'm introducing the slot before the conventions are set for maximum compatibility. diff --git a/upgrade.lisp b/upgrade.lisp index 3dedbe2ee8bab971da01737ca1628715c6b333c4..d41fd7d0fb2b0df3ef45f6091aab213789ed0556 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -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.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.26.174") + (asdf-version "2.26.175") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) diff --git a/version.lisp-expr b/version.lisp-expr index 33eda96a9a6db4f291243ab8b24da5562c05c800..bec2df2f2316c14172f6a2af1885d57f1ff5a69f 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.26.174" +"2.26.175"