changelog shortlog graph tags branches files raw help

Mercurial > infra / changeset: bootstrap updates

changeset 260: c5aa261cb836
parent 259: c90f38d8e60a
child 261: e51101c3c83c
author: Richard Westhaver <ellis@rwest.io>
date: Sat, 15 Jun 2024 22:12:41 +0000
files: bootstrap.sh scripts/dist-rocksdb-binary.sh scripts/dist-rocksdb-source.sh scripts/dist-sbcl-binary.sh scripts/dist-sbcl-source.sh skelfile
description: bootstrap updates
     1.1--- a/bootstrap.sh	Sat Jun 15 00:19:00 2024 +0000
     1.2+++ b/bootstrap.sh	Sat Jun 15 22:12:41 2024 +0000
     1.3@@ -11,7 +11,7 @@
     1.4       _ext=".exe"
     1.5       ;;
     1.6   esac
     1.7-  local _url="https://packy.compiler.company/dist/${_arch}"
     1.8+  local _url="https://packy.compiler.company/dist/${_arch}/pack"
     1.9   local _stash
    1.10   if ! _stash=".stash"; then
    1.11     # Because the previous command ran in a subshell, we must manually
    1.12@@ -23,31 +23,35 @@
    1.13   ensure mkdir -p "${_stash}/bin"
    1.14   ensure mkdir -p "${_stash}/lib"
    1.15   ensure mkdir -p "${_stash}/include"
    1.16-  ensure mkdir -p "${_stash}/pack"
    1.17   cd "${_stash}"
    1.18-  local _sbcl_pack="pack/sbcl.tar.zst"
    1.19-  local _rocksdb_pack="pack/rocksdb.tar.zst"
    1.20-  local _core_pack="pack/core.tar.zst"
    1.21+  local _sbcl_pack="sbcl.tar.zst"
    1.22+  local _rocksdb_pack="rocksdb.tar.zst"
    1.23+  local _core_pack="core.tar.zst"
    1.24+  local _core_src_pack="core-source.tar.zst"
    1.25   local _sbcl_url="${_url}/${_sbcl_pack}"
    1.26   local _rocksdb_url="${_url}/${_rocksdb_pack}"
    1.27   local _core_url="${_url}/${_core_pack}"
    1.28+  local _core_src_url="${_url}/${_core_pack}"
    1.29   ensure download "$_sbcl_url" "$_sbcl_pack" "$_arch"
    1.30   unzstd "${_sbcl_pack}"
    1.31-  tar -xvf "pack/sbcl.tar"
    1.32+  tar -xvf "sbcl.tar"
    1.33   cd sbcl && INSTALL_ROOT=$(realpath ..) sh install.sh && cd ..
    1.34-  ensure download "$_rocksdb_url" "${_rocksdb_pack}" "$_arch"
    1.35-  unzstd "${_rocksdb_pack}"
    1.36-  tar -xvf "pack/rocksdb.tar"
    1.37-  cp -rf rocksdb/include/* include/
    1.38-  cp -rf rocksdb/*.so lib/
    1.39-  ensure download "$_core_url" "${_core_pack}" "$_arch"
    1.40-  unzstd "${_core_pack}"
    1.41-  tar -xvf "pack/core.tar"
    1.42-  cp -rf core/bin/* bin/
    1.43-  cp -rf core/share/* share/
    1.44-  # chmod +x "bin/*"
    1.45-  rm -rf core rocksdb sbcl
    1.46-  rm -rf pack/*.tar
    1.47+  ensure download "$_core_src_url" "$_core_src_pack" "$_arch"
    1.48+  unzstd "${_core_src_pack}"
    1.49+  tar -xvf "core-source.tar"
    1.50+  # ensure download "$_rocksdb_url" "${_rocksdb_pack}" "$_arch"
    1.51+  # unzstd "${_rocksdb_pack}"
    1.52+  # tar -xvf "pack/rocksdb.tar"
    1.53+  # cp -rf rocksdb/include/* include/
    1.54+  # cp -rf rocksdb/*.so lib/
    1.55+  # ensure download "$_core_url" "${_core_pack}" "$_arch"
    1.56+  # unzstd "${_core_pack}"
    1.57+  # tar -xvf "pack/core.tar"
    1.58+  # cp -rf core/bin/* bin/
    1.59+  # cp -rf core/share/* share/
    1.60+  chmod +x bin/*
    1.61+  # rm -rf core rocksdb sbcl
    1.62+  rm -rf *.tar
    1.63 }
    1.64 
    1.65 _read() {
     2.1--- a/scripts/dist-rocksdb-binary.sh	Sat Jun 15 00:19:00 2024 +0000
     2.2+++ b/scripts/dist-rocksdb-binary.sh	Sat Jun 15 22:12:41 2024 +0000
     2.3@@ -2,4 +2,4 @@
     2.4 set -e
     2.5 cd .stash/src
     2.6 tar -I 'zstd' -cf rocksdb.tar.zst rocksdb/librocksdb.so* rocksdb/include/*
     2.7-mv rocksdb.tar.zst ../dist/
     2.8+mv rocksdb.tar.zst ../
     3.1--- a/scripts/dist-rocksdb-source.sh	Sat Jun 15 00:19:00 2024 +0000
     3.2+++ b/scripts/dist-rocksdb-source.sh	Sat Jun 15 22:12:41 2024 +0000
     3.3@@ -4,4 +4,4 @@
     3.4 make clean
     3.5 cd ..
     3.6 tar -I 'zstd' -cf rocksdb-source.tar.zst rocksdb
     3.7-mv rocksdb-source.tar.zst ../dist/
     3.8+mv rocksdb-source.tar.zst ../
     4.1--- a/scripts/dist-sbcl-binary.sh	Sat Jun 15 00:19:00 2024 +0000
     4.2+++ b/scripts/dist-sbcl-binary.sh	Sat Jun 15 22:12:41 2024 +0000
     4.3@@ -17,4 +17,4 @@
     4.4          fi
     4.5      done` \
     4.6     sbcl/obj/sbcl-home
     4.7-mv sbcl.tar.zst ../dist/
     4.8+mv sbcl.tar.zst ../
     5.1--- a/scripts/dist-sbcl-source.sh	Sat Jun 15 00:19:00 2024 +0000
     5.2+++ b/scripts/dist-sbcl-source.sh	Sat Jun 15 22:12:41 2024 +0000
     5.3@@ -4,4 +4,4 @@
     5.4 sh clean.sh
     5.5 cd ..
     5.6 tar -I 'zstd' -cf sbcl-source.tar.zst --exclude .git sbcl
     5.7-mv sbcl-source.tar.zst ../dist/
     5.8+mv sbcl-source.tar.zst ../
     6.1--- a/skelfile	Sat Jun 15 00:19:00 2024 +0000
     6.2+++ b/skelfile	Sat Jun 15 22:12:41 2024 +0000
     6.3@@ -59,7 +59,7 @@
     6.4         #$cd .stash/src/linux && make mrproper -j &&
     6.5         zcat /proc/config.gz > .config && yes N | make localmodconfig$#)
     6.6  (xcaddy () #$go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest$#)
     6.7- (caddy-webdav (xcaddy) #$xcaddy build --output .stash/caddy --with github.com/mholt/caddy-webdav
     6.8+ (caddy-webdav (xcaddy) #$xcaddy build --output .stash/caddy --with github.com/mholt/caddy-webdav$#)
     6.9  (rust () #$scripts/get-rust.sh$#)
    6.10  (ublk () #$scripts/get-ublksrv.sh$#
    6.11        #$cd .stash/src/ublksrv && autoreconf -i && ./configure && make$#)
    6.12@@ -78,4 +78,9 @@
    6.13  (emacs-install () #$cd .stash/src/emacs && make install$#)
    6.14  (rocksdb-install () #$cd .stash/src/rocksdb && make install-shared &&
    6.15                   cp -r include/* /usr/local/include/$#)
    6.16- (stumpwm-install () #$cd .stash/src/stumpwm && make install$#))
    6.17+ (stumpwm-install () #$cd .stash/src/stumpwm && make install$#)
    6.18+ ;; dist
    6.19+ (dist (rocksdb sbcl) #$scripts/dist-rocksdb-binary.sh
    6.20+       scripts/dist-rocksdb-source.sh
    6.21+       scripts/dist-sbcl-binary.sh
    6.22+       scripts/dist-sbcl-source.sh$#))