Attention une mise à jour du service Gitlab va être effectuée le mardi 30 novembre entre 17h30 et 18h00. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes. Cette mise à jour intermédiaire en version 14.0.12 nous permettra de rapidement pouvoir mettre à votre disposition une version plus récente.

Commit 423432d2 authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Split the opam package into 3 packages and let opam do the installation instead of dune.

parent eb8a4411
...@@ -287,12 +287,11 @@ export: ...@@ -287,12 +287,11 @@ export:
# The following command should have been run once: # The following command should have been run once:
# opam publish repo add opam-coq-archive coq/opam-coq-archive # opam publish repo add opam-coq-archive coq/opam-coq-archive
# The package name. # An abbreviation.
THIS := menhir COQLIB := coq-menhirlib
THAT := coq-menhirlib
# Menhir's repository URL (https). # Menhir's repository URL (https).
REPO := https://gitlab.inria.fr/fpottier/$(THIS) REPO := https://gitlab.inria.fr/fpottier/menhir
# The archive URL (https). # The archive URL (https).
ARCHIVE := $(REPO)/repository/$(DATE)/archive.tar.gz ARCHIVE := $(REPO)/repository/$(DATE)/archive.tar.gz
...@@ -304,18 +303,19 @@ COQ_MENHIRLIB_PUBLISH_OPTIONS := \ ...@@ -304,18 +303,19 @@ COQ_MENHIRLIB_PUBLISH_OPTIONS := \
.PHONY: opam .PHONY: opam
opam: opam:
# Publish an opam description for menhir. # Publish opam descriptions for menhirLib, menhirSdk, menhir.
@ opam publish -v $(DATE) $(THIS).opam $(ARCHIVE) @ opam publish -v $(DATE) menhirLib.opam menhirSdk.opam menhir.opam $(ARCHIVE)
# Patch coq-menhirlib.opam. # Patch coq-menhirlib.opam.
# We replace the string DATEDASH with $(DATEDASH). # We replace the string DATEDASH with $(DATEDASH).
# We replace the string DATE with $(DATE). # We replace the string DATE with $(DATE).
@ cat $(THAT).opam \ @ cat $(COQLIB).opam \
| sed -e 's/DATEDASH/$(DATEDASH)/g' \ | sed -e 's/DATEDASH/$(DATEDASH)/g' \
| sed -e 's/DATE/$(DATE)/g' \ | sed -e 's/DATE/$(DATE)/g' \
> $(THAT).patched.opam > $(COQLIB).patched.opam
# Publish an opam description for coq-menhirlib. # Publish an opam description for coq-menhirlib.
@ opam publish -v $(DATE) $(COQ_MENHIRLIB_PUBLISH_OPTIONS) $(THAT).patched.opam $(ARCHIVE) @ opam publish -v $(DATE) $(COQ_MENHIRLIB_PUBLISH_OPTIONS) \
@ rm $(THAT).patched.opam $(COQLIB).patched.opam $(ARCHIVE)
@ rm $(COQLIB).patched.opam
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
...@@ -323,11 +323,13 @@ opam: ...@@ -323,11 +323,13 @@ opam:
.PHONY: pin .PHONY: pin
pin: pin:
opam pin add menhir.dev . opam pin --yes add menhirLib.dev . && \
opam pin --yes add menhirSdk.dev . && \
opam pin --yes add menhir.dev .
.PHONY: unpin .PHONY: unpin
unpin: unpin:
opam pin remove menhir opam pin --yes remove menhirLib menhirSdk menhir
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
......
name: "menhir"
opam-version: "2.0" opam-version: "2.0"
maintainer: "francois.pottier@inria.fr" maintainer: "francois.pottier@inria.fr"
authors: [ authors: [
...@@ -9,13 +8,12 @@ homepage: "http://gitlab.inria.fr/fpottier/menhir" ...@@ -9,13 +8,12 @@ homepage: "http://gitlab.inria.fr/fpottier/menhir"
dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git" dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
bug-reports: "menhir@inria.fr" bug-reports: "menhir@inria.fr"
build: [ build: [
["dune" "build" "@install" "-j" jobs "--profile=release"] ["dune" "build" "-p" name "-j" jobs]
]
install: [
["dune" "install" "-j" jobs]
] ]
depends: [ depends: [
"ocaml" {>= "4.02.3"} "ocaml" {>= "4.02.3"}
"dune" {>= "2.0.0"} "dune" {>= "2.0.0"}
"menhirLib" {= version}
"menhirSdk" {= version}
] ]
synopsis: "An LR(1) parser generator" synopsis: "An LR(1) parser generator"
opam-version: "2.0"
maintainer: "francois.pottier@inria.fr"
authors: [
"François Pottier <francois.pottier@inria.fr>"
"Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
]
homepage: "http://gitlab.inria.fr/fpottier/menhir"
dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
bug-reports: "menhir@inria.fr"
build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.02.3"}
"dune" {>= "2.0.0"}
]
synopsis: "Runtime support library for parsers generated by Menhir"
opam-version: "2.0"
maintainer: "francois.pottier@inria.fr"
authors: [
"François Pottier <francois.pottier@inria.fr>"
"Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
]
homepage: "http://gitlab.inria.fr/fpottier/menhir"
dev-repo: "git+https://gitlab.inria.fr/fpottier/menhir.git"
bug-reports: "menhir@inria.fr"
build: [
["dune" "build" "-p" name "-j" jobs]
]
depends: [
"ocaml" {>= "4.02.3"}
"dune" {>= "2.0.0"}
]
synopsis: "Compile-time library for auxiliary tools related to Menhir"
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