# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1718405310 0
# Node ID 390af47d806402c744d5b6baf9298e632046ee66
# Parent  f4376b952d35d5de348fb9633dcc2e359dd90f1c
updates

diff -r f4376b952d35 -r 390af47d8064 autogen.lisp
--- a/autogen.lisp	Fri Jun 14 21:02:40 2024 +0000
+++ b/autogen.lisp	Fri Jun 14 22:48:30 2024 +0000
@@ -57,14 +57,16 @@
   (println "profile:")
   (loop for (k v) on *profile* by 'cddr
         do (format t "  ~A = ~A~%" k v))
-  ;; 
-  (sk-call* *skel-project* :clean :bootstrap)
+  ;; fresh bootstrap
+  (sk-call* *skel-project* :clean :bootstrap))
+
+(defun build-default ()
   (let ((rocksdb-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :rocksdb))))
         (sbcl-builder (sb-thread:make-thread (lambda () (sk-call* *skel-project* :sbcl :sbcl-shared))))
-        (archlinux-pod-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :archlinux :operator))))
-        (alpine-pod-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :alpine :worker)))))
+        (operator-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :archlinux :operator))))
+        (worker-builder (sb-thread:make-thread (lambda () (sk-call *skel-project* :alpine :worker)))))
     (std/thread:wait-for-threads
-     (list rocksdb-builder sbcl-builder archlinux-pod-builder alpine-pod-builder))))
+     (list rocksdb-builder sbcl-builder operator-builder worker-builder))))
 
 ;;; *host*
 ;; The host profile is generated automatically by 'check.sh'. After running
@@ -75,3 +77,9 @@
 ;; configuration and override it with INFRA_PROFILE
 
 ;; (sb-ext:quit)
+(unless (probe-file #p".stash")
+  (autogen))
+
+(build-default)
+
+(sb-ext:quit)
diff -r f4376b952d35 -r 390af47d8064 bootstrap.sh
--- a/bootstrap.sh	Fri Jun 14 21:02:40 2024 +0000
+++ b/bootstrap.sh	Fri Jun 14 22:48:30 2024 +0000
@@ -25,7 +25,6 @@
   ensure mkdir -p "${_stash}/include"
   ensure mkdir -p "${_stash}/pack"
   cd "${_stash}"
-  hg clone https://vc.compiler.company/comp/core src/core
   local _sbcl_pack="pack/sbcl.tar.zst"
   local _rocksdb_pack="pack/rocksdb.tar.zst"
   local _core_pack="pack/core.tar.zst"
@@ -39,13 +38,13 @@
   ensure download "$_rocksdb_url" "${_rocksdb_pack}" "$_arch"
   unzstd "${_rocksdb_pack}"
   tar -xvf "pack/rocksdb.tar"
-  mv rocksdb/include/* include/
-  mv rocksdb/*.so lib/
+  cp -rf rocksdb/include/* include/
+  cp -rf rocksdb/*.so lib/
   ensure download "$_core_url" "${_core_pack}" "$_arch"
   unzstd "${_core_pack}"
   tar -xvf "pack/core.tar"
-  mv core/bin/* bin/
-  mv core/share/* share/
+  cp -rf core/bin/* bin/
+  cp -rf core/share/* share/
   # chmod +x "bin/*"
   rm -rf core rocksdb sbcl
   rm -rf pack/*.tar