Commit 611490bb authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Do NOT override the asdf-tools defaults from the Makefile

parent b180bd0b
......@@ -17,8 +17,6 @@
# Other targets are for maintainer use only.
#
l ?= sbcl
# Default action: bootstrap asdf.lisp
# That's the only thing that we really need before we may invoke asdf-builder.
all: build/asdf.lisp
......
......@@ -2,10 +2,10 @@
:description "tools to build, test, maintain and release ASDF itself"
:depends-on ((:version "asdf" "3.1.2")
(:version "inferior-shell" "2.0.2")
(:version "cl-ppcre" "2.0.4")
(:version "lisp-invocation" "1.0.2")
(:feature :sbcl "sb-introspect")
"optima" "optima.ppcre")
(:version "cl-ppcre" "2.0.4")
(:version "optima.ppcre" "1.0")
(:feature :sbcl "sb-introspect"))
:components
((:file "package")
(:file "main" :depends-on ("package"))
......
......@@ -85,7 +85,7 @@ based on a list of targets"
;;; Main entry point.
;;; NB: For access control, you could check that only exported symbols are used as entry points.
(defun main (args)
(defun process-arguments (args)
(block nil
(unless args
(format t "No command provided~%")
......@@ -99,9 +99,12 @@ based on a list of targets"
(format t "Command ~A not found~%" (first args))
(return)))
;;; For a multi-call binary, use these cl-launch or buildapp arguments: --dispatch-entry asdf-tools/asdf-tools::main
(defun main (argv)
(initialize-environment)
(process-arguments argv))
(defun entry-point ()
(setf *lisp-interaction* nil)
(uiop:with-fatal-condition-handler ()
(initialize-environment)
(main *command-line-arguments*)))
......@@ -60,15 +60,16 @@
:do (setf (symbol-value variable)
(if-let (x (getenvp envvar))
(funcall transformer x)
defaults))
(eval defaults)))
(setf (gethash envvar h) x)
(setf (gethash short h) x))))
(defun display-environment ()
(format t "Environment for ASDF tools:~%")
(loop :for variable-name :in (mapcar 'first *environment-variable-specs*)
:do (format t "~T~A = ~A~%"
variable-name (symbol-value variable-name))))
(let ((*package* (find-package :asdf-tools)))
(loop :for variable-name :in (mapcar 'first *environment-variable-specs*)
:do (format t "~T~S = ~S~%"
variable-name (symbol-value variable-name)))))
(defun test-definition (def)
(block ()
......
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