BURN THE WITCH

scripts/host_tool_runner.sh

@@ -24,9 +24,8 @@ Usage:
   ./tools/host <command> [args...]
 
 Commands:
-  c3           Launch the desktop Qt UI from the isolated host cache.
+  c3           Launch the large raylib UI from the isolated host cache.
   c4           Launch the small raylib UI from the isolated host cache.
-  raybig       Launch the large raylib UI from the isolated host cache.
   onroad       Launch replay plus desktop UI(s) from the isolated host cache.
   replay       Build and run replay from the isolated host cache.
   cabana       Build and run cabana from the isolated host cache.
@@ -43,9 +42,8 @@ Notes:
   - `cabana` uses its own host-runtime bucket, so it can run together with `plotjuggler`.
   - Other commands that share a bucket still wait on that bucket's lock.
   - `./build` remains the device-target flow.
-  - For c3/c4/raybig, pass the jobs count first to preserve existing shorthand:
+  - For c3/c4, pass the jobs count first to preserve existing shorthand:
       ./dev c3 8
-      ./dev raybig 12
   - `./onroad --c3 f08912a233c1584f/2022-08-11--18-02-41/1` launches replay plus the selected desktop UI.
   - `./dev sync` refreshes all host buckets. Use `./dev sync cabana` to sync one.
 EOF
@@ -65,7 +63,7 @@ resolve_host_bucket() {
   local name="${1:-shared}"
 
   case "${name}" in
-    shared|default|ui|c3|c4|raybig|onroad|replay|shell)
+    shared|default|ui|c3|c4|onroad|replay|shell)
       echo "shared"
       ;;
     cabana)
@@ -235,16 +233,13 @@ purge_host_foreign_platform_artifacts() {
   esac
 }
 
-purge_host_desktop_ui_artifacts() {
-  rm -f \
-    "${WORK_DIR}/selfdrive/ui/libqt_widgets.a" \
-    "${WORK_DIR}/selfdrive/ui/libqt_util.a" \
-    "${WORK_DIR}/selfdrive/ui/assets.o" \
-    "${WORK_DIR}/selfdrive/ui/main.o" \
-    "${WORK_DIR}/selfdrive/ui/moc_ui.o" \
-    "${WORK_DIR}/selfdrive/ui/ui.o" \
-    "${WORK_DIR}/selfdrive/ui/ui" \
-    "${WORK_DIR}/cereal/gen/cpp/"*.capnp.o
+purge_host_generated_objects() {
+  rm -f "${WORK_DIR}/cereal/gen/cpp/"*.capnp.o
+}
+
+purge_host_obsolete_ui_artifacts() {
+  find "${WORK_DIR}/selfdrive/ui" -maxdepth 1 -type f \
+    \( -name 'ui' -o -name 'ui.macos' -o -name 'ui.larch64' -o -name '*.o' -o -name '*.a' \) -delete
 }
 
 ensure_host_python_tools() {
@@ -333,11 +328,6 @@ sync_worktree() {
     "tools/replay/tests/test_replay"
     "tools/cabana/cabana"
     "tools/cabana/tests/test_cabana"
-    "selfdrive/ui/ui"
-    "selfdrive/ui/ui.macos"
-    "selfdrive/ui/ui.larch64"
-    "selfdrive/ui/libqt_widgets.a"
-    "selfdrive/ui/libqt_util.a"
     "cereal/libcereal.a"
     "cereal/libsocketmaster.a"
     "cereal/messaging/bridge"
@@ -388,7 +378,8 @@ sync_worktree() {
   if [[ "${_capnp_before}" != "${_capnp_after}" ]]; then
     rm -rf "${SP_SCONS_CACHE_DIR:-${HOST_ROOT}/scons_cache}"
   fi
-  purge_host_desktop_ui_artifacts
+  purge_host_generated_objects
+  purge_host_obsolete_ui_artifacts
   purge_host_foreign_platform_artifacts
   rm -f "${WORK_DIR}/third_party/libjson11.a" "${WORK_DIR}/third_party/libkaitai.a"
   sync_host_generated_headers
@@ -478,7 +469,7 @@ launch_c3() {
   fi
 
   sync_worktree
-  run_in_worktree "${WORK_DIR}/scripts/launch_ui_desktop.sh" "${jobs}" "$@"
+  run_in_worktree "${WORK_DIR}/scripts/launch_ui_c3_desktop.sh" "${jobs}" "$@"
 }
 
 launch_c4() {
@@ -493,18 +484,6 @@ launch_c4() {
   run_in_worktree "${WORK_DIR}/scripts/launch_ui_c4_desktop.sh" "${jobs}" "$@"
 }
 
-launch_raybig() {
-  local jobs
-  jobs="$(default_jobs)"
-  if [[ "${1:-}" =~ ^[0-9]+$ ]]; then
-    jobs="$1"
-    shift || true
-  fi
-
-  sync_worktree
-  run_in_worktree "${WORK_DIR}/scripts/launch_ui_raybig_desktop.sh" "${jobs}" "$@"
-}
-
 launch_onroad() {
   local jobs
   jobs="$(default_jobs)"
@@ -609,7 +588,7 @@ main() {
     help|-h|--help)
       usage
       ;;
-    c3|c4|raybig|onroad|replay|shell|python|pytest)
+    c3|c4|onroad|replay|shell|python|pytest)
       set_host_bucket "shared"
       acquire_host_lock "${command} $*"
       ;;
@@ -650,9 +629,6 @@ main() {
     c4)
       launch_c4 "$@"
       ;;
-    raybig)
-      launch_raybig "$@"
-      ;;
     onroad)
       launch_onroad "$@"
       ;;