[soil] Add cmark wedge to Dockerfile.clang

The 'cpp-coverage' code task now does build/py.sh all, not build/py.sh
minimal

The minimal dev build might be DELETED altogether, but if it stays, it
won't be valid for C++.

That is, 'ninja' will require 'build/py.sh all'

- install-wedges-py will build python2 as well

build/deps.sh

@@ -342,6 +342,10 @@ install-wedges() {
     deps/wedge.sh unboxed-build _build/deps-source/re2c/
   fi
 
+  if ! wedge-exists python2 $PY2_VERSION; then
+    deps/wedge.sh unboxed-build _build/deps-source/python2/
+  fi
+
   if test -n "$py_only"; then
     log "Installed dependencies for 'build/py.sh'"
     return
@@ -356,10 +360,6 @@ install-wedges() {
       $DEPS_SOURCE_DIR/pyflakes/pyflakes-$PYFLAKES_VERSION $dest_dir
   fi
 
-  if ! wedge-exists python2 $PY2_VERSION; then
-    deps/wedge.sh unboxed-build _build/deps-source/python2/
-  fi
-
   # TODO: make the Python build faster by using all your cores?
   if ! wedge-exists python3 $PY3_VERSION; then
     deps/wedge.sh unboxed-build _build/deps-source/python3/
@@ -406,26 +406,29 @@ install-wedges-py() {
 }
 
 container-wedges() {
-  ### These end up in _build/wedge/binary
+  ### Build wedges that are copied into containers, not run on host
+
+  # These end up in _build/wedge/binary
 
   #export-podman
 
-  if false; then
+  if true; then
     deps/wedge.sh build deps/source.medo/time-helper
     deps/wedge.sh build deps/source.medo/cmark/
     deps/wedge.sh build deps/source.medo/re2c/
+    deps/wedge.sh build deps/source.medo/python3/
   fi
 
   if false; then
     deps/wedge.sh build deps/source.medo/bloaty/
     deps/wedge.sh build deps/source.medo/uftrace/
   fi
 
-  # For soil-benchmarks/ images
-  deps/wedge.sh build deps/source.medo/R-libs/
+  if false; then
+    # For soil-benchmarks/ images
+    deps/wedge.sh build deps/source.medo/R-libs/
+  fi
 
-  # Not sure if we need thsi
-  #deps/wedge.sh build deps/source.medo/python3/
 }
 
 run-task "$@"

deps/Dockerfile.clang

@@ -18,6 +18,11 @@ USER uke
 COPY --chown=uke _cache/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
   /home/uke/oil_DEPS/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
 
+# cmark
+COPY --chown=uke \
+  _build/wedge/binary/oils-for-unix.org/pkg/cmark/0.29.0 \
+  /wedge/oils-for-unix.org/pkg/cmark/0.29.0
+
 # re2c
 COPY --chown=uke \
   _build/wedge/binary/oils-for-unix.org/pkg/re2c/3.0 \

deps/images.sh

@@ -38,7 +38,7 @@ source deps/podman.sh
 DOCKER=${DOCKER:-docker}
 
 # Build with this tag
-readonly LATEST_TAG='v-2023-07-17'
+readonly LATEST_TAG='v-2023-08-09'
 
 # BUGS in Docker.
 #

soil/host-shim.sh

@@ -52,7 +52,7 @@ live-image-tag() {
       ;;
     (clang)
       # Rebuild with wedges
-      echo 'v-2023-07-15'
+      echo 'v-2023-08-09'
       ;;
     (ovm-tarball)
       # freshen up, still need spec-bin wedge

soil/worker.sh

@@ -185,8 +185,7 @@ cpp-small-tasks() {
   cat <<EOF
 os-info          soil/diagnose.sh os-info    -
 dump-env         soil/diagnose.sh dump-env   -
-build-minimal    build/py.sh minimal                   -
-ninja-config     soil/worker.sh ninja-config           -
+py-all-and-ninja soil/worker.sh py-all-and-ninja       -
 cpp-unit         test/cpp-unit.sh soil-run             _test/cpp-unit.html
 oils-cpp-smoke   build/native.sh soil-run              -
 headless         client/run.sh soil-run-cpp            -
@@ -209,8 +208,7 @@ cpp-coverage-tasks() {
   cat <<EOF
 os-info                 soil/diagnose.sh os-info    -
 dump-env                soil/diagnose.sh dump-env   -
-build-minimal           build/py.sh minimal                             -
-ninja-config            soil/worker.sh ninja-config                     -
+py-all-and-ninja        soil/worker.sh py-all-and-ninja                 -
 extract-clang           deps/from-binary.sh extract-clang-in-container  -
 mycpp-unit-coverage     mycpp/TEST.sh unit-test-coverage                _test/clang-coverage/mycpp/html/index.html
 mycpp-examples-coverage mycpp/TEST.sh examples-coverage                 _test/clang-coverage/mycpp/examples/html/index.html