upgrade CALM to 1.3.0

.github/workflows/calm.yml

@@ -77,7 +77,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
 
     env:
       CI_MATRIX_OS: ${{ matrix.os }}
@@ -118,7 +118,7 @@ jobs:
             *.dmg
 
   Windows:
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3
@@ -225,7 +225,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
 
     env:
       CI_MATRIX_OS: ${{ matrix.os }}
@@ -256,7 +256,7 @@ jobs:
           ls -lah calm
           rm *.dmg
           export PATH=$PATH:$(pwd)/calm/
-          export APP_VERSION=1.2.0
+          export APP_VERSION=1.3.0
           export APP_ID=com.vitovan.circles
           export APP_NAME=Circles
           # switch dir, this is unnecessary if you are already at the same dir with canvas.lisp
@@ -274,7 +274,7 @@ jobs:
             *.dmg
   Circles-Windows:
     needs: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3
@@ -390,7 +390,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
 
     env:
       CI_MATRIX_OS: ${{ matrix.os }}
@@ -421,7 +421,7 @@ jobs:
           ls -lah calm
           rm *.dmg
           export PATH=$PATH:$(pwd)/calm/
-          export APP_VERSION=1.2.0
+          export APP_VERSION=1.3.0
           export APP_ID=com.vitovan.fan
           export APP_NAME=Fan
           # switch dir, this is unnecessary if you are already at the same dir with canvas.lisp
@@ -439,7 +439,7 @@ jobs:
             *.dmg
   Fan-Windows:
     needs: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3
@@ -554,7 +554,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
 
     env:
       CI_MATRIX_OS: ${{ matrix.os }}
@@ -585,7 +585,7 @@ jobs:
           ls -lah calm
           rm *.dmg
           export PATH=$PATH:$(pwd)/calm/
-          export APP_VERSION=1.2.0
+          export APP_VERSION=1.3.0
           export APP_ID=com.vitovan.mondrian
           export APP_NAME=Mondrian
           # switch dir, this is unnecessary if you are already at the same dir with canvas.lisp
@@ -603,7 +603,7 @@ jobs:
             *.dmg
   Mondrian-Windows:
     needs: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3
@@ -737,7 +737,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
 
     env:
       CI_MATRIX_OS: ${{ matrix.os }}
@@ -769,7 +769,7 @@ jobs:
           ls -lah calm
           rm *.dmg
           export PATH=$PATH:$(pwd)/calm/
-          export APP_VERSION=1.2.0
+          export APP_VERSION=1.3.0
           export APP_ID=com.vitovan.meditator
           export APP_NAME=Meditator
           # switch dir, this is unnecessary if you are already at the same dir with canvas.lisp
@@ -794,7 +794,7 @@ jobs:
             *.dmg
   Meditator-Windows:
     needs: Windows
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/sbcl.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
+        os: [ubuntu-20.04]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -25,19 +25,27 @@ jobs:
         run: |
           sudo apt update -y
           sudo apt install build-essential -y
-          sudo apt install sbcl libzstd-dev -y
+          sudo apt install libzstd-dev -y
       - name: build
         run: |
+          # use custom built sbcl for grandpa ubuntu
+          # otherwise, it won't build
+          curl -o install_root.zip -L https://github.com/VitoVan/calm/releases/download/sbcl-2.3.4/install_root-ubuntu-20.04.zip
+          unzip install_root.zip
+          rm install_root.zip
+          mv ./install_root ./sbcl
+          export PATH=$(pwd)/sbcl/bin:$PATH
+          # start building new sbcl
           set -x
-          curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.3.4/sbcl-2.3.4-source.tar.bz2
+          curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.4.7/sbcl-2.4.7-source.tar.bz2
           set +x
-          bzip2 -cd sbcl-2.3.4-source.tar.bz2 | tar xvf -
-          cd sbcl-2.3.4
-          sh make.sh --with-fancy --with-sb-core-compression
+          bzip2 -cd sbcl-2.4.7-source.tar.bz2 | tar xvf -
+          cd sbcl-2.4.7
+          sh make.sh --with-sb-thread --with-sb-core-compression
       - name: zip install_root
         run: |
           set -x
-          cd sbcl-2.3.4
+          cd sbcl-2.4.7
           export INSTALL_ROOT=$HOME/install_root
           sh install.sh
           cd ..
@@ -58,7 +66,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, macos-12, macos-13]
+        os: [macos-12, macos-13, macos-14]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -69,19 +77,23 @@ jobs:
       - name: install
         shell: bash
         run: |
-          brew install sbcl
+          brew update && brew install sbcl && brew fetch zstd && brew reinstall zstd
       - name: build
         run: |
+          # for newer version of homebrew, the location of files has changed
+          export CPATH=$(brew --prefix zstd)/include:/usr/local/include:$CPATH
+          export LIBRARY_PATH=$(brew --prefix zstd)/lib/:$LIBRARY_PATH
+          # start building
           set -x
-          curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.3.4/sbcl-2.3.4-source.tar.bz2
+          curl -OL http://downloads.sourceforge.net/project/sbcl/sbcl/2.4.7/sbcl-2.4.7-source.tar.bz2
           set +x
