changeset 222: |
0a61207f30d7 |
parent 221: |
dae557236fff |
child 223: |
8b389e2e1a69 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Mon, 06 May 2024 18:51:19 -0400 |
files: |
.hgignore bootstrap.lisp infra.asd install.sh makefile |
description: |
init system |
1.1--- a/.hgignore Sun May 05 21:49:30 2024 -0400
1.2+++ b/.hgignore Mon May 06 18:51:19 2024 -0400
1.3@@ -1,4 +1,5 @@
1.4 .*[.](fasl|lock|elc|eln|scratch|tar)$
1.5 .*(target|dist|node_modules|target-trunk|build)/.*
1.6 linux/linux-[0-9]+[.].*/.*
1.7-.*[.]sxp
1.8\ No newline at end of file
1.9+.*[.]sxp
1.10+[.]stash/.*
1.11\ No newline at end of file
2.1--- a/bootstrap.lisp Sun May 05 21:49:30 2024 -0400
2.2+++ b/bootstrap.lisp Mon May 06 18:51:19 2024 -0400
2.3@@ -34,9 +34,9 @@
2.4 (dolist (k keys table)
2.5 (setf (gethash k table) (sb-posix:getenv k))))))
2.6
2.7-(info! "starting bootstrap.lisp")
2.8-(println sb-sys::*machine-version*)
2.9-(trace! "env:" (hash-table-alist *env*))
2.10+;; (info! "starting bootstrap.lisp")
2.11+;; (println sb-sys::*machine-version*)
2.12+;; (trace! "env:" (hash-table-alist *env*))
2.13
2.14 ;; build-config
2.15 (defun apply-build-config ()
3.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2+++ b/infra.asd Mon May 06 18:51:19 2024 -0400
3.3@@ -0,0 +1,5 @@
3.4+(defsystem :infra
3.5+ :depends-on (:std :dat :cli :skel :log :net :packy)
3.6+ :components ((:file "bootstrap")
3.7+ (:file "deploy"))
3.8+ :build-pathname "infra")
4.1--- a/install.sh Sun May 05 21:49:30 2024 -0400
4.2+++ b/install.sh Mon May 06 18:51:19 2024 -0400
4.3@@ -15,16 +15,15 @@
4.4 esac
4.5
4.6 local _url="https://packy.compiler.company/dist/${_arch}/cc-install${_ext}"
4.7- local _dir
4.8- if ! _dir="$(ensure mktemp -d)"; then
4.9+ local _stash
4.10+ if ! _stash=".stash"; then
4.11 # Because the previous command ran in a subshell, we must manually
4.12 # propagate exit status.
4.13 exit 1
4.14 fi
4.15- local _file="${_dir}/cc-install${_ext}"
4.16-
4.17+ local _file="${_stash}/cc-install${_ext}"
4.18+ ensure mkdir -p "$_stash"
4.19 printf '%s\n' 'info: starting cc-install...' 1>&2
4.20- ensure mkdir -p "$_dir"
4.21 ensure downloader "$_url" "$_file" "$_arch"
4.22 ensure chmod u+x "$_file"
4.23 if [ ! -x "$_file" ]; then
4.24@@ -35,12 +34,13 @@
4.25 "$_file" "$@"
4.26 local _retval=$?
4.27 rm "$_file"
4.28- rmdir "$_dir"
4.29+ local _core_url="https://packy.compiler.company/dist/${_arch}/lisp/infra.core"
4.30+ ensure downloader "$_core_url" "${_stash}/infra.core" "$_arch"
4.31 return "$_retval"
4.32 }
4.33
4.34 say() {
4.35- printf 'compiler.company: %s\n' "$1"
4.36+ printf 'install.sh: %s\n' "$1"
4.37 }
4.38
4.39 err() {
5.1--- a/makefile Sun May 05 21:49:30 2024 -0400
5.2+++ b/makefile Mon May 06 18:51:19 2024 -0400
5.3@@ -90,7 +90,7 @@
5.4 cd $< && ./scripts/install-all.sh
5.5 ### SBCL
5.6 SBCL_TARGET:=build/src/sbcl
5.7-SBCL_VERSION:=2.4.4+
5.8+SBCL_VERSION:=2.4.4a
5.9 $(SBCL_TARGET):scripts/get-sbcl.sh $(B)
5.10 $<
5.11 cd $(SBCL_TARGET) && \