[main] Fix 'oils-for-unix-static osh'

We use a .startswith() check

[test/spec-compat] Polish and publish a new report

With binary sizes

Build a statically-linked Oils

Author: Andy C

bin/oils_for_unix.py

@@ -101,8 +101,9 @@ def AppBundleMain(argv):
     else:
         bundle = 'oils-for-unix'  # _bin/cxx-dbg/oils-for-unix
 
-    # for legacy oils-ref.ovm
-    if main_name == bundle or (main_name == 'oils-ref' and len(ext)):
+    # oils-for-unix-static is allowed
+    # oils-ref.ovm
+    if main_name.startswith(bundle) or (main_name == 'oils-ref' and len(ext)):
         arg_r.Next()
         first_arg = arg_r.Peek()
         if first_arg is None:

devtools/release-native.sh

@@ -116,7 +116,7 @@ make-tar() {
   local tar_gz=_release/${app_name}-${OILS_VERSION}.tar.gz
   gzip -c $tar > $tar_gz
 
-  ls -l _release
+  ls -l --si _release
 }
 
 test-tar() {

test/alpine.sh

@@ -228,8 +228,11 @@ if test $name = oils-ref; then
   time make $target
   $target --version
 else
-  _build/oils.sh
+  _build/oils.sh --skip-rebuild
   _bin/cxx-opt-sh/osh --version
+
+  build/static-oils.sh
+  _bin/cxx-opt-sh/osh-static --version
 fi
 
 ./install
@@ -252,13 +255,19 @@ test-tar() {
 
 copy-static() {
   local chroot_dir=${1:-$CHROOT_OILS_TAR}
-  local dir=_tmp/musl
+  local dir=_tmp/musl-libc
   mkdir -p $dir
   cp -v \
-    $CHROOT_OILS_TAR/src/oils-for-unix-$OILS_VERSION/_bin/cxx-opt-sh/oils-for-unix.static* \
+    $CHROOT_OILS_TAR/src/oils-for-unix-$OILS_VERSION/_bin/cxx-opt-sh/oils-for-unix-static* \
     $dir
+  ls -l --si $dir
 }
 
+build-static-musl() {
+  copy-tar
+  test-tar
+  copy-static
+}
 
 #
 # cpp tarball

test/spec-compat-html.sh

@@ -3,13 +3,14 @@
 # Create reports, published at https://pages.oils.pub/
 #
 # Usage:
-#   ./spec-compat-html.sh <function name>
+#   test/spec-compat-html.sh <function name>
+#
+# Examples:
+#   $0 deploy
 #
 # TODO:
-# - Deploy HTML
-#   - add tree html
 #   - improve pages.oils.pub/ index.html
-#   - Epoch or Build timestamp on page
+#   - Add epoch or Build timestamp on page - that's at the top
 # - Improve
 #   - summary/percentages in TOP.html?
 #   - More shells: might as well include ash, dash, ysh
@@ -180,7 +181,7 @@ html-summary-header() {
 
 <h1>$report - Shell Compatibility</h1>
 
-<p>Back to <a href="TOP.html">TOP.html</a>.
+<p>Back to <a href="TOP.html">TOP.html</a>
 </p>
 EOF
 }
@@ -270,6 +271,8 @@ Here are some summary tables.  **Click** on the column headers to sort:
 - [Delta OSH](DELTA-osh.html)
   - Compare each shell's passing count vs. OSH
 
+[tree.html](tree.html)
+
 ### Notes and Caveats
 
 - Some tests may fail for innocuous reasons, e.g. printing `'$'` versus `\$`
@@ -314,9 +317,10 @@ TODO: Add other shells, and be more specific about versions.
 
 ### More Comparisons
 
+- [Binary Sizes](binary-sizes.txt)
+
 Possibly TODO
 
-- Binary size
 - Build times
 - Lines of code?
   - [Oils has a "compressed" implementation](https://www.oilshell.org/blog/2024/09/line-counts.html)
@@ -358,7 +362,7 @@ EOF
 }
 
 write-compare-html() {
-  local spec_subdir='compat'
+  local spec_subdir=${1:-'compat'}
   local dir=_tmp/spec/$spec_subdir
 
   local out=$dir/TOP.html 
@@ -369,16 +373,25 @@ write-compare-html() {
     return
   fi
 
-  write-summary-html PASSING "$@"
-  write-summary-html DELTA-osh "$@"
-  write-summary-html DELTA-bash "$@"
+  write-summary-html PASSING "$spec_subdir"
+  write-summary-html DELTA-osh "$spec_subdir"
+  write-summary-html DELTA-bash "$spec_subdir"
+
+  echo
+  test/spec-compat.sh binary-sizes | tee $dir/binary-sizes.txt
+}
+
+write-tree-html() {
+  local dir=${1:-_tmp/spec/compat}
+  tree -H './' -T 'Files in spec-compat Report' --charset=ascii $dir \
+    > $dir/tree.html
 }
 
 # TODO: Publish this script
 multi() { ~/git/tree-tools/bin/multi "$@"; }
 
 deploy() {
-  local epoch=${1:-2025-06-19}
+  local epoch=${1:-2025-06-26}
 
   local dest=$PWD/../pages/spec-compat/$epoch
 
@@ -393,6 +406,8 @@ deploy() {
   find spec/compat -name '*.html' -o -name '*.tsv' | multi cp $dest/renamed-tmp
   popd
 
+  write-tree-html $dest/renamed-tmp/spec/compat
+
   # Work around Jekyll rule for Github pages
   #mv -v $dest/_tmp $dest/renamed-tmp
 

test/spec-compat.sh

@@ -4,6 +4,13 @@
 #
 # Usage:
 #   test/spec-compat.sh <function name>
+#
+# Examples:
+#   $0 build-static-oils  # Build Oils binaries
+#   $0 build-brush T      # Pull and build
+#   $0 build-sush T       # Pull and build
+#   $0 osh-all            # Run spec tests, and make report
+#                         # Includes binary size report
 
 : ${LIB_OSH=stdlib/osh}
 source $LIB_OSH/bash-strict.sh
@@ -18,12 +25,6 @@ source test/spec-common.sh
 OSH_TARGET=_bin/cxx-asan/osh
 OSH=$PWD/$OSH_TARGET
 
-# To compare against:
-# - toysh
-# - brush
-# - rusty_bash
-# - ksh93 - Debian package
-
 # Metrics
 # - binary size - stripped
 # - lines of source code - I think we get this from DWARF debug info
@@ -121,28 +122,58 @@ build-sush() {
   popd
 }
 
+build-static-oils() {
+  devtools/release-native.sh make-tar
+
+  # Static binary with glibc
+  build/static-oils.sh 
+
+  # Static binary with musl libc
+  test/alpine.sh build-static-musl
+}
+
 binary-sizes() {
-  local oils=_bin/cxx-opt/bin/oils_for_unix.mycpp.stripped
-  ninja $oils
+  local oils_dynamic=_bin/cxx-opt/bin/oils_for_unix.mycpp.stripped
+  ninja $oils_dynamic
 
-  pushd $BRUSH_DIR
+  pushd $BRUSH_DIR >/dev/null
   local out=target/release/brush.stripped 
   strip -o $out target/release/brush
   local brush=$BRUSH_DIR/$out
-  popd
+  popd >/dev/null
 
-  pushd $SUSH_DIR
+  pushd $SUSH_DIR >/dev/null
   local out=target/release/sush.stripped 
   strip -o $out target/release/sush
   local sush=$SUSH_DIR/$out
-  popd
+  popd >/dev/null
+
+  local -a oils=(
+    $oils_dynamic
+
+    # 2.4 M musl libc
+    _tmp/musl-libc/oils-for-unix-static.stripped
+
+    # 3.4 MB with glibc
+    _bin/cxx-opt-sh/oils-for-unix-static.stripped
+  )
+  local -a other=(
+
+    $brush $sush $TOYBOX_DIR/sh
+    # our bash isn't stripped
+    # $(which bash) $(which dash) $(which mksh) $(which ksh)
+  )
 
   echo
-  ls -l --si $oils $brush $sush $TOYBOX_DIR/sh
+  ls -l --si --sort=none "${oils[@]}"
+  echo
+  ls -l --si --sort=none "${other[@]}"
 
-  # These aren't dynamically linked to GNU readline, or libstdc++
+  # Rust binaries aren't dynamically linked to GNU readline, or libstdc++
+  echo
+  ldd "${oils[@]}" || true  # fails if not dynamic
   echo
-  ldd $oils $brush $sush $TOYBOX_DIR/sh
+  ldd "${other[@]}"
 }
 
 symbols() {
@@ -188,39 +219,56 @@ install-geiger() {
   cargo install --locked cargo-geiger
 }
 
-# This is DESTRUCTIVE
-geiger-report() {
-  if true; then
-    pushd ../../shells/brush
+# This is DESTRUCTIVE for some reason.
+# It cleans the build and rebuilds every time.
+geiger-brush() {
+  . ~/.cargo/env
+
+  pushd ../../shells/brush
 
-    . ~/.cargo/env
+  pushd brush-core
+  cargo geiger 
+  popd
 
-    # doesn't work
-    #time cargo geiger --workspace
-    #time cargo geiger --package brush-core --package brush-parser
+  pushd brush-interactive
+  cargo geiger 
+  popd
 
-    popd
-  fi
+  pushd brush-parser
+  cargo geiger 
+  popd
+
+  pushd brush-shell
+  cargo geiger 
+  popd
+
+  # doesn't work
+  #time cargo geiger --workspace
+  #time cargo geiger --package brush-core --package brush-parser
 
-  if false; then
-    pushd ../../shells/rusty_bash
+  #time cargo geiger --workspace
 
-    . ~/.cargo/env
+  popd
+}
+
+geiger-sush() {
+  . ~/.cargo/env
 
-    # this cleans the build
-    #
-    # Functions  Expressions  Impls   Traits  Methods
-    # 181/1056   9377/45040   114/158 30/32   463/2887
-    #
-    # x/y
-    # x = unsafe used by build
-    # y = unsafe in crate
+  pushd ../../shells/rusty_bash
 
-    # ~7 seconds
-    time cargo geiger 
+  # this cleans the build
+  #
+  # Functions  Expressions  Impls   Traits  Methods
+  # 181/1056   9377/45040   114/158 30/32   463/2887
+  #
+  # x/y
+  # x = unsafe used by build
+  # y = unsafe in crate
 
-    popd
-  fi
+  # ~7 seconds
+  time cargo geiger 
+
+  popd
 }
 
 #