From ea5c35276f6efb465a4bbf978fd6f2c44ef16e29 Mon Sep 17 00:00:00 2001 From: Rodolphe Lepigre <lepigre@mpi-sws.org> Date: Wed, 7 Oct 2020 11:55:09 +0200 Subject: [PATCH] Fix for change in CI. --- .gitignore | 2 +- Makefile | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f9228993..fe3a64b5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ _build/ *~ *.bak .coq-native/ -build-dep/ +builddep/ Makefile.coq .Makefile.coq.d Makefile.coq.conf diff --git a/Makefile b/Makefile index e0f826e9..a33c336b 100644 --- a/Makefile +++ b/Makefile @@ -27,14 +27,14 @@ C_SRC = $(wildcard examples/*.c) $(wildcard tutorial/*.c) generate_all: $(addsuffix .gen, $(C_SRC)) .PHONY: generate_all -build-dep-opamfiles: build-dep/opam +builddep-opamfiles: builddep/refinedc-builddep.opam @true -.PHONY: build-dep-opamfiles +.PHONY: builddep-opamfiles -# Create a virtual Opam package with the same dependencies as RefinedC. -build-dep/opam: refinedc.opam Makefile - @echo "# Creating build-dep package." - @mkdir -p build-dep +# Create a virtual Opam package with the same deps as RefinedC, but no build. +builddep/refinedc-builddep.opam: refinedc.opam Makefile + @echo "# Creating builddep package." + @mkdir -p builddep @head -n -5 $< > $@ @sed -i -E 's/^name: *"(.*)" */name: "\1-builddep"/' $@ @@ -42,10 +42,10 @@ build-dep/opam: refinedc.opam Makefile # 1) dependencies of RefinedC are installed, # 2) they will remain satisfied even if other packages are updated/installed, # 3) we do not have to pin the RefinedC package itself (which takes time). -build-dep: build-dep/opam - @echo "# Installing build-dep package." - @opam install $(OPAMFLAGS) build-dep/ -.PHONY: build-dep +builddep: builddep/refinedc-builddep.opam + @echo "# Installing package $^." + @opam install $(OPAMFLAGS) $^ +.PHONY: builddep # FIXME #TUTORIAL_SRC = \ -- GitLab