changelog shortlog graph tags branches files raw help

Mercurial > infra / changeset: merge

changeset 314: 532910875d5a
parent 313: f5b55e03bf5c (current diff)
parent 312: d0429338ca65 (diff)
child 315: 0f82807e8b6e
author: Richard Westhaver <ellis@rwest.io>
date: Sat, 06 Jul 2024 23:58:54 -0400
files: autogen.lisp
description: merge
     1.1--- a/autogen.lisp	Sat Jul 06 23:57:33 2024 -0400
     1.2+++ b/autogen.lisp	Sat Jul 06 23:58:54 2024 -0400
     1.3@@ -18,12 +18,15 @@
     1.4 (in-package :std-user)
     1.5 
     1.6 (defpkg :infra/autogen
     1.7+  (:nicknames :infra)
     1.8   (:use :cl :skel :log :std/named-readtables
     1.9         :dat/json :dat/sxp :net/fetch :net/util
    1.10         :cli/progress :cli/ansi :cli/ed :cli/prompt
    1.11         :cli/shell :std/hash-table :std/alien :std/macs
    1.12         :std/fmt)
    1.13-  (:export :autogen))
    1.14+  (:export :autogen *profile* :*host*
    1.15+   :*all-features* :*host-env* :gethost :getprofile
    1.16+   :getenv))
    1.17 
    1.18 (in-package :infra/autogen)
    1.19 (in-readtable :shell)
    1.20@@ -103,10 +106,10 @@
    1.21           (check-err warn "executable missing: ~x" name)))
    1.22 
    1.23 (defun check-default ()
    1.24-  (check-shared-lib "rocksdb")
    1.25-  (check-shared-lib "uring")
    1.26+  ;; (check-shared-lib "rocksdb")
    1.27+  ;; (check-shared-lib "uring")
    1.28   (check-shared-lib "zstd")
    1.29-  (check-shared-lib "tree-sitter")
    1.30+  ;; (check-shared-lib "tree-sitter")
    1.31   (check-shared-lib "xkbcommon"))
    1.32 
    1.33 (defun check-org ()
     2.1--- a/bootstrap.sh	Sat Jul 06 23:57:33 2024 -0400
     2.2+++ b/bootstrap.sh	Sat Jul 06 23:58:54 2024 -0400
     2.3@@ -62,9 +62,11 @@
     2.4   # cp -rf rocksdb/*.so lib/
     2.5 
     2.6   if [ ! -f "bin/skel" ]; then
     2.7-  ensure download "$_core_url" "tmp/${_core_pack}" "$_arch"
     2.8-  unzstd "tmp/${_core_pack}"
     2.9-  tar -xf "tmp/core.tar"
    2.10+  cd tmp
    2.11+  ensure download "$_core_url" "${_core_pack}" "$_arch"
    2.12+  unzstd "${_core_pack}"
    2.13+  tar -xf "core.tar"
    2.14+  cd ..
    2.15   cp -rf tmp/core/bin/* bin/
    2.16   cp -rf tmp/core/share/* share/
    2.17   fi
     3.1--- a/deploy.lisp	Sat Jul 06 23:57:33 2024 -0400
     3.2+++ b/deploy.lisp	Sat Jul 06 23:58:54 2024 -0400
     3.3@@ -3,9 +3,30 @@
     3.4 ;;
     3.5 
     3.6 ;;; Code:
     3.7-(in-package :std-user)
     3.8+(defvar *autogen-fasl*
     3.9+  (or (probe-file ".stash/tmp/autogen.fasl")
    3.10+      (and
    3.11+       (ensure-directories-exist ".stash/tmp/")
    3.12+       (compile-file "autogen" :output-file ".stash/tmp/autogen"))))
    3.13 
    3.14-(defpkg :infra/deploy
    3.15-  (:use :cl :std :skel :packy :dat/json))
    3.16+#-(find-package :infra)
    3.17+(load *autogen-fasl*)
    3.18+
    3.19+(in-package :infra)
    3.20+
    3.21+(defvar *dist* (getprofile :dist))
    3.22+
    3.23+(pkg:defpkg :infra/deploy
    3.24+  (:use :cl :std :skel :packy :dat/json :std/thread :infra/autogen))
    3.25 
    3.26 (in-package :infra/deploy)
    3.27+
    3.28+(defparameter *task-pool* (make-task-pool))
    3.29+
    3.30+(with-task-pool (tp *task-pool*)
    3.31+  (designate-oracle tp (find-thread "control-thread"))
    3.32+  (spawn-workers tp 4)
    3.33+  (print tp)
    3.34+  ;; (start-task-pool tp)
    3.35+  (loop for x below (worker-count tp)
    3.36+        collect (pop-worker tp)))
     4.1--- a/scripts/build-emacs.sh	Sat Jul 06 23:57:33 2024 -0400
     4.2+++ b/scripts/build-emacs.sh	Sat Jul 06 23:58:54 2024 -0400
     4.3@@ -5,6 +5,7 @@
     4.4 	--with-imagemagick
     4.5 	--with-x-toolkit=gtk
     4.6 	--without-pop
     4.7+        --with-tree-sitter
     4.8 	--without-sound
     4.9 	--with-json
    4.10 	--enable-link-time-optimization