better OCaml version handling, fix up extraction

coq-community · Jan 19, 2020 · 84a16ca · 84a16ca
1 parent a0cd133
commit 84a16ca
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/.travis.yml.mustache b/.travis.yml.mustache
@@ -55,10 +55,12 @@ matrix:
 {{/ tested_coq_opam_versions }}
 
 {{# extracted }}
-  # Test extracted via OPAM
+  # Test extracted supported versions of Coq via OPAM
+{{# extracted_tested_coq_opam_versions }}
   - env:
-    - COQ_IMAGE=coqorg/coq:{{ tested_extracted_coq_opam_version }}
-    - PACKAGE=coq-{{ extracted_shortname }}
+    - COQ_IMAGE=coqorg/coq:{{ version }}
+    - PACKAGE={{ extracted_shortname }}.{{ opam-file-version }}{{^ opam-file-version }}dev{{/ opam-file-version }}
     - NJOBS=2
     <<: *OPAM
+{{/ extracted_tested_coq_opam_versions }}
 {{/ extracted }}
diff --git a/README.md.mustache b/README.md.mustache
@@ -68,10 +68,10 @@
 {{# supported_coq_versions }}
 - Compatible Coq versions: {{& text }}
 {{/ supported_coq_versions }}
-{{# plugin }}
-- Compatible OCaml versions: all versions supported by Coq
-{{/ plugin }}
-- Additional Coq dependencies:{{# dependencies }}
+{{# supported_ocaml_versions }}
+- Compatible OCaml versions: {{& text }}
+{{/ supported_ocaml_versions }}
+- Additional dependencies:{{# dependencies }}
   - {{& description }}{{/ dependencies }}{{^ dependencies }} none{{/ dependencies }}
 - Coq namespace: `{{ namespace }}`
 - Related publication(s):{{# publications }}
@@ -102,18 +102,18 @@ make install
 
 {{& extracted_description}}
 
-{{# supported_ocaml_versions }}
+{{# extracted_supported_ocaml_versions }}
 - Compatible OCaml versions: {{& text }}
-{{/ supported_ocaml_versions }}
-- Additional OCaml dependencies:{{# extracted_dependencies }}
+{{/ extracted_supported_ocaml_versions }}
+- Additional dependencies:{{# extracted_dependencies }}
   - {{& description }} {{/ extracted_dependencies }}{{^ extracted_dependencies }} none{{/ extracted_dependencies }}
 
-{{& extracted_fullname }} can be installed via OPAM as above using the package name `coq-{{ extracted_shortname }}`.
-
-To instead extract the code and compile manually, use the following command:
+{{& extracted_build }}{{^ extracted_build }}## Building
+To extract the code and compile manually, use the following command:
 ```
-make {{& target }}
+make {{& extracted_make_target }}
 ```
+{{/ extracted_build }}
 {{/ extracted }}
 
 {{& documentation }}
diff --git a/coq.opam.mustache b/coq.opam.mustache
@@ -15,7 +15,9 @@ description: """
 build: [make "-j%{jobs}%"]
 install: [make "install"]
 depends: [
-  "ocaml"
+{{# supported_ocaml_versions }}
+  "ocaml" {{& opam }}
+{{/ supported_ocaml_versions }}
 {{# supported_coq_versions }}
   "coq" {{& opam }}
 {{/ supported_coq_versions }}

diff --git a/extracted.opam.mustache b/extracted.opam.mustache
@@ -11,11 +11,11 @@ synopsis: "{{& extracted_synopsis }}"
 description: """
 {{& extracted_description }}"""
 
-build: [make "-j%{jobs}%" "{{& target }}"]
+build: [make "-j%{jobs}%" "{{& extracted_make_target }}"]
 depends: [
-{{# supported_ocaml_versions }}
+{{# extracted_supported_ocaml_versions }}
   "ocaml" {{& opam }}
-{{/ supported_ocaml_versions }}
+{{/ extracted_supported_ocaml_versions }}
 {{# supported_coq_versions }}
   "coq" {{& opam }}
 {{/ supported_coq_versions }}