changelog shortlog graph tags branches files raw help

Mercurial > infra / changeset: updates

changeset 258: 390af47d8064
parent 257: f4376b952d35
child 259: c90f38d8e60a
author: Richard Westhaver <ellis@rwest.io>
date: Fri, 14 Jun 2024 22:48:30 +0000
files: autogen.lisp bootstrap.sh
description: updates
     1.1--- a/autogen.lisp	Fri Jun 14 21:02:40 2024 +0000
     1.2+++ b/autogen.lisp	Fri Jun 14 22:48:30 2024 +0000
     1.3@@ -57,14 +57,16 @@
     1.4   (println "profile:")
     1.5   (loop for (k v) on *profile* by 'cddr
     1.6         do (format t "  ~A = ~A~%" k v))
     1.7-  ;; 
     1.8-  (sk-call* *skel-project* :clean :bootstrap)
     1.9+  ;; fresh bootstrap
    1.10+  (sk-call* *skel-project* :clean :bootstrap))
    1.11+
    1.12+(defun build-default ()
    1.13   (let ((rocksdb-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :rocksdb))))
    1.14         (sbcl-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :sbcl :sbcl-shared))))
    1.15-        (archlinux-pod-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :archlinux :operator))))
    1.16-        (alpine-pod-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :alpine :worker)))))
    1.17+        (operator-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :archlinux :operator))))
    1.18+        (worker-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :alpine :worker)))))
    1.19     (std/thread:wait-for-threads
    1.20-     (list rocksdb-builder sbcl-builder archlinux-pod-builder alpine-pod-builder))))
    1.21+     (list rocksdb-builder sbcl-builder operator-builder worker-builder))))
    1.22 
    1.23 ;;; *host*
    1.24 ;; The host profile is generated automatically by 'check.sh'. After running
    1.25@@ -75,3 +77,9 @@
    1.26 ;; configuration and override it with INFRA_PROFILE
    1.27 
    1.28 ;; (sb-ext:quit)
    1.29+(unless (probe-file #p".stash")
    1.30+  (autogen))
    1.31+
    1.32+(build-default)
    1.33+
    1.34+(sb-ext:quit)
     2.1--- a/bootstrap.sh	Fri Jun 14 21:02:40 2024 +0000
     2.2+++ b/bootstrap.sh	Fri Jun 14 22:48:30 2024 +0000
     2.3@@ -25,7 +25,6 @@
     2.4   ensure mkdir -p "${_stash}/include"
     2.5   ensure mkdir -p "${_stash}/pack"
     2.6   cd "${_stash}"
     2.7-  hg clone https://vc.compiler.company/comp/core src/core
     2.8   local _sbcl_pack="pack/sbcl.tar.zst"
     2.9   local _rocksdb_pack="pack/rocksdb.tar.zst"
    2.10   local _core_pack="pack/core.tar.zst"
    2.11@@ -39,13 +38,13 @@
    2.12   ensure download "$_rocksdb_url" "${_rocksdb_pack}" "$_arch"
    2.13   unzstd "${_rocksdb_pack}"
    2.14   tar -xvf "pack/rocksdb.tar"
    2.15-  mv rocksdb/include/* include/
    2.16-  mv rocksdb/*.so lib/
    2.17+  cp -rf rocksdb/include/* include/
    2.18+  cp -rf rocksdb/*.so lib/
    2.19   ensure download "$_core_url" "${_core_pack}" "$_arch"
    2.20   unzstd "${_core_pack}"
    2.21   tar -xvf "pack/core.tar"
    2.22-  mv core/bin/* bin/
    2.23-  mv core/share/* share/
    2.24+  cp -rf core/bin/* bin/
    2.25+  cp -rf core/share/* share/
    2.26   # chmod +x "bin/*"
    2.27   rm -rf core rocksdb sbcl
    2.28   rm -rf pack/*.tar