[Maxima-commits] [git] Maxima CAS branch rtoy-lisp-list-avail-consistently updated. branch-5_48-base-275-gd2edf1dae

[rtoy <rt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Maxima CAS".

The branch, rtoy-lisp-list-avail-consistently has been updated
       via  d2edf1daed08af4ea45ddd7d1ae79604a7e15d28 (commit)
       via  7b0ca10415d19903d8e65e88f3293a1ddf38f0bc (commit)
      from  7f57f45cce15f7fbf3119227a6025845c110ba99 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d2edf1daed08af4ea45ddd7d1ae79604a7e15d28
Author: Raymond Toy <toy...@gm...>
Date:   Tue Nov 18 17:23:27 2025 -0800

    Quit if MAXIMA_PREFIX is not defined
    
    When running from maxima-local, the envvar MAXIMA_PREFIX should be
    defined.  If it's not, print a message and quit.  This simplifies the
    logic a bit.

diff --git a/src/init-cl.lisp b/src/init-cl.lisp
index 4141978c3..c5ab0a2de 100644
--- a/src/init-cl.lisp
+++ b/src/init-cl.lisp
@@ -329,14 +329,17 @@ maxima [options] --batch-string='batch_answers_from_file:false; ...'
   (cond
     ((maxima-getenv "MAXIMA_LOCAL")
      ;; We're running maxima-local in the src tree.
-     (let ((maxima-dir (if (maxima-getenv "MAXIMA_PREFIX")
-			   (combine-path (maxima-getenv "MAXIMA_PREFIX") "src")
-			   (combine-path (maxima-parse-dirstring *autoconf-libdir*)
-					 *autoconf-package*)))
+     (let ((maxima-dir (maxima-getenv "MAXIMA_PREFIX"))
            ;; I (rtoy) am lazy.  Just use regexp to match
            ;; "src/binary-foo" which is the directory containing the
            ;; build using lisp "foo".
            (pattern (pregexp:pregexp "src/binary-([^/]+)")))
+       ;; maxima-local MUST define MAXIMA_PREFIX envvar so we know where we are.
+       (unless maxima-dir
+         (format t "Environment variable MAXIMA_PREFIX not defined by maxima-local.~%~
+                    Cannot list available versions.  Exiting.~%")
+         (bye))
+       (setf maxima-dir (combine-path maxima-dir "src"))
        (format t "Available versions:~%")
        (dolist (p (directory (concatenate 'string maxima-dir "/*")))
          (destructuring-bind (&optional whole-match lisp-name)

commit 7b0ca10415d19903d8e65e88f3293a1ddf38f0bc
Author: Raymond Toy <toy...@gm...>
Date:   Tue Nov 18 17:16:13 2025 -0800

    Remove old experimental version
    
    This was replaced with the regexp version.

diff --git a/src/init-cl.lisp b/src/init-cl.lisp
index 697348948..4141978c3 100644
--- a/src/init-cl.lisp
+++ b/src/init-cl.lisp
@@ -327,19 +327,6 @@ maxima [options] --batch-string='batch_answers_from_file:false; ...'
 
 (defun list-avail-action ()
   (cond
-    #+nil
-    ((maxima-getenv "MAXIMA_LOCAL")
-     ;; We're running maxima-local in the src tree.
-     (let ((maxima-dir (if (maxima-getenv "MAXIMA_PREFIX")
-			   (combine-path (maxima-getenv "MAXIMA_PREFIX") "src")
-			   (combine-path (maxima-parse-dirstring *autoconf-libdir*)
-					 *autoconf-package* *autoconf-version*))))
-       (dolist (p (directory (concatenate 'string maxima-dir "/*")))
-         (let* ((pname (namestring p))
-                (binary-dir-posn (search "src/binary-" pname)))
-           (when binary-dir-posn
-             (let ((name (subseq pname (+ binary-dir-posn 11))))
-               (format t "version ~a, lisp ~a~%" *autoconf-version* name)))))))
     ((maxima-getenv "MAXIMA_LOCAL")
      ;; We're running maxima-local in the src tree.
      (let ((maxima-dir (if (maxima-getenv "MAXIMA_PREFIX")

-----------------------------------------------------------------------

Summary of changes:
 src/init-cl.lisp | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Maxima CAS