-          bzip2 -cd sbcl-2.3.4-source.tar.bz2 | tar xvf -
-          cd sbcl-2.3.4
-          sh make.sh --with-fancy --with-sb-core-compression
+          bzip2 -cd sbcl-2.4.7-source.tar.bz2 | tar xvf -
+          cd sbcl-2.4.7
+          sh make.sh --with-sb-thread --with-sb-core-compression
       - name: zip install_root
         run: |
           set -x
-          cd sbcl-2.3.4
+          cd sbcl-2.4.7
           export INSTALL_ROOT=$HOME/install_root
           sh install.sh
           cd ..
@@ -102,7 +114,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [windows-2022, windows-2019]
+        os: [windows-2019]
 
     defaults:
       run:
@@ -129,14 +141,14 @@ jobs:
         run: |
           wget http://prdownloads.sourceforge.net/sbcl/sbcl-2.2.7-x86-64-windows-binary.msi
           7z x sbcl-2.2.7-x86-64-windows-binary.msi -Osbcl-2.2.7-bin && rm sbcl-2.2.7-x86-64-windows-binary.msi
-          wget http://downloads.sourceforge.net/project/sbcl/sbcl/2.3.4/sbcl-2.3.4-source.tar.bz2
-          bzip2 -cd sbcl-2.3.4-source.tar.bz2 | tar xvf -
-          cd sbcl-2.3.4
-          PATH=$PATH:"../sbcl-2.2.7-bin/" SBCL_HOME="../sbcl-2.2.7-bin/" sh make.sh --xc-host='sbcl --lose-on-corruption --disable-ldb --disable-debugger' --with-fancy --with-sb-core-compression
+          wget http://downloads.sourceforge.net/project/sbcl/sbcl/2.4.7/sbcl-2.4.7-source.tar.bz2
+          bzip2 -cd sbcl-2.4.7-source.tar.bz2 | tar xvf -
+          cd sbcl-2.4.7
+          PATH=$PATH:"../sbcl-2.2.7-bin/" SBCL_HOME="../sbcl-2.2.7-bin/" sh make.sh --xc-host='sbcl --lose-on-corruption --disable-ldb --disable-debugger' --with-sb-thread --with-sb-core-compression
       - name: zip install_root
         run: |
           set -x
-          cd sbcl-2.3.4
+          cd sbcl-2.4.7
           export INSTALL_ROOT=$HOME/install_root
           sh install.sh
           cd ..

README.md

@@ -31,12 +31,12 @@ calm
 ## Examples
 
 <p align="center">
-    <a href="https://vitovan.com/calm/1.2.0/fan/calm.html"><img width="250" alt="Fan" src="./docs/examples/fan/canvas.png"></a>
-    <a href="https://vitovan.com/calm/1.2.0/mondrian/calm.html"><img width="250" alt="Mondrian" src="./docs/examples/mondrian/canvas.png"></a>
-    <a href="https://vitovan.com/calm/1.2.0/meditator/calm.html"><img width="250" alt="Meditator" src="./docs/examples/meditator/canvas.png"></a>
+    <a href="https://vitovan.com/calm/1.3.0/fan/calm.html"><img width="250" alt="Fan" src="./docs/examples/fan/canvas.png"></a>
+    <a href="https://vitovan.com/calm/1.3.0/mondrian/calm.html"><img width="250" alt="Mondrian" src="./docs/examples/mondrian/canvas.png"></a>
+    <a href="https://vitovan.com/calm/1.3.0/meditator/calm.html"><img width="250" alt="Meditator" src="./docs/examples/meditator/canvas.png"></a>
 </p>
 
