# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1720324734 14400
# Node ID 532910875d5afc6d26385a2aeca0a7f9e0769763
# Parent  f5b55e03bf5c43ee55ad92cd3a182346050e87dd# Parent  d0429338ca65a0b1b6358711257d26538547edf7
merge

diff -r f5b55e03bf5c -r 532910875d5a autogen.lisp
--- a/autogen.lisp	Sat Jul 06 23:57:33 2024 -0400
+++ b/autogen.lisp	Sat Jul 06 23:58:54 2024 -0400
@@ -18,12 +18,15 @@
 (in-package :std-user)
 
 (defpkg :infra/autogen
+  (:nicknames :infra)
   (:use :cl :skel :log :std/named-readtables
         :dat/json :dat/sxp :net/fetch :net/util
         :cli/progress :cli/ansi :cli/ed :cli/prompt
         :cli/shell :std/hash-table :std/alien :std/macs
         :std/fmt)
-  (:export :autogen))
+  (:export :autogen *profile* :*host*
+   :*all-features* :*host-env* :gethost :getprofile
+   :getenv))
 
 (in-package :infra/autogen)
 (in-readtable :shell)
@@ -103,10 +106,10 @@
           (check-err warn "executable missing: ~x" name)))
 
 (defun check-default ()
-  (check-shared-lib "rocksdb")
-  (check-shared-lib "uring")
+  ;; (check-shared-lib "rocksdb")
+  ;; (check-shared-lib "uring")
   (check-shared-lib "zstd")
-  (check-shared-lib "tree-sitter")
+  ;; (check-shared-lib "tree-sitter")
   (check-shared-lib "xkbcommon"))
 
 (defun check-org ()
diff -r f5b55e03bf5c -r 532910875d5a bootstrap.sh
--- a/bootstrap.sh	Sat Jul 06 23:57:33 2024 -0400
+++ b/bootstrap.sh	Sat Jul 06 23:58:54 2024 -0400
@@ -62,9 +62,11 @@
   # cp -rf rocksdb/*.so lib/
 
   if [ ! -f "bin/skel" ]; then
-  ensure download "$_core_url" "tmp/${_core_pack}" "$_arch"
-  unzstd "tmp/${_core_pack}"
-  tar -xf "tmp/core.tar"
+  cd tmp
+  ensure download "$_core_url" "${_core_pack}" "$_arch"
+  unzstd "${_core_pack}"
+  tar -xf "core.tar"
+  cd ..
   cp -rf tmp/core/bin/* bin/
   cp -rf tmp/core/share/* share/
   fi
diff -r f5b55e03bf5c -r 532910875d5a deploy.lisp
--- a/deploy.lisp	Sat Jul 06 23:57:33 2024 -0400
+++ b/deploy.lisp	Sat Jul 06 23:58:54 2024 -0400
@@ -3,9 +3,30 @@
 ;;
 
 ;;; Code:
-(in-package :std-user)
+(defvar *autogen-fasl*
+  (or (probe-file ".stash/tmp/autogen.fasl")
+      (and
+       (ensure-directories-exist ".stash/tmp/")
+       (compile-file "autogen" :output-file ".stash/tmp/autogen"))))
 
-(defpkg :infra/deploy
-  (:use :cl :std :skel :packy :dat/json))
+#-(find-package :infra)
+(load *autogen-fasl*)
+
+(in-package :infra)
+
+(defvar *dist* (getprofile :dist))
+
+(pkg:defpkg :infra/deploy
+  (:use :cl :std :skel :packy :dat/json :std/thread :infra/autogen))
 
 (in-package :infra/deploy)
+
+(defparameter *task-pool* (make-task-pool))
+
+(with-task-pool (tp *task-pool*)
+  (designate-oracle tp (find-thread "control-thread"))
+  (spawn-workers tp 4)
+  (print tp)
+  ;; (start-task-pool tp)
+  (loop for x below (worker-count tp)
+        collect (pop-worker tp)))
diff -r f5b55e03bf5c -r 532910875d5a scripts/build-emacs.sh
--- a/scripts/build-emacs.sh	Sat Jul 06 23:57:33 2024 -0400
+++ b/scripts/build-emacs.sh	Sat Jul 06 23:58:54 2024 -0400
@@ -5,6 +5,7 @@
 	--with-imagemagick
 	--with-x-toolkit=gtk
 	--without-pop
+        --with-tree-sitter
 	--without-sound
 	--with-json
 	--enable-link-time-optimization