changeset 262: |
6d526bd63943 |
parent 261: |
e51101c3c83c |
child 263: |
452cddb6577e |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sun, 16 Jun 2024 01:19:49 +0000 |
files: |
.hgsubstate autogen.lisp deploy.lisp scripts/quicklisp-install.sh skelfile |
description: |
fixes |
1.1--- a/.hgsubstate Sat Jun 15 22:32:08 2024 +0000
1.2+++ b/.hgsubstate Sun Jun 16 01:19:49 2024 +0000
1.3@@ -1,4 +1,4 @@
1.4-0000000000000000000000000000000000000000 box
1.5+36849cbd95545dc18f5a4a3d07c9055beca38f0b box
1.6 d5b76348e00ed20d362eb1a4109abd45a784cd7b etc
1.7 411f423567fcee89ca7f50fbeca938ada70c2cf1 home
1.8 98aa8d30816a26ccbb544ee8d156bfb40660a3bf pod
2.1--- a/autogen.lisp Sat Jun 15 22:32:08 2024 +0000
2.2+++ b/autogen.lisp Sun Jun 16 01:19:49 2024 +0000
2.3@@ -1,6 +1,6 @@
2.4 ;;; autogen.lisp --- Setup the current directory for
2.5
2.6-;; sbcl --load autogen.lisp
2.7+;; sbcl --core .stash/share/lisp/user.core --load autogen.lisp
2.8
2.9 ;;; Code:
2.10 (in-package :std-user)
2.11@@ -63,8 +63,8 @@
2.12 (defun build-default ()
2.13 (let ((rocksdb-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :rocksdb))))
2.14 (sbcl-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :sbcl :sbcl-shared))))
2.15- (operator-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :archlinux :operator))))
2.16- (worker-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :alpine :worker)))))
2.17+ (operator-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :archlinux :operator))))
2.18+ (worker-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :alpine :worker)))))
2.19 (std/thread:wait-for-threads
2.20 (list rocksdb-builder sbcl-builder operator-builder worker-builder))))
2.21
2.22@@ -80,6 +80,7 @@
2.23 (unless (probe-file #p".stash")
2.24 (autogen))
2.25
2.26-(build-default)
2.27+;; (build-default)
2.28
2.29-(sb-ext:quit)
2.30+;; (sb-ext:quit)
2.31+
3.1--- a/deploy.lisp Sat Jun 15 22:32:08 2024 +0000
3.2+++ b/deploy.lisp Sun Jun 16 01:19:49 2024 +0000
3.3@@ -6,6 +6,7 @@
3.4 (in-package :std-user)
3.5
3.6 (defpkg :infra/deploy
3.7- (:use :cl :skel :packy :dat/json))
3.8+ (:use :cl :std :skel :packy :dat/json))
3.9
3.10 (in-package :infra/deploy)
3.11+
4.1--- a/scripts/quicklisp-install.sh Sat Jun 15 22:32:08 2024 +0000
4.2+++ b/scripts/quicklisp-install.sh Sun Jun 16 01:19:49 2024 +0000
4.3@@ -10,7 +10,7 @@
4.4 else
4.5 QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\""
4.6 fi
4.7-# installs to /usr/local/share/lisp
4.8 sbcl --non-interactive \
4.9 --load .stash/quicklisp.lisp \
4.10- --eval "(quicklisp-quickstart:install :path \"/usr/local/share/lisp/quicklisp\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)"
4.11+ --eval "(quicklisp-quickstart:install :path \"~/.stash/quicklisp/\" :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \
4.12+ --eval "(ql-dist:install-dist \"http://dist.ultralisp.org/\" :prompt nil)"
5.1--- a/skelfile Sat Jun 15 22:32:08 2024 +0000
5.2+++ b/skelfile Sun Jun 16 01:19:49 2024 +0000
5.3@@ -39,6 +39,7 @@
5.4 #$cd .stash/src/sbcl &&
5.5 echo '"2.4.5"' > version.lisp-expr &&
5.6 ./make.sh --dynamic-space-size=8Gb --without-gencgc --with-mark-region-gc --fancy$#)
5.7+ (sbcl-docs (sbcl) #$cd .stash/src/sbcl/doc/manual && make$#)
5.8 (sbcl-gencgc (src) #$cd .stash/src/sbcl &&
5.9 ./make.sh --dynamic-space-size=8Gb --fancy$#)
5.10 (sbcl-shared () #$cd .stash/src/sbcl && sh make-shared-library.sh$#)
5.11@@ -61,6 +62,7 @@
5.12 (xcaddy () #$go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest$#)
5.13 (caddy-webdav (xcaddy) #$xcaddy build --output .stash/caddy --with github.com/mholt/caddy-webdav$#)
5.14 (rust () #$scripts/get-rust.sh$#)
5.15+ (rust-docs (rust) #$cd .stash/src/rust && ./x doc$#)
5.16 (ublk () #$scripts/get-ublksrv.sh$#
5.17 #$cd .stash/src/ublksrv && autoreconf -i && ./configure && make$#)
5.18 (ublk-install () #$cd .stash/src/ublksrv && make install$#)