# HG changeset patch # User Richard Westhaver # Date 1718833843 14400 # Node ID 367bc171486438009ce805e3703542e891cb1e52 # Parent 39291a549477f95ab9212f5f2950e50a5473cd61 emacs dist diff -r 39291a549477 -r 367bc1714864 bootstrap.sh --- a/bootstrap.sh Wed Jun 19 20:54:03 2024 +0000 +++ b/bootstrap.sh Wed Jun 19 17:50:43 2024 -0400 @@ -55,11 +55,14 @@ # cp -rf rocksdb/include/* include/ # cp -rf rocksdb/*.so lib/ - # ensure download "$_core_url" "${_core_pack}" "$_arch" - # unzstd "${_core_pack}" - # tar -xf "core.tar" - # cp -rf core/bin/* bin/ - # cp -rf core/share/* share/ + if [ ! -f "bin/skel" ]; then + ensure download "$_core_url" "${_core_pack}" "$_arch" + unzstd "${_core_pack}" + tar -xf "core.tar" + cp -rf core/bin/* bin/ + cp -rf core/share/* share/ + fi + if [ ! -f "share/lisp/$_infra_core" ]; then ensure download "$_infra_core_url" "share/lisp/$_infra_core" "$_arch" fi diff -r 39291a549477 -r 367bc1714864 scripts/dist-emacs-binary.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/dist-emacs-binary.sh Wed Jun 19 17:50:43 2024 -0400 @@ -0,0 +1,6 @@ +#!/bin/sh +set -e +name="${1:-emacs}" +cd .stash/src/emacs +./make-dist --tar --no-compress +zstd -22 "${name}*.tar" -o "../../${name}.tar.zst" diff -r 39291a549477 -r 367bc1714864 scripts/install-emacs-mini-pack.sh --- a/scripts/install-emacs-mini-pack.sh Wed Jun 19 20:54:03 2024 +0000 +++ b/scripts/install-emacs-mini-pack.sh Wed Jun 19 17:50:43 2024 -0400 @@ -1,7 +1,7 @@ #!/bin/sh set -e -cd .stash/src -curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/emacs-mini.tar.zst +cd .stash/tmp +curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/pack/emacs-mini.tar.zst unzstd emacs-mini.tar.zst tar -xvf emacs-mini.tar cd emacs diff -r 39291a549477 -r 367bc1714864 scripts/install-rocksdb-pack.sh --- a/scripts/install-rocksdb-pack.sh Wed Jun 19 20:54:03 2024 +0000 +++ b/scripts/install-rocksdb-pack.sh Wed Jun 19 17:50:43 2024 -0400 @@ -2,8 +2,8 @@ # the rocksdb pack only includes the shared library and headers. the # static library is shipped separately. set -e -cd .stash/src -curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/rocksdb.tar.zst +cd .stash/tmp +curl -O https://packy.compiler.company/dist/x86_64-unknown-linux-gnu/pack/rocksdb.tar.zst unzstd rocksdb.tar.zst tar -xvf rocksdb.tar cd rocksdb diff -r 39291a549477 -r 367bc1714864 skelfile --- a/skelfile Wed Jun 19 20:54:03 2024 +0000 +++ b/skelfile Wed Jun 19 17:50:43 2024 -0400 @@ -92,6 +92,8 @@ cp -r include/* /usr/local/include/$#) (stumpwm-install () #$cd .stash/src/stumpwm && make install$#) ;; dist + (emacs-mini-dist () #$scripts/dist-emacs-binary.sh emacs-mini$#) + (emacs-dist () #$scripts/dist-emacs-binary.sh$#) (sbcl-dist () #$scripts/dist-sbcl-binary.sh$#) (rocksdb-dist () #$scripts/dist-rocksdb-binary.sh$#) (stumpwm-dist () #$scripts/dist-stumpwm-binary.sh$#)