# HG changeset patch # User Richard Westhaver # Date 1715035879 14400 # Node ID 0a61207f30d7e2a11409a34312405bec8962a04f # Parent dae557236fffc7356f275f73eb790f1b703145ba init system diff -r dae557236fff -r 0a61207f30d7 .hgignore --- a/.hgignore Sun May 05 21:49:30 2024 -0400 +++ b/.hgignore Mon May 06 18:51:19 2024 -0400 @@ -1,4 +1,5 @@ .*[.](fasl|lock|elc|eln|scratch|tar)$ .*(target|dist|node_modules|target-trunk|build)/.* linux/linux-[0-9]+[.].*/.* -.*[.]sxp \ No newline at end of file +.*[.]sxp +[.]stash/.* \ No newline at end of file diff -r dae557236fff -r 0a61207f30d7 bootstrap.lisp --- a/bootstrap.lisp Sun May 05 21:49:30 2024 -0400 +++ b/bootstrap.lisp Mon May 06 18:51:19 2024 -0400 @@ -34,9 +34,9 @@ (dolist (k keys table) (setf (gethash k table) (sb-posix:getenv k)))))) -(info! "starting bootstrap.lisp") -(println sb-sys::*machine-version*) -(trace! "env:" (hash-table-alist *env*)) +;; (info! "starting bootstrap.lisp") +;; (println sb-sys::*machine-version*) +;; (trace! "env:" (hash-table-alist *env*)) ;; build-config (defun apply-build-config () diff -r dae557236fff -r 0a61207f30d7 infra.asd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/infra.asd Mon May 06 18:51:19 2024 -0400 @@ -0,0 +1,5 @@ +(defsystem :infra + :depends-on (:std :dat :cli :skel :log :net :packy) + :components ((:file "bootstrap") + (:file "deploy")) + :build-pathname "infra") diff -r dae557236fff -r 0a61207f30d7 install.sh --- a/install.sh Sun May 05 21:49:30 2024 -0400 +++ b/install.sh Mon May 06 18:51:19 2024 -0400 @@ -15,16 +15,15 @@ esac local _url="https://packy.compiler.company/dist/${_arch}/cc-install${_ext}" - local _dir - if ! _dir="$(ensure mktemp -d)"; then + local _stash + if ! _stash=".stash"; then # Because the previous command ran in a subshell, we must manually # propagate exit status. exit 1 fi - local _file="${_dir}/cc-install${_ext}" - + local _file="${_stash}/cc-install${_ext}" + ensure mkdir -p "$_stash" printf '%s\n' 'info: starting cc-install...' 1>&2 - ensure mkdir -p "$_dir" ensure downloader "$_url" "$_file" "$_arch" ensure chmod u+x "$_file" if [ ! -x "$_file" ]; then @@ -35,12 +34,13 @@ "$_file" "$@" local _retval=$? rm "$_file" - rmdir "$_dir" + local _core_url="https://packy.compiler.company/dist/${_arch}/lisp/infra.core" + ensure downloader "$_core_url" "${_stash}/infra.core" "$_arch" return "$_retval" } say() { - printf 'compiler.company: %s\n' "$1" + printf 'install.sh: %s\n' "$1" } err() { diff -r dae557236fff -r 0a61207f30d7 makefile --- a/makefile Sun May 05 21:49:30 2024 -0400 +++ b/makefile Mon May 06 18:51:19 2024 -0400 @@ -90,7 +90,7 @@ cd $< && ./scripts/install-all.sh ### SBCL SBCL_TARGET:=build/src/sbcl -SBCL_VERSION:=2.4.4+ +SBCL_VERSION:=2.4.4a $(SBCL_TARGET):scripts/get-sbcl.sh $(B) $< cd $(SBCL_TARGET) && \