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

2.26.75: detach asdf-driver from asdf. Make it work.

parent 052b3bbc
......@@ -22,11 +22,6 @@
#:perform #:perform-with-restarts #:retry #:accept))
(in-package :asdf/action)
(when-upgrade ()
(undefine-functions
'(explain output-files perform perform-with-restarts
operation-done-p compute-action-stamp component-depends-on mark-operation-done)))
(deftype action () '(cons operation component)) ;; a step to be performed while building the system
;;;; self-description
......
;;; -*- mode: lisp -*-
(defsystem :asdf-driver
:licence "MIT"
:description "Basic general-purpose utilities used by ASDF"
:long-description "Basic general-purpose utilities that is in such a need
that you can't portably construct a complete program without using them."
:components
((:file "header")
(:file "package")
(:file "compatibility" :depends-on ("package"))
(:file "utility" :depends-on ("compatibility"))
(:file "pathname" :depends-on ("utility"))
(:file "stream" :depends-on ("utility"))
(:file "os" :depends-on ("pathname" "stream"))
(:file "image" :depends-on ("os"))
(:file "run-program" :depends-on ("os"))
(:file "lisp-build" :depends-on ("pathname"))))
......@@ -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.74" ;; to be automatically updated by bin/bump-revision
:version "2.26.75" ;; to be automatically updated by bin/bump-revision
:depends-on ()
:components ((:module "build" :components ((:file "asdf")))))
......@@ -23,5 +23,6 @@
((o compile-op)
(c (eql (first (module-components
(first (module-components (find-system :asdf))))))))
(declare (ignorable o))
(perform (make-instance 'load-source-op) c))
(declare (ignorable o c))
#-asdf2.27 (perform (make-instance 'load-source-op) c)
#+asdf2.27 (perform (make-instance 'monolithic-load-concatenated-source-op) (find-system 'generate-asdf)))
......@@ -18,8 +18,6 @@
#:system-definition-pathname))
(in-package :asdf/backward-interface)
(when-upgrade () (undefine-function 'component-load-dependencies))
(defun* component-load-dependencies (component)
;; Old deprecated name for the same thing. Please update your software.
(component-sibling-dependencies component))
......
......@@ -22,8 +22,6 @@
#:system-fasl))
(in-package :asdf/bundle)
(when-upgrade () (undefine-function 'trivial-system-p))
(defclass bundle-op (operation)
((build-args :initarg :args :initform nil :accessor bundle-op-build-args)
(name-suffix :initarg :name-suffix :initform nil)
......
......@@ -27,8 +27,6 @@
#:*default-encoding* #:*utf-8-external-format*))
(in-package :asdf/component)
(when-upgrade () (undefine-functions '(component-relative-pathname source-file-type)))
(defgeneric* component-name (component)
(:documentation "Name of the COMPONENT, unique relative to its parent"))
(defgeneric* component-system (component)
......
......@@ -17,8 +17,6 @@
#:resolve-relative-location-component #:resolve-absolute-location-component))
(in-package :asdf/configuration)
(when-upgrade () (undefine-function 'resolve-location))
(define-condition invalid-configuration ()
((form :reader condition-form :initarg :form)
(location :reader condition-location :initarg :location)
......
......@@ -78,7 +78,7 @@
(free software successor of the old proprietary DEFSYSTEM's and predecessor of ASDF),
Sean Ross's <a href="http://sean-ross.blogspot.com/search/label/mudballs">mudballs</a>
(aborted attempt at making things cleaner than in ASDF),
Peter Jetter's <a href="http://www.cliki.net/faslpath">faslpath</a>
Peter Etter's <a href="http://www.cliki.net/faslpath">faslpath</a>
(a much simpler system establishing a mapping between packages and files),
Alexander Kahl's <a href="http://www.cliki.net/evol">evol</a>
(a reimplementation of the GNU autotools stack in Lisp),
......
......@@ -16,8 +16,6 @@
#:missing-required-by #:missing-version))
(in-package :asdf/find-component)
(when-upgrade () (undefine-function 'find-component))
;;;; Missing component conditions
(define-condition missing-component-of-version (missing-component)
......
......@@ -2,59 +2,32 @@
(defsystem :generate-asdf
:licence "MIT"
:description "Generate a monolithic asdf.lisp from all its components"
:description "All the components needed to build asdf.lisp"
:description "Generate asdf.lisp based on this and monolithic-concatenate-source-op"
;; :defsystem-depends-on (:asdf/bundle)
:class :concatenated-source-system
;; :include-dependencies t
:translate-output-p nil
:concatenated-source-file "tmp/generated-asdf.lisp"
#|
:depends-on (:asdf-header
:asdf-package
:asdf-portability
:asdf-utility
:asdf-pathname
:asdf-upgrade
:asdf-interface
:asdf-lisp-build
:asdf-action
:asdf-bundle
:asdf-backward-compat
:asdf-footer))
|#
:serial t
:components
((:file "header")
(:module
"utils" :pathname "" :components
((:file "package")
(:file "compatibility" :depends-on ("package"))
(:file "utility" :depends-on ("compatibility"))
(:file "pathname" :depends-on ("utility"))
(:file "stream" :depends-on ("utility"))
(:file "os" :depends-on ("pathname" "streams"))
(:file "image" :depends-on ("os"))
(:file "run-program" :depends-on ("os"))
(:file "lisp-build" :depends-on ("pathname"))))
(:module
"code" :pathname "" :components
(:file "upgrade")
(:file "component")
(:file "system" :depends-on ("component"))
(:file "find-system" :depends-on ("system"))
(:file "find-component" :depends-on ("find-system"))
(:file "operation")
(:file "action" :depends-on ("find-component" "operation"))
(: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 "backward-internals" :depends-on ("action" "operate"))
(:file "defsystem" :depends-on ("backward-internals"))
(:file "bundle" :depends-on ("lisp-action"))
(:file "concatenate-source" :depends-on ("lisp-action"))
(:file "backward-interface" :depends-on ("lisp-action")))
((:file "upgrade")
(:file "component")
(:file "system" :depends-on ("component"))
(:file "find-system" :depends-on ("system"))
(:file "find-component" :depends-on ("find-system"))
(:file "operation")
(:file "action" :depends-on ("find-component" "operation"))
(: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 "backward-internals" :depends-on ("action" "operate"))
(:file "defsystem" :depends-on ("backward-internals"))
(:file "bundle" :depends-on ("lisp-action"))
(:file "concatenate-source" :depends-on ("lisp-action"))
(:file "backward-interface" :depends-on ("lisp-action"))
(:file "interface")
(:file "footer" :depends-on ("interface")))))
(:file "footer" :depends-on ("interface"))))
;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
;;; This is ASDF 2.26.74: Another System Definition Facility.
;;; This is ASDF 2.26.75: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -16,8 +16,6 @@
#:combine-fasls))
(in-package :asdf/lisp-build)
(eval-when (:compile-toplevel :load-toplevel :execute) (undefine-function 'compile-file*))
(defvar *compile-file-warnings-behaviour*
(or #+clisp :ignore :warn)
"How should ASDF react if it encounters a warning when compiling a file?
......
......@@ -15,8 +15,6 @@
#:upgrade-asdf #:cleanup-upgraded-asdf #:*post-upgrade-hook*))
(in-package :asdf/operate)
(when-upgrade () (undefine-function 'operate))
(defgeneric* operate (operation-class system &key &allow-other-keys))
(defun* cleanup-upgraded-asdf ()
......
......@@ -20,8 +20,6 @@
))
(in-package :asdf/output-translations)
(when-upgrade () (undefine-functions '(apply-output-translations (setf output-translations))))
(define-condition invalid-output-translation (invalid-configuration warning)
((format :initform (compatfmt "~@<Invalid asdf output-translation ~S~@[ in ~S~]~@{ ~@?~}~@:>"))))
......
......@@ -54,8 +54,6 @@
#:parse-file-location-info #:parse-windows-shortcut))
(in-package :asdf/pathname)
(eval-when (:compile-toplevel :load-toplevel :execute) (fmakunbound 'translate-pathname*))
;;; User-visible parameters
(defvar *resolve-symlinks* t
"Determine whether or not ASDF resolves symlinks when defining systems.
......
......@@ -24,8 +24,6 @@
#:perform-plan #:plan-operates-on-p))
(in-package :asdf/plan)
(when-upgrade () (undefine-functions '(traverse perform-plan traverse-action)))
;;;; Planned action status
(defgeneric* plan-action-status (plan operation component)
......
......@@ -24,10 +24,6 @@
#:sysdef-source-registry-search))
(in-package :asdf/source-registry)
(when-upgrade ()
(undefine-functions '(inherit-source-registry process-source-registry
process-source-registry-directive)))
(define-condition invalid-source-registry (invalid-configuration warning)
((format :initform (compatfmt "~@<Invalid source registry ~S~@[ in ~S~]~@{ ~@?~}~@:>"))))
......
......@@ -21,10 +21,6 @@
#:system-defsystem-depends-on))
(in-package :asdf/system)
(when-upgrade ()
(undefine-functions '(find-system system-source-file
system-relative-pathname builtin-system-p)))
(defgeneric* find-system (system &optional error-p))
(declaim (ftype (function (t t) t) probe-asd))
......
......@@ -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.74")
(asdf-version "2.26.75")
(existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
(existing-version *asdf-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