From f14db99d6b8a27b58d38bc1f7d7081c5448748a9 Mon Sep 17 00:00:00 2001
From: Giacomo Vercesi <giacomo.vercesi@rev.ng>
Date: Tue, 26 May 2026 15:35:41 +0200
Subject: [PATCH 1/2] Add `revng-distributable-minimal`

When developing it is cumbersome to build `model-db`, which takes a long
time to build. Introduce the `revng-distributable-minimal` component
which is the same as `revng-distributable` but lacks `model-db`.
---
 .orchestra/config/components/revng-distributable.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.orchestra/config/components/revng-distributable.yml b/.orchestra/config/components/revng-distributable.yml
index f4d09eaa..9db5865e 100644
--- a/.orchestra/config/components/revng-distributable.yml
+++ b/.orchestra/config/components/revng-distributable.yml
@@ -24,4 +24,5 @@ skip_post_install: true
 ---
 components:
   revng-distributable: #@ single_build_component(**revng_distributable("revng", ["revng", "model-db"]))
+  revng-distributable-minimal: #@ single_build_component(**revng_distributable("revng-minimal", ["revng"]))
   revng-distributable-public-demo: #@ single_build_component(**revng_distributable("revng-public-demo", ["revng", "toolchain/host/gcc", "model-db"]))

From 4e6d76a37739b52b9e5fd89ca9206e60c0fe9a6a Mon Sep 17 00:00:00 2001
From: Giacomo Vercesi <giacomo.vercesi@rev.ng>
Date: Tue, 5 May 2026 12:18:43 +0200
Subject: [PATCH 2/2] revng-distributable: add `revng2`

Make it possible to invoke `revng2` in revng-distributable. Change the
test command to use the new pipeline instead of the old one.
---
 .orchestra/config/components/revng-distributable.yml |  2 +-
 .orchestra/support/revng-distributable/install.sh    | 10 ++++++----
 .orchestra/support/revng-distributable/revng         |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.orchestra/config/components/revng-distributable.yml b/.orchestra/config/components/revng-distributable.yml
index 9db5865e..968fdaf2 100644
--- a/.orchestra/config/components/revng-distributable.yml
+++ b/.orchestra/config/components/revng-distributable.yml
@@ -10,7 +10,7 @@ configure: |
   mkdir -p "$BUILD_DIR"
 install: |
   INSTALLER="$ORCHESTRA_DOTDIR/support/revng-distributable/install.sh"
-  echo "d9e98a9209b0822d0e8a96cf7a4685d97a7e4bb8fb1355ad41ac9c6c69dd187b $INSTALLER" | \
+  echo "ff027f251101650df4dc0f02ab7ea25c57af8067c0deae08bd054a134d611b57 $INSTALLER" | \
     sha256sum --quiet -c -
   "$INSTALLER" "(@= name @)" "(@= "\" \"".join(components) @)"
 build_dependencies:
diff --git a/.orchestra/support/revng-distributable/install.sh b/.orchestra/support/revng-distributable/install.sh
index f966597c..fbc8eb11 100755
--- a/.orchestra/support/revng-distributable/install.sh
+++ b/.orchestra/support/revng-distributable/install.sh
@@ -68,6 +68,7 @@ cp -a "$BASE_DIR/README.md" .
 
 echo "Copying revng"
 cp -a "$BASE_DIR/revng" revng
+cp -a "$BASE_DIR/revng" revng2
 
 
 cd "${DISTRIBUTABLE_PATH}/root"
@@ -127,11 +128,12 @@ find . -type d -empty -delete
 
 if [ "$RUN_TESTS" -eq 1 ]; then
   TEST_CMD=(
-    ./revng
-    graphql
-    --analyses-list=revng-initial-auto-analysis
-    --produce-artifacts
+    ./revng2
+    quick
+    artifact
+    emit-c
     "$TEST_BINARY"
+    -o /dev/null
   )
 
   # Orchestra adds quite a few environment variables, which we want to avoid to use when doing self-test
diff --git a/.orchestra/support/revng-distributable/revng b/.orchestra/support/revng-distributable/revng
index 8b336c9a..f6a7cb4c 100755
--- a/.orchestra/support/revng-distributable/revng
+++ b/.orchestra/support/revng-distributable/revng
@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+SCRIPT_DIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 # shellcheck disable=SC1091
-source "$DIR/environment"
-export REAL_ARGV0="$0"
+source "$SCRIPT_DIR/environment"
 
-exec "$DIR/root/bin/revng" "$@"
+EXECUTABLE_NAME=$(basename "$0")
+exec "$SCRIPT_DIR/root/bin/$EXECUTABLE_NAME" "$@"