1.1--- a/containers/Containerfile.box	Sun May 26 21:14:10 2024 +0000
     1.2+++ b/containers/Containerfile.box	Mon May 27 03:39:33 2024 +0000
     1.3@@ -12,11 +12,11 @@
     1.4 RUN hg clone https://vc.compiler.company/comp/infra
     1.5 RUN hg clone https://vc.compiler.company/comp/core
     1.6 WORKDIR infra
     1.7-RUN mkdir .stash
     1.8-RUN sh scripts/get-sk.sh
     1.9 ENV CARGO_HOME="/usr/local/share/cargo"
    1.10 ENV RUSTUP_HOME="/usr/local/share/rustup"
    1.11 # stage1
    1.12+RUN mkdir .stash
    1.13+RUN sh scripts/get-sk.sh
    1.14 RUN .stash/sk make rustup
    1.15 ENV PATH="$PATH:/usr/local/share/cargo/bin"
    1.16 RUN rustup update

     2.1--- a/scripts/bundle-code.sh	Sun May 26 21:14:10 2024 +0000
     2.2+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3@@ -1,32 +0,0 @@
     2.4-#!/bin/sh
     2.5-# bundle The Compiler Company source code
     2.6-OUT="${2:-/tmp/dist}"
     2.7-SRC_PATH="$OUT/../.stash/src/code"
     2.8-BUNDLE_NAME="${1:-code}"
     2.9-echo "Bundling $BUNDLE_NAME in $OUT..."
    2.10-SOURCES="${3:-org core infra demo}"
    2.11-rm -rf $OUT/bundle
    2.12-mkdir -pv $OUT/bundle
    2.13-mkdir -pv $OUT/vc/{zst,stream}
    2.14-
    2.15-cd $SRC_PATH
    2.16-# Find all mercurial repositories, create bundles and dump them to $OUT dir.
    2.17-for i in $SOURCES; do
    2.18-    echo ""
    2.19-    echo "found hg repo: $i"
    2.20-    cd $i
    2.21-    echo "making zstd-v2 bundle..."
    2.22-    hg bundle -a -t zstd-v2 $OUT/vc/zst/$(basename $(hg root)).hg.zst
    2.23-    echo "making none-v2 bundle..."
    2.24-    hg bundle -a -t none-v2 $OUT/vc/$(basename $(hg root)).hg
    2.25-    echo "making stream bundle..."
    2.26-    hg debugcreatestreamclonebundle $OUT/vc/stream/$(basename $(hg root)).hg.stream
    2.27-    echo "... Done."
    2.28-    cd ..
    2.29-done
    2.30-
    2.31-# archive all *.hg bundles, final compression with zst
    2.32-cd $OUT/vc && tar -I 'zstd' -cf $OUT/bundle/$BUNDLE_NAME.tar.zst *.hg
    2.33-# tar -cf $OUT/$BUNDLE_NAME.tar.stream vc/stream/*.hg.stream
    2.34-# tar -cf $OUT/$BUNDLE_NAME.tar vc/*.hg
    2.35-echo "Done."

     3.1--- a/scripts/bundle-dir.sh	Sun May 26 21:14:10 2024 +0000
     3.2+++ b/scripts/bundle-dir.sh	Mon May 27 03:39:33 2024 +0000
     3.3@@ -1,11 +1,11 @@
     3.4 #!/usr/bin/env bash
     3.5 # bundle a tar.zst archive of Mercurial repositories.
     3.6 # must be absolute
     3.7-#WD=/mnt/y/data/packy
     3.8-WD="${2:-/tmp/dist}"
     3.9-OUT=$WD/bundle
    3.10-SRC_PATH=$HOME/dev/comp
    3.11-BUNDLE_NAME="${1:-code}"
    3.12+BUNDLE="${1:-comp}"
    3.13+WD=$(realpath .stash)
    3.14+OUT=$WD
    3.15+SRC_PATH=$HOME/src/$BUNDLE
    3.16+
    3.17 echo "Bundling $BUNDLE_NAME in $OUT..."
    3.18 
    3.19 rm -rf $OUT/*
    3.20@@ -29,7 +29,7 @@
    3.21 done
    3.22 
    3.23 # archive all *.hg bundles, final compression with zst
    3.24-cd $WD/vc && tar -I 'zstd' -cf $OUT/$BUNDLE_NAME.tar.zst *.hg
    3.25-# tar -cf $OUT/$BUNDLE_NAME.tar.stream vc/stream/*.hg.stream
    3.26-# tar -cf $OUT/$BUNDLE_NAME.tar vc/*.hg
    3.27+cd $WD/vc && tar -I 'zstd' -cf $OUT/$BUNDLE.tar.zst *.hg
    3.28+# tar -cf $OUT/$BUNDLE.tar.stream vc/stream/*.hg.stream
    3.29+# tar -cf $OUT/$BUNDLE.tar vc/*.hg
    3.30 echo "Done."

     4.1--- a/skelfile	Sun May 26 21:14:10 2024 +0000
     4.2+++ b/skelfile	Mon May 27 03:39:33 2024 +0000
     4.3@@ -10,13 +10,16 @@
     4.4 :scripts "scripts"
     4.5 :rules
     4.6 ((check (#$./check.sh$#))
     4.7- (archlinux () #$podman build -f containers/Containerfile.archlinux -t localhost/archlinux$#)
     4.8- (alpine () #$podman build -f containers/Containerfile.alpine -t localhost/alpine$#)
     4.9- (ubuntu () #$podman build -f containers/Containerfile.alpine -t localhost/alpine$#)
    4.10- (box (archlinux) #$podman build -f containers/Containerfile.box -t localhost/box$#)
    4.11- (worker (alpine) #$podman build -f containers/Containerfile.worker -t localhost/worker$#)
    4.12- (operator (box) #$podman build -f containers/Containerfile.operator -t localhost/operator$#)
    4.13+ (clean () #$rm -rvf .stash$#)
    4.14+ ;; containers
    4.15+ (archlinux () #$podman build -f containers/Containerfile.archlinux --no-cache -t localhost/archlinux$#)
    4.16+ (alpine () #$podman build -f containers/Containerfile.alpine --no-cache -t localhost/alpine$#)
    4.17+ (ubuntu () #$podman build -f containers/Containerfile.alpine --no-cache -t localhost/alpine$#)
    4.18+ (box (archlinux) #$podman build -f containers/Containerfile.box --no-cache -t localhost/box$#)
    4.19+ (worker (alpine) #$podman build -f containers/Containerfile.worker --no-cache -t localhost/worker$#)
    4.20+ (operator (box) #$podman build -f containers/Containerfile.operator --no-cache -t localhost/operator$#)
    4.21  (containers (archlinux alpine ubuntu box worker operator))
    4.22+ ;; programs
    4.23  (src () #$mkdir -pv .stash/src$#)
    4.24  (emacs (src) #$./scripts/get-emacs.sh$#
    4.25         #$cd .stash/src/emacs && ./autogen.sh$#
    4.26@@ -34,12 +37,12 @@
    4.27        ./make.sh --dynamic-space-size=8Gb --without-gencgc --with-mark-region-gc --fancy$#)
    4.28  (sbcl-gencgc (src) #$cd .stash/src/sbcl &&
    4.29        ./make.sh --dynamic-space-size=8Gb --fancy$#)
    4.30+ (sbcl-shared () #$cd .stash/src/sbcl && sh make-shared-library.sh$#)
    4.31  (quicklisp () #$cd .stash && curl -O https://beta.quicklisp.org/quicklisp.lisp$#
    4.32             #$./scripts/quicklisp-install.sh$#)
    4.33  (stumpwm (src) #$./scripts/get-stumpwm.sh$#
    4.34           #$cd .stash/src/stumpwm && ./autogen.sh && ./configure && make$#)
    4.35  (tree-sitter (src) #$./scripts/get-tree-sitter.sh$#)
    4.36- (tree-sitter-langs (src) #$./scripts/tree-sitter-install-langs.sh$#)
    4.37  (linux () #$mkdir -pv .stash/src/linux$#
    4.38         #$gpg --export autosigner@ torvalds@ gregkh@ > .stash/src/linux/keyring.gpg$#
    4.39         #$./scripts/get-linux.sh $(uname -r | cut -d- -f1) .stash .stash/src/linux/keyring.gpg$#
    4.40@@ -47,8 +50,10 @@
    4.41         tar -xvf .stash/src/linux.tar $(uname -r | cut -d- -f1)$#
    4.42         #$cd .stash/src/linux && make mrproper -j &&
    4.43         zcat /proc/config.gz > .config && yes N | make localmodconfig$#)
    4.44- (clean () #$rm -rvf .stash$#)
    4.45  (rust () #$scripts/get-rust.sh$#)
    4.46+ ;; install
    4.47+ (tree-sitter-langs (src) #$./scripts/tree-sitter-install-langs.sh$#)
    4.48+ (cargo-tools () #$scripts/install-cargo-tools.sh$#)
    4.49  (rustup () #$curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y$#)
    4.50  (sbcl-install () #$cd .stash/src/sbcl && INSTALL_ROOT=/usr/local sh install.sh$#)
    4.51  (emacs-install () #$cd .stash/src/emacs && make install$#)