2.26.118: rename asdf/generate to asdf/defsystem,

also use asdf-defsystem as the name for packaging.

diff --git a/asdf.asd b/asdf.asd
index 781c63b..dc0a39c 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.117" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.118" ;; 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))))
@@ -32,9 +32,9 @@
 (rename-package :asdf :asdf-utilities)
 
 #+asdf2.27
-(defsystem :asdf/generate
+(defsystem :asdf/defsystem
   :licence "MIT"
-  :description "All the components needed to build asdf.lisp"
+  :description "The defsystem part of ASDF"
   :description "Generate asdf.lisp based on this and monolithic-concatenate-source-op"
   :defsystem-depends-on (:asdf)
   :version (:read-file-form "version.lisp-expr")

diff --git a/bin/asdf-builder b/bin/asdf-builder
index 1454d40..0b9ab25 100755 (executable)
--- a/bin/asdf-builder
+++ b/bin/asdf-builder
@@ -4,14 +4,14 @@
 (load (make-pathname :name "prelude" :type "lisp" :defaults *load-pathname*)
   :verbose nil :print nil)
 
-(defpackage :asdf-builder (:use :cl :asdf/driver :asdf :fare-utils))
+(defpackage :asdf-builder (:use :cl :asdf/driver :asdf :fare-utils :inferior-shell))
 (in-package :asdf-builder)
 
 (asdf-debug)
 
 (defun build-asdf ()
   ;; Make sure asdf.lisp is built.
-  (build-system :asdf/generate)
+  (build-system :asdf/defsystem)
   (load-system :asdf)
   (values))
 
@@ -119,14 +119,14 @@
 (defun make-driver-tarball ()
   (make-tarball-under-build (driver-name) *asdf-dir* (driver-files)))
 
-(defun asdf-system-files ()
+(defun asdf-defsystem-files ()
   (list* "asdf.asd" "build/asdf.lisp" "version.lisp-expr" "header.lisp"
-         (system-source-files :asdf/generate)))
-(defun asdf-system-name ()
+         (system-source-files :asdf/defsystem)))
+(defun asdf-defsystem-name ()
   (format nil "asdf-system-~A" *version*))
-(defun make-asdf-system-tarball ()
+(defun make-asdf-defsystem-tarball ()
   (build-asdf)
-  (make-tarball-under-build (asdf-system-name) *asdf-dir* (asdf-system-files)))
+  (make-tarball-under-build (asdf-defsystem-name) *asdf-dir* (asdf-defsystem-files)))
 
 (defun asdf-git-name ()
   (format nil "asdf-~A" *version*))
@@ -143,7 +143,7 @@
   (values))
 
 (defun publish-tarballs ()
-  (let ((tarballs (mapcar 'tarname (list (driver-name) (asdf-system-name) (asdf-git-name)))))
+  (let ((tarballs (mapcar 'tarname (list (driver-name) (asdf-defsystem-name) (asdf-git-name)))))
     (run-program* (format nil "cd ~S && rsync ~{~S ~}clnet:/project/asdf/public_html/archives/"
                           /build-dir/ tarballs)))
   (format t "~&To download the tarballs, point your browser at:~%

diff --git a/bin/prelude.lisp b/bin/prelude.lisp
index 94cc06a..9e57c3e 100644 (file)
--- a/bin/prelude.lisp
+++ b/bin/prelude.lisp
@@ -11,7 +11,7 @@
 (upgrade-asdf)
 (format t "At ASDF ~A.~%" (asdf-version))
 (format t "Now loading some dependencies... ~%")
-(load-systems :cl-ppcre :fare-utils)
+(load-systems :cl-ppcre :fare-utils :inferior-shell)
 
 (format t "There we are!~%")
 (restore-image)

diff --git a/header.lisp b/header.lisp
index 20d4ef4..1ab8840 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.117: Another System Definition Facility.
+;;; This is ASDF 2.26.118: 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 2a2770c..1431750 100644 (file)
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -45,7 +45,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.117")
+         (asdf-version "2.26.118")
          (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 409c327..57fb1b7 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.117"
+"2.26.118"