MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit eadc1a98 authored by Armaël Guéneau's avatar Armaël Guéneau
Browse files

Update opam file and try to make install/uninstall rules more robust

parent 22442a35
...@@ -15,6 +15,9 @@ PREFIX ?= $(DEFAULT_PREFIX) ...@@ -15,6 +15,9 @@ PREFIX ?= $(DEFAULT_PREFIX)
BINDIR ?= $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
LIBDIR ?= $(PREFIX)/lib/cfml LIBDIR ?= $(PREFIX)/lib/cfml
COQ_WHERE ?= $(shell $(COQBIN)coqc -where)
COQ_CONTRIB := $(COQ_WHERE)/user-contrib
############################################################################## ##############################################################################
# Targets. # Targets.
...@@ -26,9 +29,7 @@ coqlib: ...@@ -26,9 +29,7 @@ coqlib:
generator: generator:
rm -f generator/cfml_config.ml rm -f generator/cfml_config.ml
sed -e 's|@@PREFIX@@|$(PREFIX)|' \ sed -e 's|@@LIBDIR@@|$(LIBDIR)|' \
-e 's|@@BINDIR@@|$(BINDIR)|' \
-e 's|@@LIBDIR@@|$(LIBDIR)|' \
generator/cfml_config.ml.in > generator/cfml_config.ml generator/cfml_config.ml.in > generator/cfml_config.ml
$(MAKE) -C generator $(MAKE) -C generator
...@@ -58,13 +59,6 @@ clean: ...@@ -58,13 +59,6 @@ clean:
############################################################################## ##############################################################################
# Installation. # Installation.
# If ARTHUR is defined, create a symbolic link from Coq's user-contrib
# directory to this directory (cfml). Otherwise, perform a copy.
# TEMPORARY, this is TODO
COQ_WHERE := $(shell $(COQBIN)coqc -where)
COQ_CONTRIB := $(COQ_WHERE)/user-contrib
# As install depends on all, the file generator/cfml_config.ml is regenerated # As install depends on all, the file generator/cfml_config.ml is regenerated
# when `make install` is run; this ensures LIBDIR cannot be inconsistent. # when `make install` is run; this ensures LIBDIR cannot be inconsistent.
...@@ -102,7 +96,7 @@ uninstall: ...@@ -102,7 +96,7 @@ uninstall:
rm -f $(BINDIR)/cfmlc rm -f $(BINDIR)/cfmlc
# rm -f $(BINDIR)/cfml_cmj # rm -f $(BINDIR)/cfml_cmj
rm -rf $(LIBDIR) rm -rf $(LIBDIR)
rm -rf $(DOCDIR) # rm -rf $(DOCDIR)
rm -rf $(COQ_CONTRIB)/CFML rm -rf $(COQ_CONTRIB)/CFML
reinstall: uninstall reinstall: uninstall
......
...@@ -4,17 +4,27 @@ maintainer: "armael.gueneau@inria.fr" ...@@ -4,17 +4,27 @@ maintainer: "armael.gueneau@inria.fr"
authors: [ authors: [
"Arthur Charguéraud <arthur.chargueraud@inria.fr>" "Arthur Charguéraud <arthur.chargueraud@inria.fr>"
] ]
synopsis: "A tool for proving OCaml programs in Separation Logic"
homepage: "https://gitlab.inria.fr/charguer/cfml" homepage: "https://gitlab.inria.fr/charguer/cfml"
bug-reports: "https://gitlab.inria.fr/charguer/cfml/issues" bug-reports: "https://gitlab.inria.fr/charguer/cfml/issues"
license: "CeCILL-B" license: "CeCILL-B"
dev-repo: "https://gitlab.inria.fr/charguer/cfml.git" dev-repo: "https://gitlab.inria.fr/charguer/cfml.git"
build: [make "-j%{jobs}%"] build: [make "-j%{jobs}%"]
install: [make "install"] install: [
remove: [make "uninstall"] make "install"
"BINDIR=%{_:bin}%" "LIBDIR=%{_:lib}%"
"COQ_WHERE=%{coq:lib}%"
]
remove: [
make "uninstall"
"BINDIR=%{_:bin}%" "LIBDIR=%{_:lib}%"
"COQ_WHERE=%{coq:lib}%"
]
depends: [ depends: [
"ocaml" {>= "4.03.0"}
"ocamlbuild" {build} "ocamlbuild" {build}
"pprint" "pprint"
"base-bytes" "base-bytes"
"coq" {>= "8.6"} "coq" {>= "8.6"}
"coq-tlc" {>= "20171206"} "coq-tlc" {>= "20181116"}
] ]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment