From 516e241d64a5ee6e7e9de8eaf053074c4c9d20e9 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Thu, 31 Oct 2024 17:16:48 +0100 Subject: [PATCH] Run `dune` from the crate root to regenerate `.opam` files --- Makefile | 2 +- charon-ml/Makefile | 4 ++-- charon-ml/charon.opam => charon.opam | 0 .../name_matcher_parser.opam => name_matcher_parser.opam | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename charon-ml/charon.opam => charon.opam (100%) rename charon-ml/name_matcher_parser.opam => name_matcher_parser.opam (100%) diff --git a/Makefile b/Makefile index f8af4a31..7b92a921 100644 --- a/Makefile +++ b/Makefile @@ -103,7 +103,7 @@ clean-generated: clean: clean-generated cd charon && cargo clean cd charon/macros && cargo clean - cd charon-ml && dune clean + dune clean # Build the Nix packages .PHONY: nix diff --git a/charon-ml/Makefile b/charon-ml/Makefile index 9a731b87..e6ad1fc2 100644 --- a/charon-ml/Makefile +++ b/charon-ml/Makefile @@ -5,14 +5,14 @@ build: format build-dev # Build, without formatting the code .PHONY: build-dev build-dev: - dune build && dune build @doc + cd .. && dune build && dune build @doc # The tests. # You can use the environment variable "CHARON_LOG" to activate the log. # For instance: `CHARON_LOG=1 make tests`. .PHONY: tests tests: copy-tests - dune test + cd .. && dune test # Reformat the code .PHONY: format diff --git a/charon-ml/charon.opam b/charon.opam similarity index 100% rename from charon-ml/charon.opam rename to charon.opam diff --git a/charon-ml/name_matcher_parser.opam b/name_matcher_parser.opam similarity index 100% rename from charon-ml/name_matcher_parser.opam rename to name_matcher_parser.opam