-Source files and binaries for the above examples are [here](https://github.com/VitoVan/calm/tree/main/docs/examples) and [here](https://github.com/VitoVan/calm/releases/tag/1.2.0).
+Source files and binaries for the above examples are [here](https://github.com/VitoVan/calm/tree/main/docs/examples) and [here](https://github.com/VitoVan/calm/releases/tag/1.3.0).
 
 For more applications made with CALM, please check [Made with CALM](https://github.com/VitoVan/made-with-calm).
 

README_JA.md

@@ -31,12 +31,12 @@ calm
 ## 例
 
 <p align="center">
-    <a href="https://vitovan.com/calm/1.2.0/fan/calm.html"><img width="250" alt="Fan" src="./docs/examples/fan/canvas.png"></a>
-    <a href="https://vitovan.com/calm/1.2.0/mondrian/calm.html"><img width="250" alt="Mondrian" src="./docs/examples/mondrian/canvas.png"></a>
-    <a href="https://vitovan.com/calm/1.2.0/meditator/calm.html"><img width="250" alt="Meditator" src="./docs/examples/meditator/canvas.png"></a>
+    <a href="https://vitovan.com/calm/1.3.0/fan/calm.html"><img width="250" alt="Fan" src="./docs/examples/fan/canvas.png"></a>
+    <a href="https://vitovan.com/calm/1.3.0/mondrian/calm.html"><img width="250" alt="Mondrian" src="./docs/examples/mondrian/canvas.png"></a>
+    <a href="https://vitovan.com/calm/1.3.0/meditator/calm.html"><img width="250" alt="Meditator" src="./docs/examples/meditator/canvas.png"></a>
 </p>
 
-上記の例のソースファイルとバイナリは[こちら](https://github.com/VitoVan/calm/tree/main/docs/examples)と[こちら](https://github.com/VitoVan/calm/releases/tag/1.2.0)です。
+上記の例のソースファイルとバイナリは[こちら](https://github.com/VitoVan/calm/tree/main/docs/examples)と[こちら](https://github.com/VitoVan/calm/releases/tag/1.3.0)です。
 
 CALM で作られた他のアプリケーションについては、[Made with CALM](https://github.com/VitoVan/made-with-calm) をご覧ください。
 

build/build.sh

@@ -18,6 +18,7 @@ build_fedora () {
     ./calm s dev fedora deps.sh && \
         ./calm s dev fedora sbcl.sh && \
         ./calm s dev all quicklisp.sh && \
+        ./calm s dev all quicklisp-fix-old-packages.sh && \
         ./calm s dev all alive.sh && \
         ./calm s dev all copy-lib.sh && \
         ./calm s dev fedora config-lib.sh
@@ -53,6 +54,8 @@ build_darwin () {
     ./calm s dev darwin deps.sh && \
         ./calm s dev darwin sbcl.sh && \
         ./calm s dev all quicklisp.sh && \
+        ./calm s dev all quicklisp-fix-apple-silicon.sh && \
+        ./calm s dev all quicklisp-fix-old-packages.sh && \
         ./calm s dev all alive.sh && \
         ./calm s dev all copy-lib.sh && \
         ./calm s dev darwin config-lib.sh && \
@@ -70,6 +73,7 @@ build_msys () {
     ./calm s dev msys deps.sh && \
         ./calm s dev msys sbcl.sh && \
         ./calm s dev all quicklisp.sh && \
+        ./calm s dev all quicklisp-fix-old-packages.sh && \
         ./calm s dev all alive.sh && \
         ./calm s dev all copy-lib.sh && \
         ./calm s dev msys config-lib.sh
@@ -79,7 +83,7 @@ build_msys () {
     RCEDIT_LICENSE="./s/usr/windows/rcedit-LICENSE"
     if [ ! -f "$RCEDIT" ]; then
         set -x
-        curl -o "$RCEDIT" -L https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe
+        curl -o "$RCEDIT" -L https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe
         curl -o "$RCEDIT_LICENSE" -L https://raw.githubusercontent.com/electron/rcedit/master/LICENSE
         set +x
     fi

calm.asd

@@ -1,6 +1,6 @@
 (asdf:defsystem #:calm
   :description "CALM - Canvas Aided Lisp Magic"
-  :version "1.2.0"
+  :version "1.3.0"
   :author "Vito Van"
   :license "GNU General Public License, version 2"
   :depends-on (

docs/changelog.org

@@ -1,4 +1,13 @@
 * CALM
+** 1.3.0
+- upgrade SBCL to 2.4.7
+- add macos-14 (arm64) support
+- fix: weird Quicklisp + Windows + SBCL bug
+  https://groups.google.com/g/quicklisp/c/wrULkRePVE4/m/DZHc0qVhAQAJ
+- fix: weird Windows + plain old CMD bug
+  https://github.com/VitoVan/calm/issues/179
+- ci: add macos-14 binary release
+- ci: remove macos-11 binary release
 ** 1.2.0
 - add documents:
   - hacking_JA.md @eltociear

entry.lisp

@@ -2,6 +2,9 @@
 (let ((quicklisp-setup (probe-file "quicklisp/setup.lisp")))
   (when quicklisp-setup
     (load quicklisp-setup)))
+;; https://groups.google.com/g/quicklisp/c/wrULkRePVE4
+#+win32
+(quicklisp-client::make-system-index "quicklisp/local-projects/")
 ;; Load CALM
 #-calm
 (load "calm.asd")

s/dev/all/alive.sh

@@ -1,5 +1,5 @@
 echo "Downloading alive-lsp ..."
 if ! [ -d quicklisp/local-projects/alive-lsp ]; then
-    git clone --depth 1 --branch v0.2.0 https://github.com/nobody-famous/alive-lsp.git quicklisp/local-projects/alive-lsp
+    git clone --depth 1 --branch v0.2.7 https://github.com/nobody-famous/alive-lsp.git quicklisp/local-projects/alive-lsp
     ./calm sbcl --load ./s/dev/all/load-calm.lisp --load ./s/dev/all/install-alive.lisp
 fi

s/dev/all/load-calm.lisp

@@ -1,6 +1,9 @@
 ;; the existence of this file is to avoid the tricky shitty escaping of quotation marks
 #-quicklisp
 (load "./quicklisp/setup.lisp")
+;; https://groups.google.com/g/quicklisp/c/wrULkRePVE4
+#+win32
+(quicklisp-client::make-system-index "./quicklisp/local-projects/")
 #-calm
 (load "./calm.asd")
 #-calm