2.26.80: moving configuration.lisp into asdf-driver.

The general-purpose support code is now
a bit less than 50% of the code in ASDF.

diff --git a/Makefile b/Makefile
index 50017cc..4cc30a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,8 @@ archive-copy: archive build/asdf.lisp
        ${MAKE} push
        git checkout master
 
-driver_lisp := header.lisp package.lisp compatibility.lisp utility.lisp pathname.lisp stream.lisp os.lisp image.lisp run-program.lisp lisp-build.lisp driver.lisp
-asdf_lisp := upgrade.lisp component.lisp system.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp configuration.lisp output-translations.lisp source-registry.lisp backward-internals.lisp defsystem.lisp bundle.lisp concatenate-source.lisp backward-interface.lisp interface.lisp footer.lisp
+driver_lisp := header.lisp package.lisp compatibility.lisp utility.lisp pathname.lisp stream.lisp os.lisp image.lisp run-program.lisp lisp-build.lisp driver.lisp configuration.lisp
+asdf_lisp := upgrade.lisp component.lisp system.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp output-translations.lisp source-registry.lisp backward-internals.lisp defsystem.lisp bundle.lisp concatenate-source.lisp backward-interface.lisp interface.lisp footer.lisp
 
 build/asdf.lisp: $(wildcard *.lisp)
        mkdir -p build

diff --git a/asdf-driver.asd b/asdf-driver.asd
index 5652ee2..83d9c7c 100644 (file)
--- a/asdf-driver.asd
+++ b/asdf-driver.asd
@@ -16,4 +16,5 @@ that you can't portably construct a complete program without using them."
    (:file "image" :depends-on ("os"))
    (:file "run-program" :depends-on ("os"))
    (:file "lisp-build" :depends-on ("image"))
-   (:file "driver" :depends-on ("lisp-build" "run-program"))))
+   (:file "driver" :depends-on ("lisp-build" "run-program"))
+   (:file "configuration" :depends-on ("os"))))

diff --git a/asdf.asd b/asdf.asd
index d10501f..b612f84 100644 (file)
--- a/asdf.asd
+++ b/asdf.asd
@@ -15,7 +15,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.26.79" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.80" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components ((:module "build" :components ((:file "asdf"))))
   :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf))))

diff --git a/configuration.lisp b/configuration.lisp
index 70370b7..4906c44 100644 (file)
--- a/configuration.lisp
+++ b/configuration.lisp
@@ -3,7 +3,7 @@
 
 (asdf/package:define-package :asdf/configuration
   (:recycle :asdf/configuration :asdf)
-  (:use :common-lisp :asdf/utility :asdf/pathname :asdf/stream :asdf/os :asdf/upgrade)
+  (:use :common-lisp :asdf/utility :asdf/pathname :asdf/stream :asdf/os)
   (:export
    #:get-folder-path
    #:user-configuration-directories #:system-configuration-directories

diff --git a/generate-asdf.asd b/generate-asdf.asd
index d0522b0..8654adc 100644 (file)
--- a/generate-asdf.asd
+++ b/generate-asdf.asd
@@ -22,9 +22,8 @@
    (:file "lisp-action" :depends-on ("action" "lisp-build"))
    (:file "plan" :depends-on ("action"))
    (:file "operate" :depends-on ("plan"))
-   (:file "configuration")
-   (:file "output-translations" :depends-on ("configuration" "operate"))
-   (:file "source-registry" :depends-on ("configuration" "find-system"))
+   (:file "output-translations" :depends-on ("operate"))
+   (:file "source-registry" :depends-on ("find-system"))
    (:file "backward-internals" :depends-on ("action" "operate"))
    (:file "defsystem" :depends-on ("backward-internals"))
    (:file "bundle" :depends-on ("lisp-action"))

diff --git a/header.lisp b/header.lisp
index 5cbdd4e..4c21f0d 100644 (file)
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.26.79: Another System Definition Facility.
+;;; This is ASDF 2.26.80: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.

diff --git a/upgrade.lisp b/upgrade.lisp
index 78511ac..981a751 100644 (file)
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -31,7 +31,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.79")
+         (asdf-version "2.26.80")
          (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))