From cc76bcfb635b9e7c3abbd70ea3ce93a7df544cd6 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Mon, 23 Feb 2026 17:04:39 +0100 Subject: [PATCH] chore: remove unnecessary rm -rf vendor/... step The bootstrapping process knows how to build the vendored code here and the normal build does not know about it due to the lack of dune file. Therefore this is no longer a necessary step. Signed-off-by: Ali Caglayan --- opam/chrome-trace.opam | 2 -- opam/dune-action-plugin.opam | 2 -- opam/dune-build-info.opam | 2 -- opam/dune-configurator.opam | 2 -- opam/dune-glob.opam | 2 -- opam/dune-private-libs.opam | 2 -- opam/dune-private-libs.opam.template | 2 -- opam/dune-rpc-lwt.opam | 2 -- opam/dune-rpc.opam | 2 -- opam/dune-site.opam | 2 -- opam/dyn.opam | 2 -- opam/fs-io.opam | 2 -- opam/ocamlc-loc.opam | 2 -- opam/ordering.opam | 2 -- opam/stdune.opam | 2 -- opam/top-closure.opam | 2 -- opam/xdg.opam | 2 -- 17 files changed, 34 deletions(-) diff --git a/opam/chrome-trace.opam b/opam/chrome-trace.opam index c51f0c727ba..8e1bb9c58a1 100644 --- a/opam/chrome-trace.opam +++ b/opam/chrome-trace.opam @@ -18,8 +18,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-action-plugin.opam b/opam/dune-action-plugin.opam index a81a93cf714..7ca86d8fe16 100644 --- a/opam/dune-action-plugin.opam +++ b/opam/dune-action-plugin.opam @@ -31,8 +31,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-build-info.opam b/opam/dune-build-info.opam index 27b124ff5b3..c000a0bd76a 100644 --- a/opam/dune-build-info.opam +++ b/opam/dune-build-info.opam @@ -24,8 +24,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-configurator.opam b/opam/dune-configurator.opam index d35f0e09d4e..8c2ac28f59d 100644 --- a/opam/dune-configurator.opam +++ b/opam/dune-configurator.opam @@ -28,8 +28,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-glob.opam b/opam/dune-glob.opam index abd160388b7..0efc032abe1 100644 --- a/opam/dune-glob.opam +++ b/opam/dune-glob.opam @@ -21,8 +21,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-private-libs.opam b/opam/dune-private-libs.opam index 339adc6540e..890a5e60fa1 100644 --- a/opam/dune-private-libs.opam +++ b/opam/dune-private-libs.opam @@ -29,8 +29,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-private-libs.opam.template b/opam/dune-private-libs.opam.template index a18303b260c..44877d421e9 100644 --- a/opam/dune-private-libs.opam.template +++ b/opam/dune-private-libs.opam.template @@ -1,7 +1,5 @@ build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-rpc-lwt.opam b/opam/dune-rpc-lwt.opam index c8c0657d57b..f7152db3a74 100644 --- a/opam/dune-rpc-lwt.opam +++ b/opam/dune-rpc-lwt.opam @@ -20,8 +20,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-rpc.opam b/opam/dune-rpc.opam index d81ac268b76..0474c5fbd5f 100644 --- a/opam/dune-rpc.opam +++ b/opam/dune-rpc.opam @@ -23,8 +23,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dune-site.opam b/opam/dune-site.opam index ac4dfd59660..9b80b65bf85 100644 --- a/opam/dune-site.opam +++ b/opam/dune-site.opam @@ -17,8 +17,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/dyn.opam b/opam/dyn.opam index ac6d4b92cf4..066d17900d5 100644 --- a/opam/dyn.opam +++ b/opam/dyn.opam @@ -19,8 +19,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/fs-io.opam b/opam/fs-io.opam index 09a75355f57..d7d6b326414 100644 --- a/opam/fs-io.opam +++ b/opam/fs-io.opam @@ -18,8 +18,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/ocamlc-loc.opam b/opam/ocamlc-loc.opam index 3712a0babe9..8c8790f3de1 100644 --- a/opam/ocamlc-loc.opam +++ b/opam/ocamlc-loc.opam @@ -22,8 +22,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/ordering.opam b/opam/ordering.opam index 5ebe0df5a57..9abb30724e5 100644 --- a/opam/ordering.opam +++ b/opam/ordering.opam @@ -17,8 +17,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/stdune.opam b/opam/stdune.opam index ef5424aa15a..9bcf92314cf 100644 --- a/opam/stdune.opam +++ b/opam/stdune.opam @@ -25,8 +25,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/top-closure.opam b/opam/top-closure.opam index 247b2e6807d..8341803d220 100644 --- a/opam/top-closure.opam +++ b/opam/top-closure.opam @@ -17,8 +17,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["none"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build" diff --git a/opam/xdg.opam b/opam/xdg.opam index 5880089bc86..9ca5433ca1a 100644 --- a/opam/xdg.opam +++ b/opam/xdg.opam @@ -18,8 +18,6 @@ dev-repo: "git+https://github.com/ocaml/dune.git" x-maintenance-intent: ["(latest)"] build: [ ["dune" "subst"] {dev} - ["rm" "-rf" "vendor/csexp"] - ["rm" "-rf" "vendor/pp"] [ "dune" "build"