From b5f74667d1f00a12423d3d166e87438f7752c675 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Sat, 26 Jan 2013 22:00:10 -0500
Subject: [PATCH] 2.26.150: cleanup the .asd file and some internal messages
 and comments.

Keep the obsolete slot properties for the sake of upgrade.
---
 Makefile                | 2 +-
 asdf.asd                | 8 +++-----
 backward-internals.lisp | 2 +-
 bin/asdf-builder        | 5 ++---
 component.lisp          | 1 +
 defsystem.lisp          | 2 +-
 header.lisp             | 4 ++--
 package.lisp            | 2 +-
 upgrade.lisp            | 2 +-
 version.lisp-expr       | 2 +-
 10 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index eb262562..69f5a00d 100644
--- a/Makefile
+++ b/Makefile
@@ -206,7 +206,7 @@ release: TODO test-all test-on-other-machines-too debian-changelog debian-packag
 
 # RELEASE checklist:
 # make test-all
-# ./bin/bump-version 2.27
+# ./bin/bump-version 3.0
 # edit debian/changelog
 # make release-push archive-copy website debian-package
 # dput mentors ../*.changes
diff --git a/asdf.asd b/asdf.asd
index 822ea955..342202a2 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -60,14 +60,12 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :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 ()
   :components
   ((:module "build"
     :components
     (#-gcl2.6
      (:file "asdf"
-      #-asdf3 :do-first #-asdf3 ((compile-op (load-source-op "asdf")))
-      ))))
-  :in-order-to
-  (#+asdf3 (compile-op (monolithic-load-concatenated-source-op asdf/defsystem))))
+      #-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))))
diff --git a/backward-internals.lisp b/backward-internals.lisp
index 5846de8c..79e31e5e 100644
--- a/backward-internals.lisp
+++ b/backward-internals.lisp
@@ -55,7 +55,7 @@
 (defun* %resolve-if-component-dep-fails (if-component-dep-fails component)
   (asdf-message "The system definition for ~S uses deprecated ~
                  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)))
   ;; This only supports the pattern of use of the "feature" seen in the wild
   (check-type component parent-component)
diff --git a/bin/asdf-builder b/bin/asdf-builder
index e6861a03..3240d1d5 100755
--- a/bin/asdf-builder
+++ b/bin/asdf-builder
@@ -4,14 +4,13 @@
 (load (make-pathname :name "prelude" :type "lisp" :defaults *load-pathname*)
   :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)
 
 (asdf-debug)
 
 (defun build-asdf ()
-  ;; Make sure asdf.lisp is built.
-  (build-system :asdf/defsystem)
+  "Make sure asdf.lisp is built"
   (load-system :asdf)
   (values))
 
diff --git a/component.lisp b/component.lisp
index 2be5b3c9..663b31b2 100644
--- a/component.lisp
+++ b/component.lisp
@@ -99,6 +99,7 @@ another pathname in a degenerate way."))
    (operation-times :initform (make-hash-table)
                     :accessor component-operation-times)
    (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)
    ;; For backward-compatibility, this slot is part of component rather than child-component. ASDF4: don't.
    (parent :initarg :parent :initform nil :reader component-parent)
diff --git a/defsystem.lisp b/defsystem.lisp
index ac193447..cd70baed 100644
--- a/defsystem.lisp
+++ b/defsystem.lisp
@@ -117,7 +117,7 @@
                 (typep (find-component parent name)
                        (class-for-type parent type))))
       (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)
                    :pathname ,pathname
                    ,@(when parent `(:parent ,parent))
diff --git a/header.lisp b/header.lisp
index a62b8ff6..ae0db98d 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.149: Another System Definition Facility.
+;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
+;;; This is ASDF 2.26.150: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/package.lisp b/package.lisp
index 6855651a..1069e8db 100644
--- a/package.lisp
+++ b/package.lisp
@@ -4,7 +4,7 @@
 ;; See https://bugs.launchpad.net/asdf/+bug/485687
 ;;
 ;; 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.
 ;; Any other symbol must be import-from'ed
 ;; and reexported in a different package
diff --git a/upgrade.lisp b/upgrade.lisp
index 1924d470..f7e7a24c 100644
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -35,7 +35,7 @@
          ;; "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.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-version *asdf-version*)
          (already-there (equal asdf-version existing-version))
diff --git a/version.lisp-expr b/version.lisp-expr
index 9f49a5ba..cbc7e678 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.149"
+"2.26.150"
-- 
GitLab