From 90fec59bc262b3d5050c651fdc6be44a31880099 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 14 May 2021 21:50:50 +0100
Subject: [PATCH] dump-runlisp-image.c, runlisp-base.conf: Make version string
 more detailed.

Rather than just check the `lisp-implementation-version', include the
ASDF version too (which is probably rather important).
---
 dump-runlisp-image.c | 5 ++++-
 runlisp-base.conf    | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dump-runlisp-image.c b/dump-runlisp-image.c
index 7d1d88f..9dc6a2a 100644
--- a/dump-runlisp-image.c
+++ b/dump-runlisp-image.c
@@ -702,7 +702,10 @@ static void add_job(unsigned f, struct config_section *sect)
   config_subst_split_var(&config, sect, runvar, &av_version);
   if (!av_version.n)
     lose("empty `run-script' command for Lisp implementation `%s'", name);
-  argv_append(&av_version, xstrdup("?(lisp-implementation-version)"));
+  argv_append(&av_version,
+	      config_subst_string_alloc
+		(&config, sect, "<internal>",
+		 "?${lisp-version?(lisp-implementation-version)}"));
   config_subst_split_var(&config, sect, dumpvar, &av_dump);
   if (!av_dump.n)
     lose("empty `dump-image' command for Lisp implementation `%s'", name);
diff --git a/runlisp-base.conf b/runlisp-base.conf
index f6dea72..b11f248 100644
--- a/runlisp-base.conf
+++ b/runlisp-base.conf
@@ -111,6 +111,14 @@ dump-image-prelude =
 	  ${ignore-shebang}
 	  ${set-script-feature})
 
+;; An expression to determine the version information for the running Lisp.
+lisp-version =
+	(list (list* \'lisp
+		     (lisp-implementation-type)
+		     (multiple-value-list (lisp-implementation-version)))
+	      (cons \'asdf
+		    (asdf:component-version (asdf:find-system "asdf"))))
+
 ;; Full pathname to custom image.
 image-path = ${@image-dir}/${image-file}
 
-- 
2.11.0