Commit b5f74667 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.26.150: cleanup the .asd file and some internal messages and comments.

Keep the obsolete slot properties for the sake of upgrade.
parent 0f685693
...@@ -206,7 +206,7 @@ release: TODO test-all test-on-other-machines-too debian-changelog debian-packag ...@@ -206,7 +206,7 @@ release: TODO test-all test-on-other-machines-too debian-changelog debian-packag
# RELEASE checklist: # RELEASE checklist:
# make test-all # make test-all
# ./bin/bump-version 2.27 # ./bin/bump-version 3.0
# edit debian/changelog # edit debian/changelog
# make release-push archive-copy website debian-package # make release-push archive-copy website debian-package
# dput mentors ../*.changes # dput mentors ../*.changes
......
...@@ -60,14 +60,12 @@ ...@@ -60,14 +60,12 @@
: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.149" ;; to be automatically updated by make bump-version :version "2.26.150" ;; to be automatically updated by make bump-version
:depends-on () :depends-on ()
:components :components
((:module "build" ((:module "build"
:components :components
(#-gcl2.6 (#-gcl2.6
(:file "asdf" (:file "asdf"
#-asdf3 :do-first #-asdf3 ((compile-op (load-source-op "asdf"))) #-asdf3 :do-first #+asdf3 :in-order-to ((compile-op (load-source-op "asdf")))))))
)))) :in-order-to (#+asdf3 (prepare-source-op (monolithic-concatenate-source-op :asdf/defsystem))))
:in-order-to
(#+asdf3 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem))))
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
(defun* %resolve-if-component-dep-fails (if-component-dep-fails component) (defun* %resolve-if-component-dep-fails (if-component-dep-fails component)
(asdf-message "The system definition for ~S uses deprecated ~ (asdf-message "The system definition for ~S uses deprecated ~
ASDF option :IF-COMPONENT-DEP-DAILS. ~ ASDF option :IF-COMPONENT-DEP-DAILS. ~
Starting with ASDF 2.27, please use :IF-FEATURE instead" Starting with ASDF 3, please use :IF-FEATURE instead"
(coerce-name (component-system component))) (coerce-name (component-system component)))
;; This only supports the pattern of use of the "feature" seen in the wild ;; This only supports the pattern of use of the "feature" seen in the wild
(check-type component parent-component) (check-type component parent-component)
......
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
(load (make-pathname :name "prelude" :type "lisp" :defaults *load-pathname*) (load (make-pathname :name "prelude" :type "lisp" :defaults *load-pathname*)
:verbose nil :print nil) :verbose nil :print nil)
(defpackage :asdf-builder (:use :cl :asdf/driver :asdf :fare-utils :inferior-shell)) (defpackage :asdf-builder (:use :cl :asdf/driver :asdf/operate :asdf :fare-utils :inferior-shell))
(in-package :asdf-builder) (in-package :asdf-builder)
(asdf-debug) (asdf-debug)
(defun build-asdf () (defun build-asdf ()
;; Make sure asdf.lisp is built. "Make sure asdf.lisp is built"
(build-system :asdf/defsystem)
(load-system :asdf) (load-system :asdf)
(values)) (values))
......
...@@ -99,6 +99,7 @@ another pathname in a degenerate way.")) ...@@ -99,6 +99,7 @@ another pathname in a degenerate way."))
(operation-times :initform (make-hash-table) (operation-times :initform (make-hash-table)
:accessor component-operation-times) :accessor component-operation-times)
(around-compile :initarg :around-compile) (around-compile :initarg :around-compile)
(properties) ;; Only for backward-compatibility during upgrades from ASDF2. DO NOT USE.
(%encoding :accessor %component-encoding :initform nil :initarg :encoding) (%encoding :accessor %component-encoding :initform nil :initarg :encoding)
;; For backward-compatibility, this slot is part of component rather than child-component. ASDF4: don't. ;; For backward-compatibility, this slot is part of component rather than child-component. ASDF4: don't.
(parent :initarg :parent :initform nil :reader component-parent) (parent :initarg :parent :initform nil :reader component-parent)
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
(typep (find-component parent name) (typep (find-component parent name)
(class-for-type parent type)))) (class-for-type parent type))))
(error 'duplicate-names :name name)) (error 'duplicate-names :name name))
(when do-first (error "DO-FIRST is not supported anymore as of ASDF 2.27")) (when do-first (error "DO-FIRST is not supported anymore as of ASDF 3"))
(let* ((args `(:name ,(coerce-name name) (let* ((args `(:name ,(coerce-name name)
:pathname ,pathname :pathname ,pathname
,@(when parent `(:parent ,parent)) ,@(when parent `(:parent ,parent))
......
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*- ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.26.149: Another System Definition Facility. ;;; This is ASDF 2.26.150: 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>.
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
;; See https://bugs.launchpad.net/asdf/+bug/485687 ;; See https://bugs.launchpad.net/asdf/+bug/485687
;; ;;
;; CAUTION: we must handle the first few packages specially for hot-upgrade. ;; CAUTION: we must handle the first few packages specially for hot-upgrade.
;; asdf/package will be frozen as of 2.27 ;; asdf/package will be frozen as of ASDF 3
;; to forever export the same exact symbols. ;; to forever export the same exact symbols.
;; Any other symbol must be import-from'ed ;; Any other symbol must be import-from'ed
;; and reexported in a different package ;; and reexported in a different package
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
;; "2.345.6" would be a development version in the official upstream ;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345 ;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6 ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.26.149") (asdf-version "2.26.150")
(existing-asdf (find-class (find-symbol* :component :asdf nil) nil)) (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
(existing-version *asdf-version*) (existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)) (already-there (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