1.1--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2+++ b/autogen.lisp	Wed Jun 05 23:34:14 2024 +0000
     1.3@@ -0,0 +1,45 @@
     1.4+;;; bootstrap.lisp --- let 'er rip
     1.5+
     1.6+;;
     1.7+
     1.8+;;; Code:
     1.9+(in-package :std-user)
    1.10+
    1.11+(defpkg :infra/bootstrap
    1.12+  (:use :cl :skel :log :std/named-readtables
    1.13+        :dat/json :dat/sxp :net/fetch :net/util
    1.14+        :cli/progress :cli/ansi :cli/ed :cli/prompt
    1.15+        :cli/shell :std/hash-table :std/alien :std/macs
    1.16+        :std/fmt))
    1.17+(in-package :infra/bootstrap)
    1.18+(in-readtable :shell)
    1.19+
    1.20+(eval-when (:compile-toplevel)
    1.21+  (defstruct host name cpus mem arch kernel core)
    1.22+  (defparameter *profile* (read-sxp-file
    1.23+                           (if-let ((profile (sb-posix:getenv "BUILD_PROFILE")))
    1.24+                             profile
    1.25+                             #P"default.sxp")))
    1.26+  (defparameter *core* sb-ext:*core-pathname*)
    1.27+  (defparameter *host-config* (read-sxp-file
    1.28+                               (let ((hcfg (format nil "~a.sxp" (sb-unix:unix-gethostname))))
    1.29+                                 (unless (probe-file hcfg)
    1.30+                                   (print #0$./check.sh$#))
    1.31+                                 hcfg)))
    1.32+  (defparameter *env* (let ((table (make-hash-table :test 'equal))
    1.33+                            (keys (list "STASH" "STORE" "DIST" "PACKY_URL" "VC_URL" "INSTALL_PREFIX"
    1.34+                                        "CC" "AR" "HG" "GIT" "LISP" "RUST" "LD" "SHELL" "DEV" "DEV_HOME"
    1.35+                                        "DEV_ID" "WORKER" "WORKER_ID" "WORKER_HOME" "CARGO_HOME" "RUSTUP_HOME"
    1.36+                                        "LISP_HOME")))
    1.37+                  (dolist (k keys table)
    1.38+                    (setf (gethash k table) (sb-posix:getenv k))))))
    1.39+
    1.40+(println "starting bootstrap.lisp")
    1.41+;; (println sb-sys::*machine-version*)
    1.42+;; (trace! "env:" (hash-table-alist *env*))
    1.43+
    1.44+;; build-config
    1.45+(defun apply-build-config ()
    1.46+  (setf *log-level* :trace))
    1.47+
    1.48+;; host-config

     2.1--- a/bootstrap.lisp	Wed Jun 05 22:37:56 2024 +0000
     2.2+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3@@ -1,45 +0,0 @@
     2.4-;;; bootstrap.lisp --- let 'er rip
     2.5-
     2.6-;;
     2.7-
     2.8-;;; Code:
     2.9-(in-package :std-user)
    2.10-
    2.11-(defpkg :infra/bootstrap
    2.12-  (:use :cl :skel :log :std/named-readtables
    2.13-        :dat/json :dat/sxp :net/fetch :net/util
    2.14-        :cli/progress :cli/ansi :cli/ed :cli/prompt
    2.15-        :cli/shell :std/hash-table :std/alien :std/macs
    2.16-        :std/fmt))
    2.17-(in-package :infra/bootstrap)
    2.18-(in-readtable :shell)
    2.19-
    2.20-(eval-when (:compile-toplevel)
    2.21-  (defstruct host name cpus mem arch kernel core)
    2.22-  (defparameter *profile* (read-sxp-file
    2.23-                           (if-let ((profile (sb-posix:getenv "BUILD_PROFILE")))
    2.24-                             profile
    2.25-                             #P"default.sxp")))
    2.26-  (defparameter *core* sb-ext:*core-pathname*)
    2.27-  (defparameter *host-config* (read-sxp-file
    2.28-                               (let ((hcfg (format nil "~a.sxp" (sb-unix:unix-gethostname))))
    2.29-                                 (unless (probe-file hcfg)
    2.30-                                   (print #0$./check.sh$#))
    2.31-                                 hcfg)))
    2.32-  (defparameter *env* (let ((table (make-hash-table :test 'equal))
    2.33-                            (keys (list "STASH" "STORE" "DIST" "PACKY_URL" "VC_URL" "INSTALL_PREFIX"
    2.34-                                        "CC" "AR" "HG" "GIT" "LISP" "RUST" "LD" "SHELL" "DEV" "DEV_HOME"
    2.35-                                        "DEV_ID" "WORKER" "WORKER_ID" "WORKER_HOME" "CARGO_HOME" "RUSTUP_HOME"
    2.36-                                        "LISP_HOME")))
    2.37-                  (dolist (k keys table)
    2.38-                    (setf (gethash k table) (sb-posix:getenv k))))))
    2.39-
    2.40-(println "starting bootstrap.lisp")
    2.41-;; (println sb-sys::*machine-version*)
    2.42-;; (trace! "env:" (hash-table-alist *env*))
    2.43-
    2.44-;; build-config
    2.45-(defun apply-build-config ()
    2.46-  (setf *log-level* :trace))
    2.47-
    2.48-;; host-config

     3.1--- a/bootstrap.sh	Wed Jun 05 22:37:56 2024 +0000
     3.2+++ b/bootstrap.sh	Wed Jun 05 23:34:14 2024 +0000
     3.3@@ -26,6 +26,7 @@
     3.4   ensure download "$_rocksdb_url" "${_stash}/src/rocksdb.tar.zst" "$_arch"
     3.5   ensure download "$_sk_url" "${_stash}/bin/sk" "$_arch"
     3.6   chmod +x "${_stash}/bin/sk"
     3.7+  say "OK ${_stash}/bin/sk"
     3.8 }
     3.9 
    3.10 _read() {

     4.1--- a/check.sh	Wed Jun 05 22:37:56 2024 +0000
     4.2+++ b/check.sh	Wed Jun 05 23:34:14 2024 +0000
     4.3@@ -25,7 +25,7 @@
     4.4   get_architecture || return 1
     4.5   local _arch="$RETVAL"
     4.6   assert_nz "$_arch" "arch"
     4.7-  _write ";; -*- mode:skel -*-"
     4.8+  _write ";;; $INFRA_HOST_CONFIG -*- mode:skel -*-"
     4.9   _write ":arch \"$_arch\""
    4.10   kernel_version
    4.11   local _kernel_version="$RETVAL"