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

Improve the match between ways of concatenating asdf.lisp

Make sure that bundle-op, concatenate-source-op, Makefile,
make-asdf.sh, make-asdf.bat and tools/release.lisp all agree
on "the" proper order of files in uiop and asdf.
parent c261a97a
...@@ -78,8 +78,8 @@ SCL ?= scl ...@@ -78,8 +78,8 @@ SCL ?= scl
XCL ?= xcl XCL ?= xcl
header_lisp := header.lisp header_lisp := header.lisp
driver_lisp := uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/run-program.lisp uiop/lisp-build.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp driver_lisp := uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/lisp-build.lisp uiop/run-program.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp
defsystem_lisp := upgrade.lisp component.lisp system.lisp cache.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp output-translations.lisp source-registry.lisp parse-defsystem.lisp bundle.lisp concatenate-source.lisp package-inferred-system.lisp backward-internals.lisp backward-interface.lisp interface.lisp user.lisp footer.lisp defsystem_lisp := upgrade.lisp cache.lisp component.lisp system.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp parse-defsystem.lisp bundle.lisp concatenate-source.lisp output-translations.lisp source-registry.lisp package-inferred-system.lisp backward-interface.lisp backward-internals.lisp interface.lisp user.lisp footer.lisp
all_lisp := $(header_lisp) $(driver_lisp) $(defsystem_lisp) all_lisp := $(header_lisp) $(driver_lisp) $(defsystem_lisp)
print-% : ; @echo $* = $($*) print-% : ; @echo $* = $($*)
......
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
:encoding :utf-8 :encoding :utf-8
:components :components
((:file "upgrade") ((:file "upgrade")
(:file "cache" :depends-on ("upgrade"))
(:file "component" :depends-on ("upgrade")) (:file "component" :depends-on ("upgrade"))
(:file "system" :depends-on ("component")) (:file "system" :depends-on ("component"))
(:file "cache" :depends-on ("upgrade"))
(:file "find-system" :depends-on ("system" "cache")) (:file "find-system" :depends-on ("system" "cache"))
(:file "find-component" :depends-on ("find-system")) (:file "find-component" :depends-on ("find-system"))
(:file "operation" :depends-on ("find-system")) (:file "operation" :depends-on ("find-system"))
...@@ -54,14 +54,14 @@ ...@@ -54,14 +54,14 @@
(:file "lisp-action" :depends-on ("action")) (:file "lisp-action" :depends-on ("action"))
(:file "plan" :depends-on ("lisp-action")) (:file "plan" :depends-on ("lisp-action"))
(:file "operate" :depends-on ("plan")) (:file "operate" :depends-on ("plan"))
(:file "output-translations" :depends-on ("operate"))
(:file "source-registry" :depends-on ("find-system"))
(:file "parse-defsystem" :depends-on ("cache" "system" "lisp-action" "operate")) (:file "parse-defsystem" :depends-on ("cache" "system" "lisp-action" "operate"))
(:file "bundle" :depends-on ("lisp-action" "operate" "parse-defsystem")) (:file "bundle" :depends-on ("lisp-action" "operate" "parse-defsystem"))
(:file "concatenate-source" :depends-on ("plan" "parse-defsystem" "bundle")) (:file "concatenate-source" :depends-on ("plan" "parse-defsystem" "bundle"))
(:file "output-translations" :depends-on ("operate"))
(:file "source-registry" :depends-on ("find-system"))
(:file "package-inferred-system" :depends-on ("system" "find-system" "parse-defsystem")) (:file "package-inferred-system" :depends-on ("system" "find-system" "parse-defsystem"))
(:file "backward-internals" :depends-on ("find-system" "parse-defsystem"))
(:file "backward-interface" :depends-on ("operate" "output-translations")) (:file "backward-interface" :depends-on ("operate" "output-translations"))
(:file "backward-internals" :depends-on ("find-system" "parse-defsystem"))
(:file "interface" :depends-on (:file "interface" :depends-on
("parse-defsystem" "concatenate-source" ("parse-defsystem" "concatenate-source"
"output-translations" "source-registry" "package-inferred-system" "output-translations" "source-registry" "package-inferred-system"
......
...@@ -63,7 +63,7 @@ into a single file")) ...@@ -63,7 +63,7 @@ into a single file"))
:with around-compile = (around-compile-hook s) :with around-compile = (around-compile-hook s)
:with other-around-compile = '() :with other-around-compile = '()
:for c :in (required-components :for c :in (required-components
s :goal-operation 'compile-op s :goal-operation 'load-op
:keep-operation 'compile-op :keep-operation 'compile-op
:other-systems (operation-monolithic-p operation)) :other-systems (operation-monolithic-p operation))
:append :append
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
set here=%~dp0 set here=%~dp0
set header_lisp=header.lisp set header_lisp=header.lisp
set driver_lisp=uiop\package.lisp + uiop\common-lisp.lisp + uiop\utility.lisp + uiop\os.lisp + uiop\pathname.lisp + uiop\filesystem.lisp + uiop\stream.lisp + uiop\image.lisp + uiop\run-program.lisp + uiop\lisp-build.lisp + uiop\configuration.lisp + uiop\backward-driver.lisp + uiop\driver.lisp set driver_lisp=uiop\package.lisp + uiop\common-lisp.lisp + uiop\utility.lisp + uiop\os.lisp + uiop\pathname.lisp + uiop\filesystem.lisp + uiop\stream.lisp + uiop\image.lisp + uiop\lisp-build.lisp + uiop\run-program.lisp + uiop\configuration.lisp + uiop\backward-driver.lisp + uiop\driver.lisp
set defsystem_lisp=upgrade.lisp + component.lisp + system.lisp + cache.lisp + find-system.lisp + find-component.lisp + operation.lisp + action.lisp + lisp-action.lisp + plan.lisp + operate.lisp + output-translations.lisp + source-registry.lisp + parse-defsystem.lisp + bundle.lisp + concatenate-source.lisp + package-inferred-system.lisp + backward-internals.lisp + backward-interface.lisp + interface.lisp + user.lisp + footer.lisp set defsystem_lisp=upgrade.lisp + cache.lisp + component.lisp + system.lisp + find-system.lisp + find-component.lisp + operation.lisp + action.lisp + lisp-action.lisp + plan.lisp + operate.lisp + parse-defsystem.lisp + bundle.lisp + concatenate-source.lisp + output-translations.lisp + source-registry.lisp + package-inferred-system.lisp + backward-interface.lisp + backward-internals.lisp + interface.lisp + user.lisp + footer.lisp
%~d0 %~d0
cd %~p0 cd %~p0
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
here="$(dirname $0)" here="$(dirname $0)"
header_lisp="header.lisp" header_lisp="header.lisp"
driver_lisp="uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/run-program.lisp uiop/lisp-build.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp" driver_lisp="uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/lisp-build.lisp uiop/run-program.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp"
defsystem_lisp="upgrade.lisp component.lisp system.lisp cache.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp output-translations.lisp source-registry.lisp parse-defsystem.lisp bundle.lisp concatenate-source.lisp package-inferred-system.lisp backward-internals.lisp backward-interface.lisp interface.lisp user.lisp footer.lisp" defsystem_lisp="upgrade.lisp cache.lisp component.lisp system.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp parse-defsystem.lisp bundle.lisp concatenate-source.lisp output-translations.lisp source-registry.lisp package-inferred-system.lisp backward-interface.lisp backward-internals.lisp interface.lisp user.lisp footer.lisp"
all () { all () {
# Default action: bootstrap asdf.lisp # Default action: bootstrap asdf.lisp
......
...@@ -71,8 +71,8 @@ ...@@ -71,8 +71,8 @@
(DBG "Checking that the bootstrap script and asdf.asd are in synch") (DBG "Checking that the bootstrap script and asdf.asd are in synch")
(defun system-lisp-files (system) (defun system-lisp-files (system)
(loop :for f :in (required-components system :keep-component 'cl-source-file) (loop :for f :in (input-files 'concatenate-source-op system)
:collect (enough-pathname (component-pathname f) *asdf-directory*))) :collect (enough-pathname f *asdf-directory*)))
(defun bootstrap-lisp-files (target) (defun bootstrap-lisp-files (target)
(let ((target (format nil "~a := " target))) (let ((target (format nil "~a := " target)))
......
...@@ -13,18 +13,9 @@ ...@@ -13,18 +13,9 @@
:collect (enough-namestring! p b))) :collect (enough-namestring! p b)))
(defun system-source-files (system &key monolithic) (defun system-source-files (system &key monolithic)
(let* ((sys (find-system system)) (let ((system (find-system system)))
(components (enough-namestrings (system-source-directory system)
(required-components system (input-files 'concatenate-source-op system))))
:other-systems monolithic
:goal-operation 'load-op
:keep-operation 'load-op
:keep-component 'file-component))
(dir (ensure-pathname
(system-source-directory sys)
:want-absolute t :want-directory t))
(pathnames (mapcar 'component-pathname components)))
(enough-namestrings dir pathnames)))
;;; Making release tarballs for asdf, asdf/defsystem, uiop. ;;; Making release tarballs for asdf, asdf/defsystem, uiop.
......
...@@ -42,8 +42,8 @@ you already have a matching UIOP loaded." ...@@ -42,8 +42,8 @@ you already have a matching UIOP loaded."
(:file "filesystem" :depends-on ("os" "pathname")) (:file "filesystem" :depends-on ("os" "pathname"))
(:file "stream" :depends-on ("filesystem")) (:file "stream" :depends-on ("filesystem"))
(:file "image" :depends-on ("stream")) (:file "image" :depends-on ("stream"))
(:file "run-program" :depends-on ("stream"))
(:file "lisp-build" :depends-on ("image")) (:file "lisp-build" :depends-on ("image"))
(:file "run-program" :depends-on ("stream"))
(:file "configuration" :depends-on ("image")) (:file "configuration" :depends-on ("image"))
(:file "backward-driver" :depends-on ("lisp-build" "run-program" "configuration")) (:file "backward-driver" :depends-on ("lisp-build" "run-program" "configuration"))
(:file "driver" :depends-on ("backward-driver")))) (:file "driver" :depends-on ("backward-driver"))))
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