add lexical binding cookie to lisp/helper.el (#623)

CMUCL was published as .tar.bz2 up to 21e and switched to .tar.xz with
21f, but the installer always asked for .tar.bz2.  Since it picks the
newest release when no version is given, `ros install cmu-bin` now
always 404s:

  Downloading https://common-lisp.net/project/cmucl/downloads/release/21f/cmucl-21f-x86-linux.tar.bz2
  Downloading archive:...:NG
  bzip2: Can't open input file .../cmucl-21f-x86-linux.tar.bz2
  tar: This does not look like a tar archive
  Error: unable to use 'cmu-bin'

Look the file up in the release directory instead of assuming, the same
listing cmu-bin-get-version already parses, and keep .tar.bz2 as the
fallback when the listing can't be read.  extract() already handles .xz,
so nothing else needs to change.

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

.github/workflows/build.yml

@@ -1,69 +0,0 @@
-name: CI
-
-on:
-  push:
-  #pull_request:
-  #schedule:
-  #  - cron: '0 */2 * * *'
-
-jobs:
-  build-windows:
-    runs-on: windows-latest
-    timeout-minutes: 90
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [x86_64, i686]
-        include:
-        - arch: x86_64
-          arch2: amd64
-          bit: 64
-        - arch: i686
-          arch2: i686
-          bit: 32
-    env:
-      RESULT_NAME: windows-${{ matrix.arch2 }}
-      RESULT_PATH: windows-${{ matrix.arch2 }}
-      RESULT_PATH_SUB: roswell
-    steps:
-    - run: git config --global core.autocrlf false
-    - uses: actions/checkout@v2
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW${{ matrix.bit }}
-        path-type: inherit
-        release: true
-        update: true
-        install: 'base-devel mingw-w64-${{ matrix.arch }}-toolchain'
-    - name: Run MSYS2 once
-      shell: msys2 {0}
-      run: |
-        pwd
-        echo $MSYSTEM
-        echo $MSYS2_PATH_TYPE
-        echo $PATH
-    - name: Build
-      shell: msys2 {0}
-      run: |
-        gcc -v
-        ./bootstrap
-        ./configure
-        make
-        make install
-        make winrelease
-    - name: Copy result
-      if: always()
-      shell: msys2 {0}
-      run: |
-        mkdir -p $RESULT_PATH
-        cp *.zip $RESULT_PATH/tmp.zip
-        cd $RESULT_PATH
-        7z x tmp.zip
-        rm tmp.zip
-    - name: Upload Result
-      if: always()
-      uses: actions/upload-artifact@v1
-      with:
-        name: ${{ env.RESULT_NAME }}
-        path: ${{ env.RESULT_PATH }}
-

.github/workflows/linux.yml

@@ -1,4 +1,4 @@
-name: linux
+name: Linux
 
 on:
   push:
@@ -10,47 +10,54 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        image: [musl64]
+        variant: ['', '-musl', '-glibc2.31']
+        target: ['x86_64', 'arm64', 'riscv64']
         include:
-        - lisp: sbcl-bin/2.0.0
-          target: x86-64
-          image: musl64
-          makeopts: musl
-        - lisp: sbcl-bin/2.0.0
-          target: x86-64
-          image: musl64
-          makeopts: musl
-          variant: -musl
-        - lisp: sbcl-bin/2.0.0
-          target: x86-64
-          image: deb
-          makeopts: deb
-        - lisp: sbcl-bin/2.0.0
-          target: x86-64
-          image: pandoc
-          makeopts: docs
+          # set default docker platform and image suffix.
+          - {docker-platform: linux/amd64  ,docker-image-suffix: '', makeopts: musl }
+          - {target: arm64   ,docker-platform: linux/arm64   ,docker-image-suffix: 'aarch64' }
+          - {target: riscv64 ,docker-platform: linux/riscv64 ,docker-image-suffix: 'riscv64' }
+          - {image: deb,    makeopts: deb,  target: x86-64 ,docker-platform: linux/amd64}
+          - {image: pandoc, makeopts: docs, target: x86-64 ,docker-platform: linux/amd64}
+
     environment: SET_VERSION
 
     steps:
-      - uses: actions/checkout@v2
-
+      - uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: tonistiigi/binfmt:qemu-v8.1.5
       - name: setenv
         run: |
           echo "$HOME/.roswell/bin" >> $GITHUB_PATH
           echo "ROSWELL_BRANCH=release" >> $GITHUB_ENV
       - name: checkenv
         run: |
-          uname -s
-          uname -m
+          uname -s -m
       - name: Install Roswell
         env:
-          LISP: ${{ matrix.lisp }}
+          LISP: sbcl-bin/2.4.0
           GITHUB_OAUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IMAGE: ${{ matrix.image }}
         run: |
           sh scripts/install-for-ci.sh
           ros install snmsts/sn.github
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: docker.pkg.github.com
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: pull or build&push docker image
+        env:
+          DOCKER_PLATFORM: ${{ matrix.docker-platform }}
+          DOCKER_BUILD_OPTIONS: ${{ matrix.docker-build-options }}
+          DOCKER_IMAGE_SUFFIX: ${{ matrix.docker-image-suffix }}
+          IMAGE: ${{ matrix.image }}
+        run: |
           if [ -n "$IMAGE" ]; then
-             docker login docker.pkg.github.com -u snmsts -p $GITHUB_OAUTH_TOKEN;
              make -f scripts/Makefile pull-docker || make -f scripts/Makefile build-docker push-docker
           fi
       - name: build
@@ -60,6 +67,9 @@ jobs:
           DOCKER: ${{ matrix.docker }}
           SUFFIX: ${{ matrix.suffix }}
           LINKFLAGS: ${{ matrix.linkflags }}
+          DOCKER_PLATFORM: ${{ matrix.docker-platform }}
+          DOCKER_BUILD_OPTIONS: ${{ matrix.docker-build-options }}
+          DOCKER_IMAGE_SUFFIX: ${{ matrix.docker-image-suffix }}
           IMAGE: ${{ matrix.image }}
           MAKEOPTS: ${{ matrix.makeopts }}
           VARIANT: ${{ matrix.variant }}

.github/workflows/osx.yml

@@ -6,25 +6,34 @@ on:
 
 jobs:
   build:
-    runs-on: macos-10.15
+    runs-on: ${{ matrix.target == 'arm64' && 'macos-14' || 'macos-15-intel' }}
     strategy:
+      fail-fast: false
       matrix:
-        lisp: [sbcl-bin/2.0.0]
-        target: [x86-64]
+        lisp: [sbcl-bin/2.3.8]
+        target: [arm64, x86-64]
     environment: SET_VERSION
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - name: setenv
+        run: |
+          echo "$HOME/.roswell/bin" >> $GITHUB_PATH
+          echo "ROSWELL_INSTALL_DIR=$HOME/.roswell" >> $GITHUB_ENV
       - name: checkenv
         run: |
-          uname -s
-          uname -m
+          uname -s -m
           brew install autoconf automake
       - name: Build
+        env:
+          CFLAGS: -mmacosx-version-min=10.9
+          CXXFLAGS: -mmacosx-version-min=10.9
+          LDFLAGS: -mmacosx-version-min=10.9
+          ARCH: ${{ matrix.target }}
         run: |
           gcc -v
           ./bootstrap
-          ./configure
+          ./configure --prefix=$ROSWELL_INSTALL_DIR
           make
           make install
           make pack

.github/workflows/test.yml

@@ -1,7 +1,8 @@
 name: test
 
 on:
-  push:
+  schedule:
+    - cron:  '0 1 * * *'
   workflow_dispatch:
 
 jobs:
@@ -20,9 +21,16 @@ jobs:
          - ecl
          - clisp
          - ccl-bin
-         - sbcl/1.4.0
+         - sbcl/2.4.0
          - ccl32
         experimental: [false]
+        exclude:
+          - lisp: ccl-bin
+            os: macos-latest
+          - lisp: ccl32
+            os: macos-latest
+          - lisp: cmu-bin/2019-06
+            os: macos-latest
         include:
           - lisp: mkcl
             os: macos-latest
@@ -63,5 +71,5 @@ jobs:
           ros version=t run
           ros install prove
           run-prove roswell-test.asd 2>&1
-          ros -q run && [`ros -q run 2>&1` == ""]
+          ros -q run && [ "$(ros -q run 2>&1)" = "" ]
           ros config

.github/workflows/windows.yml

@@ -63,3 +63,51 @@ jobs:
         shell: msys2 {0}
         run: |
           make -f scripts/Makefile latest-version win-upload
+
+  build-windows-arm64:
+    runs-on: windows-11-arm
+    timeout-minutes: 90
+    env:
+      RESULT_NAME: windows-aarch64
+      RESULT_PATH: windows-aarch64
+      RESULT_PATH_SUB: roswell
+
+    environment: SET_VERSION
+
+    steps:
+      - run: git config --global core.autocrlf false
+      - uses: actions/checkout@v2
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: CLANGARM64
+          path-type: inherit
+          release: true
+          update: true
+          install: >-
+            base-devel
+            p7zip
+            autotools
+            mingw-w64-clang-aarch64-toolchain
+            mingw-w64-clang-aarch64-autotools
+      - name: Run MSYS2 once
+        shell: msys2 {0}
+        run: |
+          pwd
+          echo $MSYSTEM
+          echo $MSYSTEM_CARCH
+          echo $PATH
+      - name: Build
+        shell: msys2 {0}
+        run: |
+          clang -v
+          ./bootstrap
+          CC=clang ./configure
+          make
+          make install
+          make pack.zip
+      - name: Upload
+        env:
+          GITHUB_OAUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: msys2 {0}
+        run: |
+          make -f scripts/Makefile latest-version win-upload

ChangeLog

@@ -1,3 +1,24 @@
+roswell (26.02.116-1) unstable; urgency=low
+
+  * Fix: failure to load djula on sbcl 2.5.11 environment.
+  * Fix: declaration-definition disagreement in src/cmd-run.h. (reported by ItsMeForLua and fixed by Trichiurus-lepturus)
+  * Fix: support sbcl lisp-implementation-version returning '2.4.10.roswell'.
+  * Change: Allegro CL upgraded to release 11.0express. (by Xiaming Chen)
+  * Change: ros command return 1 when script file not found.
+  * Change: ros fmt rewritten to use cl-indentify.
+
+ -- SANO,Masatoshi <snmsts@gmail.com>  Tue, 24 Feb 2026 06:39:51 +0900
+
+roswell (24.10.115-1) unstable; urgency=low
+
+  * New: tested on darwin/ppc environment.
+  * New: tested on netbsd/aarch64 environment.
+  * Fix: absolute path error on Windows (by Ashton Fagg)
+  * Fix: build error on non Windows environment with windres (reported by Richard DW Redcroft)
+  * Fix: error message in build (by Rongsong Shen)
+
+ -- snmsts <snmsts@gmail.com>  Wed, 16 Oct 2024 15:06:42 +0900
+
 roswell (23.10.14.114-1) unstable; urgency=low
 
   * New: use patchelf to support for distributions like guix/nix.

Makefile.am

@@ -77,7 +77,8 @@ LISPS = helper.el \
 	install+7zip.lisp install-abcl-bin.lisp install-allegro.lisp \
 	install-ccl-bin.lisp install-clasp-bin.lisp install-clasp.lisp \
 	install-clisp.lisp install-clisp-head.lisp \
-	install-cmu-bin.lisp install-ecl.lisp install-quicklisp.lisp \
+	install-cmu-bin.lisp install-dotcl-bin.lisp install-ecl.lisp \
+	install-quicklisp.lisp \
 	install-sbcl-bin.lisp install-sbcl.lisp install-sbcl-source.lisp \
 	install-sbcl-head.lisp \
 	install-slime.lisp install-sly.lisp \
@@ -122,7 +123,7 @@ winrelease: roswell/Makefile
 	cp lisp/*.lisp lisp/*.ros lisp/*.el roswell/lisp
 	cd documents;MSYSTEM=MINGW64 make roswell.chm
 	cp documents/roswell.chm roswell/documents
-	7z a Roswell-`if [ $$MSYSTEM = 'MINGW64' ];then echo x86_64 ;else echo i686; fi`.zip roswell/ros.exe roswell/lisp/*.* roswell/documents/roswell.chm
+	7z a Roswell-`if [ "$$MSYSTEM" = "MINGW64" ];then echo x86_64 ;elif [ "$$MSYSTEM" = "CLANGARM64" ];then echo aarch64; else echo i686; fi`.zip roswell/ros.exe roswell/lisp/*.* roswell/documents/roswell.chm
 debian:
 	ros debian/debian.ros all
 test:
@@ -131,7 +132,7 @@ brewpr:
 	git pull
 	if [ `uname` = 'Darwin' ];then brew bump-formula-pr -v --url=https://github.com/roswell/roswell/archive/`git describe --abbrev=0 --tags`.tar.gz roswell; fi
 
-PACK = $(PACKAGE)-$(VERSION)-$(shell uname -s | tr '[A-Z]' '[a-z]' | sed -E 's/([^-]*).*/\1/')-$(shell uname -m)$(SBCL_BIN_VARIANT)
+PACK = $(PACKAGE)-$(VERSION)-$(shell uname -s | tr '[A-Z]' '[a-z]' | sed -E 's/([^-]*).*/\1/')-$(ARCH)$(SBCL_BIN_VARIANT)
 
 roswell/Makefile:
 	rm -rf roswell
@@ -171,7 +172,7 @@ $(PACK).tar.bz2: roswell/Makefile
 
 pack: $(PACK).tar.bz2
 
-WINPACK = roswell_$(VERSION)_$(shell if [ $$MSYSTEM = 'MINGW64' ];then echo amd64 ;else echo i686; fi)
+WINPACK = roswell_$(VERSION)_$(shell if [ "$$MSYSTEM" = "MINGW64" ];then echo amd64 ;elif [ "$$MSYSTEM" = "CLANGARM64" ];then echo aarch64; else echo i686; fi)
 
 pack.zip: $(PACK).tar.bz2
 	7z a $(WINPACK).zip roswell

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT([roswell],[23.10.14.114],snmsts@gmail.com)
+AC_INIT([roswell],[26.02.116],snmsts@gmail.com)
 CFLAGS=${CFLAGS=""}
 CXXFLAGS=${CXXFLAGS=""}
 
@@ -58,7 +58,7 @@ AC_CHECK_HEADERS(gnu/libc-version.h)
 AC_CHECK_HEADERS(windows.h,[with_windows=true])
 AM_CONDITIONAL([WITH_WINDOWS], [test "$with_windows" != ""])
 AC_CHECK_TOOL([WINDRES], [windres], [])
-AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != ""])
+AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "" -a "$with_windows" != ""])
 
 AC_CHECK_MEMBERS([struct dirent.d_type],,,[#include <dirent.h>])
 

lisp/dump-sbcl.lisp

@@ -126,10 +126,14 @@ IR1 (deftransform), IR2 (VOP) information in the infodb."
                  (setf (sb-impl::package-%shadowing-symbols package) nil)
                  (format t ".")
                  (setf (sb-impl::package-internal-symbols package)
-                       (sb-impl::make-package-hashtable 0))
+                       (if (fboundp 'sb-impl::make-symbol-table)
+                           (sb-impl::make-symbol-table 0)
+                           (sb-impl::make-package-hashtable 0)))
                  (format t ".")
                  (setf (sb-impl::package-external-symbols package)
-                       (sb-impl::make-package-hashtable 0))
+                       (if (fboundp 'sb-impl::make-symbol-table)
+                           (sb-impl::make-symbol-table 0)
+                           (sb-impl::make-package-hashtable 0)))
                  (format t ".")
                  (setf (sb-impl::package-tables package) #())
                  (format t ".")

lisp/fmt.ros

@@ -5,17 +5,30 @@ exec ros -Q -N roswell -- $0 "$@"
 |#
 (progn ;;init forms
   (ros:ensure-asdf)
-  #+quicklisp
-  (progn
-    (unless (ql:where-is-system :lem)
-      (roswell:roswell '("git" "clone" "https://github.com/cxxxr/lem.git"))
-      (roswell.util:read-call "roswell.util:local-project-build-hash" :rebuild t))
-    (ql:quickload '("swank" "lem" "lem-lisp-syntax") :silent t)))
+  #+sbcl (require "sb-introspect")
+  #+quicklisp (ql:quickload '("cl-indentify") :silent t))
 
 (defpackage :ros.script.fmt.3707812168
   (:use :cl))
 (in-package :ros.script.fmt.3707812168)
 
+(defun function-lambda-list (fn)
+  "Portably retrieve a function's lambda list."
+  (ignore-errors
+    #+sbcl
+    (funcall (find-symbol "FUNCTION-LAMBDA-LIST" "SB-INTROSPECT") fn)
+    #-sbcl nil))
+
+(defun register-macro-templates ()
+  "Auto-detect macros with &body and register cl-indentify templates."
+  (do-all-symbols (sym)
+    (when (macro-function sym)
+      (let* ((arglist (function-lambda-list (macro-function sym)))
+             (body-pos (position '&body arglist)))
+        (when body-pos
+          (setf (indentify:indent-template sym)
+                `(:style :call :count ,body-pos)))))))
+
 (defun system (path)
   (let ((* (when (and (probe-file path)
                       (equal (pathname-type path) "asd"))
@@ -37,15 +50,39 @@ exec ros -Q -N roswell -- $0 "$@"
                   (list c)))))
       (when *
         (ql:quickload * :silent (not (ros:verbose)))
-        (lem-lisp-syntax.indent:indentation-update)
+        (register-macro-templates)
         (r (asdf:find-system *))))))
 
+(defun register-standard-templates ()
+  "Override templates to match Lem/Emacs/SLIME indentation."
+  ;; if: (&rest nil) in Lem - all args aligned with first arg
+  (setf (indentify:indent-template 'if) '(:count 3))
+  ;; case/typecase: (4 &rest (&whole 2 &rest 1)) - clause body at paren+1
+  (dolist (sym '(case ccase ecase typecase ctypecase etypecase))
+    (setf (indentify:indent-template sym)
+          '(:count 1 :sub (nil nil (:style :list)))))
+  ;; cond: (&rest (&whole 2 &rest 1)) - clause body at paren+1
+  (setf (indentify:indent-template 'cond)
+        '(:count 0 :sub (nil (:style :list)))))
+
+(defun format-file (file)
+  (let ((result (with-output-to-string (out)
+                  (with-open-file (in file)
+                    (indentify:indentify in out)))))
+    (with-open-file (out file :direction :output :if-exists :supersede)
+      (with-input-from-string (in result)
+        (loop for line = (read-line in nil)
+              while line
+              do (write-string (string-right-trim '(#\Space #\Tab) line) out)
+                 (terpri out))))))
+
 (defun main (&rest argv)
   "go fmt like something"
+  (indentify:load-default-templates)
+  (register-standard-templates)
   (dolist (arg (if argv
-                   (prog1 (loop for arg in argv
-                                append (or (system arg) (list arg)))
-                     (lem-lisp-syntax:indentation-update))
+                   (loop for arg in argv
+                         append (or (system arg) (list arg)))
                    (ignore-errors
                     (let* ((name (first (last (pathname-directory *default-pathname-defaults*))))
                            (path (probe-file (make-pathname :name name :type "asd"))))
@@ -53,18 +90,6 @@ exec ros -Q -N roswell -- $0 "$@"
                           (append (directory "*.lisp")
                                   (directory "*.ros")))))))
     (if (probe-file arg)
-        (let ((buffer (lem-base:find-file-buffer arg)))
-          (setf (lem-base:buffer-syntax-table buffer)
-                lem-lisp-syntax:*syntax-table*)
-          (setf (lem-base:variable-value 'lem-base:calc-indent-function :buffer buffer)
-                'lem-lisp-syntax:calc-indent)
-          (lem-base:indent-points (lem-base:buffer-start-point buffer)
-                                  (lem-base:buffer-end-point buffer))
-          (loop with regexp = "[ 	]+$" ;; remove trailing spaces.
-                for start = (lem-base:search-forward-regexp (lem-base:copy-point (lem-base:buffer-start-point buffer)) regexp)
-                while start
-                for end = (lem-base:search-backward-regexp (lem-base:copy-point start) regexp)
-                do (lem-base:delete-between-points start end))
-          (lem-base:write-to-file buffer (lem-base:buffer-filename buffer)))
+        (format-file arg)
         (format *error-output* "~A does not exist" arg))))
 ;;; vim: set ft=lisp lisp:

lisp/helper.el

@@ -1,3 +1,4 @@
+;; -*- lexical-binding: nil; -*-
 (defun roswell-configdir ()
   (substring (shell-command-to-string "ros roswell-internal-use version confdir") 0 -1))
 

lisp/init.lisp

@@ -160,7 +160,8 @@ have the latest asdf, and this file has a workaround for this.
                    (ext:run-shell-command (format nil "~{~A~^ ~}" args))))))
 
 (defun exec (args)
-  #+(and unix sbcl)
+  #+(and unix sbcl
+         (not haiku))
   (execvp (first args) args)
   #+(and unix ccl)
   (ignore-errors
@@ -174,8 +175,8 @@ have the latest asdf, and this file has a workaround for this.
 
   (cond
     (is-quicklisp-already-available
-     (unless (equal (opt "quicklisp")
-                    (namestring (symbol-value (read-from-string "ql:*quicklisp-home*"))))
+     (unless (equal (ignore-errors (truename (pathname (opt "quicklisp"))))
+                    (ignore-errors (truename (symbol-value (read-from-string "ql:*quicklisp-home*")))))
        (setf *local-project-directories*
              (copy-list
               (symbol-value (read-from-string "ql:*local-project-directories*")))))
@@ -308,13 +309,25 @@ As a hacky side effect, files with the same name as PROVIDE is not loaded.
       (or *version-cache*
           (setf *version-cache* (roswell '("roswell-internal-use" "version") :string t)))))
 
+(defun implementation-version ()
+  "cut off after third? dot from lisp-implementation-version"
+  (let ((version (lisp-implementation-version)))
+    (loop with j = 0
+          for i from 0 to (1- (length version))
+          when (eql (aref version i) #\.)
+          do (incf j)
+             (when (= j 3)
+               (return-from implementation-version (subseq version 0 i))))
+    version))
+
+
 #+sbcl
 (when (ignore-errors (string-equal (opt "impl") "sbcl-bin" :end1 8))
   (flet ((source (version)
            (let ((path (merge-pathnames (format nil "src/sbcl-~A/" version) (opt "homedir"))))
              (when (probe-file path)
                (sb-ext:set-sbcl-source-location path)))))
-    (or (source (lisp-implementation-version))
+    (or (source (implementation-version))
         (source "git"))))
 
 (defun source-registry (arg &rest rest)
@@ -433,7 +446,8 @@ As a hacky side effect, files with the same name as PROVIDE is not loaded.
            (with-open-file (in arg)
              (body in)))
           (*latest-system* (apply 'hook (cons arg *argv*)))
-          (t (format t "script ~S does not exist~%" arg)))))
+          (t (format t "script ~S does not exist~%" arg)
+             (quit 1)))))
 
 (defun stdin (arg &rest rest)
   (declare (ignorable arg rest))

lisp/install-allegro.lisp

@@ -13,7 +13,7 @@
                               (version (getf argv :version)))
   (let ((os (intern uname :keyword))
         (machine (intern uname-m :keyword)))
-    (cond ((find version '("11.0bexpress"
+    (cond ((find version '("11.0express"
                            "10.1express")
                  :test 'equal)
            (format nil "~@{~A~}"

lisp/install-cmu-bin.lisp

@@ -21,11 +21,31 @@
   (or (cdr (assoc (uname-m) *cmu-uname-m-alist* :test 'equal))
       (uname-m)))
 
+(defun cmu-bin-directory-uri (version)
+  (format nil "~@{~A~}" (cmu-bin-uri) (if (find #\- version) "snapshots/" "release/")
+          (substitute #\/ #\- version) "/"))
+
+(defun cmu-bin-archive-name (version extra)
+  (format nil "~@{~A~}" "cmucl-" version "-" (cmu-uname-m) "-" (uname) (if extra ".extra" "")))
+
+(defun cmu-bin-archive-type (version)
+  "CMUCL was published as .tar.bz2 up to 21e and as .tar.xz from 21f on,
+so ask the download directory which one it has for VERSION."
+  (let ((file (merge-pathnames (format nil "tmp/cmu-bin-~A.html" version) (homedir)))
+        (name (cmu-bin-archive-name version nil)))
+    (or (ignore-errors
+         (download (cmu-bin-directory-uri version) file :interval (* 60 60))
+         (loop for link in (get-elements-by-tag-name (plump:parse file) "a")
+               for href = (plump:get-attribute link "href")
+               thereis (and href
+                            (find-if (lambda (type)
+                                       (equal href (format nil "~A~A" name type)))
+                                     '(".tar.xz" ".tar.bz2")))))
+        ".tar.bz2")))
+
 (defun cmu-bin-archive-uri (version extra)
-  (let ((uname (uname))
-        (cmu-uname-m (cmu-uname-m)))
-    (format nil "~@{~A~}" (cmu-bin-uri) (if (find #\- version) "snapshots/" "release/")
-            (substitute #\/ #\- version) "/cmucl-" version "-" cmu-uname-m "-" uname (if extra ".extra" "") ".tar.bz2")))
+  (format nil "~@{~A~}" (cmu-bin-directory-uri version)
+          (cmu-bin-archive-name version extra) (cmu-bin-archive-type version)))
 
 (defun cmu-bin-argv-parse (argv)
   (format *error-output* "~&Installing cmu-bin/~A...~%" (getf argv :version))

lisp/install-dotcl-bin.lisp

@@ -0,0 +1,95 @@
+(roswell:include "util-install")
+(defpackage :roswell.install.dotcl-bin
+  (:use :cl :roswell.install :roswell.util :roswell.locations))
+(in-package :roswell.install.dotcl-bin)
+
+(defun dotcl-bin-impl ()
+  (merge-pathnames (format nil "impls/~A/~A/dotcl-bin/" (uname-m) (uname)) (homedir)))
+
+(defun dotcl-bin-rid ()
+  (let* ((arch (uname-m))
+         (os (uname))
+         (arch-key (cond ((equal arch "x86-64") "x64")
+                         ((equal arch "arm64") "arm64")
+                         (t (error "dotcl-bin: unsupported arch ~A" arch))))
+         (os-key (cond ((equal os "linux") "linux")
+                       ((equal os "darwin") "osx")
+                       ((equal os "windows") "win")
+                       (t (error "dotcl-bin: unsupported os ~A" os)))))
+    (format nil "~A-~A" os-key arch-key)))
+
+(defvar *dotcl-bin-version-cache* nil)
+
+(defun dotcl-bin-get-version ()
+  (or *dotcl-bin-version-cache*
+      (setf *dotcl-bin-version-cache*
+            (let ((file (merge-pathnames "tmp/dotcl-bin.json" (homedir))))
+              (format *error-output* "Checking version to install....~%")
+              (download "https://api.github.com/repos/dotcl/dotcl/releases" file)
+              (with-open-file (in file)
+                (loop for line = (read-line in nil nil) while line
+                      for pos = (search "\"tag_name\"" line)
+                      when pos
+                      collect (let* ((q1 (position #\" line :start (+ pos 11)))
+                                     (q2 (and q1 (position #\" line :start (1+ q1)))))
+                                (when (and q1 q2)
+                                  (let ((tag (subseq line (1+ q1) q2)))
+                                    (if (and (plusp (length tag)) (char= (aref tag 0) #\v))
+                                        (subseq tag 1)
+                                        tag))))))))))
+
+(defun dotcl-bin-argv-parse (argv)
+  (set-opt "prefix" (dotcl-bin-impl))
+  (cons t argv))
+
+(defun dotcl-bin-download (argv)
+  (let ((rid (dotcl-bin-rid))
+        (ver (version argv)))
+    (set-opt "as" ver)
+    (set-opt "download.uri"
+             (format nil "https://github.com/dotcl/dotcl/releases/download/v~A/dotcl-~A-~A.tar.bz2"
+                     ver rid ver))
+    (set-opt "download.archive"
+             (let ((pos (position #\/ (opt "download.uri") :from-end t)))
+               (when pos
+                 (merge-pathnames (format nil "archives/~A"
+                                          (subseq (opt "download.uri") (1+ pos)))
+                                  (homedir)))))
+    `((,(opt "download.archive") ,(opt "download.uri")))))
+
+(defun dotcl-bin-expand (argv)
+  (format t "~%Extracting archive:~A~%" (opt "download.archive"))
+  (let ((dest (merge-pathnames (format nil "~A/" (opt "as")) (dotcl-bin-impl))))
+    (when (probe-file dest)
+      (uiop/filesystem:delete-directory-tree dest :validate t))
+    (ensure-directories-exist dest)
+    (expand (opt "download.archive") dest)
+    #-os-windows
+    (let ((apphost (merge-pathnames "runtime" dest)))
+      (when (probe-file apphost)
+        (uiop:run-program (list "chmod" "+x" (namestring apphost))
+                          :ignore-error-status t))))
+  (cons t argv))
+
+(defun dotcl-bin-script (argv)
+  (let* ((dotnet (which "dotnet"))
+         (dir (merge-pathnames (format nil "~A/" (opt "as")) (dotcl-bin-impl))))
+    (unless dotnet
+      (format *error-output* "Error: 'dotnet' (.NET SDK 10+) was not found in PATH.~%")
+      (format *error-output* "       Install .NET SDK 10 from https://dotnet.microsoft.com/download~%")
+      (format *error-output* "       'ros use dotcl-bin' will fail without dotnet.~%")
+      (roswell:quit 1))
+    (install-script
+     (merge-pathnames "dotcl" dir)
+     (format nil "exec \"~Aruntime\" \"$@\"" dir))
+    (cons t argv)))
+
+(defun dotcl-bin (type)
+  (case type
+    (:install `(,(decide-version 'dotcl-bin-get-version)
+                dotcl-bin-argv-parse
+                ,(decide-download 'dotcl-bin-download)
+                dotcl-bin-expand
+                dotcl-bin-script
+                setup))
+    (:list 'dotcl-bin-get-version)))

lisp/locations.lisp

@@ -54,7 +54,7 @@
 
 (export
  (defvar *allegro-agreement-uri*
-   '(#+darwin ("11.0bexpress" . "https://franz.com/ftp/pub/legal/ACL-Express-20170301.pdf")
+   '(("11.0express" . "https://franz.com/ftp/pub/legal/ACL-Express-20170301.pdf")
      ("10.1express" . #1="https://franz.com/ftp/pub/legal/ACL-Express-20170301.pdf")
      ("100express"  . #1#)
      ("101b"        . "http://franz.com/products/licensing/FSLA10.1.beta.pdf"))))

lisp/update.ros

@@ -26,10 +26,17 @@ exec ros -Q -m roswell -N roswell -- $0 "$@"
        ;; update systems
        (dolist (alias argv)
          (loop
-            with path = (ignore-errors
-                          (make-pathname
-                           :type nil :name nil
-                           :defaults (asdf:system-source-file (asdf:find-system alias))))
+            with path = (or
+                         (and (find #\/ alias)
+                              (let ((dir (merge-pathnames
+                                          (format nil "local-projects/~A/" alias)
+                                          (roswell.util:homedir))))
+                                (when (probe-file (merge-pathnames ".git/" dir))
+                                  dir)))
+                         (ignore-errors
+                           (make-pathname
+                            :type nil :name nil
+                            :defaults (asdf:system-source-file (asdf:find-system alias)))))
             for f in *update-functions*
             for r = (and path (funcall f path))
             when r do (roswell:roswell `("install" ,alias))

lisp/util-template.lisp

@@ -1,7 +1,7 @@
 #+ros.init
 (roswell:include '("util" "system") "util-template")
 #+quicklisp
-(ql:quickload '("uiop" "djula") :silent t)
+(ignore-errors (ql:quickload '("uiop" "djula") :silent t))
 (defpackage :roswell.util.template
   (:use :cl)
   (:export
@@ -113,7 +113,8 @@
                  :name (format nil "roswell.init.~A" template-name)))
 
 (defun apply-djula (template-string stream params)
-  (apply 'djula::render-template* (djula::compile-string template-string) stream
+  (apply (read-from-string "djula::render-template*")
+         (read-call "djula::compile-string" template-string) stream
          `(,@params
            :author ,(author)
            :email ,(email)

roswell.asd

@@ -1,5 +1,5 @@
 (defsystem "roswell"
-  :version "23.10.14.114"
+  :version "26.2.116"
   :author "SANO Masatoshi"
   :license "MIT"
   :depends-on ("simple-date-time" "split-sequence" "plump" "zip")

scripts/Docker/musl64/Dockerfile

@@ -1,7 +1,5 @@
-FROM alpine:3.13
+FROM alpine:3.20
 run apk add --no-cache \
 	alpine-sdk automake autoconf curl-dev bash linux-headers \
-	curl-static nghttp2-static openssl-libs-static brotli-static zlib-static; \
-	cd /tmp/roswell;./bootstrap;./configure --with-sbcl-bin-variant='-musl';make; make install; \
-	ros install sbcl-bin/2.0.5; \
-	rm -rf /tmp/roswell
+	curl-static nghttp2-static openssl-libs-static brotli-static zlib-static zstd-static c-ares-static \
+	libidn2-static libunistring-static libpsl-static;

scripts/Docker/musl64/Name

@@ -1 +1 @@
-roswell-musl:64
+roswell-musl:24.10

scripts/Makefile

@@ -1,6 +1,12 @@
 -include .env
 export $(shell sed 's/=.*//' .env)
 
+DOCKER_REPO ?= docker.pkg.github.com/roswell/roswell
+DOCKER_PLATFORM ?= linux/amd64
+DOCKER_BUILD_OPTIONS ?=
+DOCKER_IMAGE_SUFFIX ?=
+IMAGE ?=
+
 all:
 	echo all
 
@@ -16,20 +22,27 @@ show:
 	@echo VERSION=$(VERSION) VARIANT=$(VARIANT)
 
 build-docker:
-	docker build -t docker.pkg.github.com/roswell/roswell/$$(cat ./scripts/Docker/$(IMAGE)/Name) ./scripts/Docker/$(IMAGE)
+	docker build \
+		--platform $(DOCKER_PLATFORM) \
+		-t $(DOCKER_REPO)/$$(cat ./scripts/Docker/$(IMAGE)/Name)$(DOCKER_IMAGE_SUFFIX) \
+		$(DOCKER_BUILD_OPTIONS) \
+		./scripts/Docker/$(IMAGE)
 push-docker:
-	docker push docker.pkg.github.com/roswell/roswell/$$(cat ./scripts/Docker/$(IMAGE)/Name);
+	docker push $(DOCKER_REPO)/$$(cat ./scripts/Docker/$(IMAGE)/Name)$(DOCKER_IMAGE_SUFFIX);
 pull-docker:
-	docker pull docker.pkg.github.com/roswell/roswell/$$(cat ./scripts/Docker/$(IMAGE)/Name);
+	docker pull $(DOCKER_REPO)/$$(cat ./scripts/Docker/$(IMAGE)/Name)$(DOCKER_IMAGE_SUFFIX);
 docker:
 	docker run \
+		--rm \
+		--platform $(DOCKER_PLATFORM) \
 		-v `pwd`:/tmp2 \
 		-e ARCH=$(ARCH) \
 		-e VERSION=$(VERSION) \
+		-e SUFFIX=$(SUFFIX) \
 		-e CFLAGS=$(CFLAGS) \
 		-e LINKFLAGS=$(LINKFLAGS) \
 		-e VARIANT=$(VARIANT) \
-		docker.pkg.github.com/roswell/roswell/$$(cat ./scripts/Docker/$(IMAGE)/Name) \
+		$(DOCKER_REPO)/$$(cat ./scripts/Docker/$(IMAGE)/Name)$(DOCKER_IMAGE_SUFFIX) \
 		bash \
 		-c "cd /tmp2;make -f scripts/Makefile $(MAKEOPTS)"
 upload:
@@ -41,7 +54,7 @@ musl:
 	./bootstrap
 	./configure --enable-maintainer-mode --with-sbcl-bin-variant=$(VARIANT) \
 	LDFLAGS="--static -static-libgcc -static-libstdc++ -static" \
-	LIBS="-lcurl -lbrotlidec-static -lbrotlicommon-static -lnghttp2 -lssl -lcrypto -lz"
+	LIBS="-lcurl -lbrotlidec -lbrotlicommon -lnghttp2 -lssl -lcrypto -lz -lzstd -lcares -lidn2 -lunistring -lpsl"
 	make
 	make pack
 

scripts/install-for-ci.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-ROSWELL_RELEASE_VERSION=22.12.14.113
+ROSWELL_RELEASE_VERSION=26.02.116
 ROSWELL_TARBALL_PATH=$HOME/roswell.tar.gz
 ROSWELL_DIR=$HOME/.roswell
 ROSWELL_REPO=${ROSWELL_REPO:-https://github.com/roswell/roswell}
@@ -33,10 +33,16 @@ log () {
 
 fetch () {
     echo "Downloading $1..."
-    if curl --no-progress-bar --retry 10 -o $2 -L $1; then
-        return 0;
+    if curl --no-progress-bar --retry 10 --connect-timeout 30 \
+            --max-time 300 -o "$2" -L "$1" 2>&1; then
+        echo "✓ Successfully downloaded $1"
+        return 0
     else
-        echo "Failed to download $1."
+        code=$?  # capture curl's exit code immediately
+        echo "✗ Failed to download $1"
+        echo "  URL: $1"
+        echo "  Destination: $2" 
+        echo "  Curl exit code: $code"
         exit 1
     fi
 }
@@ -159,7 +165,7 @@ install_roswell_bin () {
             GNUMAKE=/usr/local/bin/gmake
             apt_unless_installed roswell
         elif [ `uname` = "Darwin" ] && [ $ROSWELL_BRANCH = release ]; then
-            apt_unless_installed roswell
+            brew upgrade roswell 2>/dev/null || brew install roswell
         fi
     fi
 }
@@ -202,8 +208,6 @@ install_sbcl_bin () {
 install_lisp_dependency () {
     case "$USE_LISP" in
         alisp|allegro)
-	      apt_unless_installed libc6-i386
-          apt_unless_installed gcc-multilib
           USE_LISP=allegro
           ;;
         cmu|cmucl|cmu-bin)
@@ -221,6 +225,13 @@ install_lisp_dependency () {
           apt_unless_installed gcc-multilib
           ros config set ccl.bit 32
           ;;
+        sbcl/*)
+          if [ "$(uname)" = "Darwin" ]; then
+              brew install zstd 2>/dev/null || true
+          else
+              apt_unless_installed libzstd-dev
+          fi
+          ;;
         # 'sbcl-bin' is the default
         "")
           USE_LISP=sbcl-bin

scripts/release.ros

@@ -30,7 +30,7 @@ exec ros -Q -L sbcl-bin -- $0 "$@"
         (d (multiple-value-list(decode-universal-time (get-universal-time)))))
     (setf (first version) (- (nth 5 d) 2000)
           (second version) (nth 4 d)
-          (fourth version) (1+ (fourth version)))
+          (first (last version)) (1+ (first (last version))))
     (format nil "~{~2,'0d~^.~}" version)))
 
 (defun edit-file (path match replace version &key test)
@@ -179,7 +179,7 @@ exec ros -Q -L sbcl-bin -- $0 "$@"
 
 (defun main (subcmd &rest argv)
   (declare (ignorable argv))
-  (let ((subcmd (find subcmd '(prepare release release-push changelog release-ci)
+  (let ((subcmd (find subcmd '(prepare release-commit release-push changelog release-ci)
                       :test 'equal :key 'string-downcase)))
     (when subcmd
       (funcall subcmd argv))))

src/Makefile.am

@@ -32,7 +32,7 @@ ros_SOURCES = main.c opt.c download.c download_windows.c archive.c archive_windo
 	cmd-internal.c cmd-script.c \
 	cmd-run.c cmd-run-sbcl.c cmd-run-ccl.c cmd-run-clasp.c cmd-run-clisp.c cmd-run-ecl.c \
 	cmd-run-mkcl.c cmd-run-abcl.c cmd-run-cmu.c cmd-run-acl.c cmd-run-lispworks.c \
-	cmd-run-npt.c \
+	cmd-run-npt.c cmd-run-dotcl.c \
 	cmd-install.c install-sbcl-bin.c install-sbcl-bin_windows.c
 
 if WITH_WIN_ICON

src/cmd-run-dotcl.c

@@ -0,0 +1,45 @@
+#include "opt.h"
+
+char** cmd_run_dotcl(int argc,char** argv,struct sub_command* cmd) {
+  char* home=configdir();
+  char* arch=uname_m();
+  char* os=uname_s();
+  char* impl=(char*)cmd->name;
+  char* version=(char*)cmd->short_name;
+  /*[apphost binary] --eval init.lisp --eval (ros:run '(...)) [repl] */
+  int i;
+  char* impl_path=impldir(arch,os,impl, version);
+  char* help=get_opt("help",0);
+  char* script=get_opt("script",0);
+  char* program=get_opt("program",0);
+  char* dotcl_version=get_opt("version",0);
+  LVal ret=0;
+
+  s(arch),s(os);
+
+  ret=conss(cat(home,impl_path,DIRSEP,"runtime",EXE_EXTENTION,NULL),ret);
+
+  if(dotcl_version) {
+    ret=conss(q("--eval"),ret);
+    ret=conss(q("(progn (format t \"~A ~A~%\" (lisp-implementation-type) (lisp-implementation-version)) (dotcl:quit))"),ret);
+  }
+  ret=conss(q("--eval"),ret);
+  ret=conss(s_cat(q("(progn #-ros.init(cl:load \""),s_escape_string(lispdir()),q("init.lisp"),q("\"))"),NULL),ret);
+  ret=conss(q("--eval"),ret);
+  ret=conss(s_cat(q("(ros:run '("),q(program?program:""),
+                  script?cat("(:script ",script,")","(:quit ())",NULL):q(""),
+                  q("))"),NULL),ret);
+
+  /* dotcl exits after --eval/--load by default; for interactive (no script)
+     append the `repl` subcommand to keep the process alive. */
+  if(!script) {
+    ret=conss(q("repl"),ret);
+  }
+
+  for(i=1;i<argc;++i)
+    ret=conss(q(argv[i]),ret);
+
+  s(impl_path);
+  cond_printf(1,"\nhelp=%s script=%s\n",help?"t":"nil",script?script:"nil");
+  return stringlist_array(nreverse(ret));
+}

src/cmd-run.c

@@ -26,6 +26,8 @@ struct run_impl_t impls_to_run[]={
   {"lispworks",&cmd_run_lispworks},
   {"mkcl",&cmd_run_mkcl},
   {"npt",&cmd_run_npt},
+  {"dotcl",&cmd_run_dotcl},
+  {"dotcl-bin",&cmd_run_dotcl},
 };
 
 struct proc_opt run;

src/cmd-run.h

@@ -24,7 +24,8 @@ extern char** cmd_run_acl(int argc,char** argv,struct sub_command* cmd);
 extern char** cmd_run_lispworks(int argc,char** argv,struct sub_command* cmd);
 extern char** cmd_run_mkcl(int argc,char** argv,struct sub_command* cmd);
 extern char** cmd_run_npt(int argc,char** argv,struct sub_command* cmd);
-extern LVal register_runtime_options();
+extern char** cmd_run_dotcl(int argc,char** argv,struct sub_command* cmd);
+extern struct proc_opt* register_runtime_options(struct proc_opt* cmd);
 int setup(char* target,char* env,char* impl);
 #define SETUP_SYSTEM(sys,msg) {\
     cond_printf(0,"%s",msg);   \

src/download.c

@@ -75,6 +75,7 @@ static size_t header_callback(char *buffer, size_t size,size_t nitems, int *opt)
 int download_simple (char* uri,char* path,int opt) {
   FILE *bodyfile;
   char* path_partial=cat(path,".partial",NULL);
+  cond_printf(1,"download_simple(\"%s\",\"%s\",%d)\n",uri,path,opt);
   bodyfile = fopen(path_partial,"wb");
   if(bodyfile == NULL) {
     s(path_partial);
@@ -121,7 +122,9 @@ int download_simple (char* uri,char* path,int opt) {
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
     curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, header_callback);
-    curl_easy_setopt(curl,CURLOPT_WRITEDATA,bodyfile);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA,bodyfile);
+    if((verbose & 2) != 0)
+      curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
     if(ignoressl) {
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); 
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);

src/util-dir.c

@@ -10,8 +10,12 @@ char* homedir(void) {
 }
 
 char* truename(const char* path) {
-  char* ret=realpath(path,NULL);
-  return ret?ret:which((char*)path);
+  char* buf=alloc(PATH_MAX);
+  char* ret=realpath(path,buf);
+  if(ret)
+    return buf;
+  s(buf);
+  return which((char*)path);
 }
 
 int ensure_directories_exist(char* path) {
@@ -71,9 +75,15 @@ char* currentdir(void) {
   return append_trail_slash(q_(getcwd(buf,2048)));
 }
 
+int is_valid_path(const char *path) {
+  return path[0] == '/';
+}
+
 #else
+
 char* homedir(void);
 char* currentdir(void);
+int is_valid_path(const char *);
 #endif
 
 char* configdir(void) {
@@ -82,9 +92,10 @@ char* configdir(void) {
 
   if (env) /* note: env can be a NULL */
   {
-      if (env[0] != DIRSEP[0])   /* note: DIRSEP == \\ on windows, / on unix */
+      if (!is_valid_path(env))
       {
           cond_printf(0,"Error: %s must be absolute. Got: %s \n",c,env);
+	  abort();
       }
       s(c);                     /* note : this frees c. */
       return append_trail_slash(q(env));
@@ -143,3 +154,4 @@ char* basedir(void) {
   s(cd_);
   return configdir();
 }
+

src/util-dir_windows.c

@@ -64,4 +64,21 @@ char* currentdir(void) {
   char buf[2048];
   return append_trail_slash(q_(_getcwd(buf,2048)));
 }
+
+int is_valid_path(const char *path) {
+  //
+  // On Windows, an absolute path can technically
+  // start with a drive letter (i.e. c:\roswell),
+  // but could also be a UNC path (i.e. \\OTHERMACHINE\roswell).
+  //
+  // But, if invoked inside an msys2 shell we could get a UNIX-style path.
+  //
+  // It appears however that the latter two scenarios are not supported
+  // by other parts of the codebase, so we shall enforce here that only
+  // regular Windows-style paths are allowed.
+  //
+
+  return (isalpha(path[0]) && path[1] == ':'  && (path[2] == '\\' || path[2] == '/'));
+}
+
 #endif

src/util.c

@@ -58,12 +58,19 @@ char* uname_m(void) {
     s(p2);
     return q("x86-64");
   }
+  if(strcmp(p2,"evbarm")==0 ) {
+    /*netbsd arm*/
+    char* result=system_("uname -p");
+    s(p2);
+    p2=remove_char("\r\n",result);
+  }
   if(strcmp(p2,"aarch64")==0) {
     s(p2);
     return q("arm64");
   }
   if(strcmp(p2,"armv6l")==0 ||
-     strcmp(p2,"armv7l")==0) {
+     strcmp(p2,"armv7l")==0 ||
+     strcmp(p2,"armv8l")==0) {
     char* result=system_("readelf -A /proc/self/exe |grep Tag_ABI_VFP_args|wc -l");
     char* result2=remove_char("\r\n",result);
     s(result);
@@ -79,6 +86,10 @@ char* uname_m(void) {
     s(p2);
     return q("armel");
   }
+  if(strcmp(p2,"Power Macintosh")==0) {
+    s(p2);
+    return q("ppc");
+  }
   return substitute_char('-','_',p2);
 }
 

src/util.h

@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdarg.h>
 #ifndef HAVE_WINDOWS_H
+#include <ctype.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <grp.h>
@@ -142,6 +143,7 @@ int directory_exist_p (char* path);
 int change_directory(const char* path);
 int delete_directory(char* pathspec,int recursive);
 char* impldir(char* arch,char* os,char* impl,char* version);
+int is_valid_path(const char *path);
 /*util_file.c */
 int delete_file(char* pathspec);
 int rename_file(char* file,char* new_name);

src/util_windows.c

@@ -23,12 +23,18 @@ char* uname_m(void) {
     return q("x86-64");
   if(carch && strcmp(carch,"i686")==0)
     return q("x86");
+  if(carch && strcmp(carch,"aarch64")==0)
+    return q("arm64");
   char* msystem=getenv("MSYSTEM");
   if(msystem && strcmp(msystem,"MINGW64")==0)
     return q("x86-64");
   if(msystem && strcmp(msystem,"MINGW32")==0)
     return q("x86");
-#if defined(_WIN64)
+  if(msystem && strcmp(msystem,"CLANGARM64")==0)
+    return q("arm64");
+#if defined(__aarch64__)
+  return q("arm64");
+#elif defined(_WIN64)
   return q("x86-64");
 #elif defined(_WIN32)
   BOOL isWow64 = FALSE;

t/ros.lisp

@@ -86,7 +86,7 @@
 (! "ros list")
 (! "ros list installed")
 (! "ros list dump")
-(! "ros swank install")
+(! "ros install slime")
 (! (format nil "ros help install ~A" (ros:opt "default.lisp")))
 
 #+sbcl