Port to OCaml 5.0.0, bump version to 1.3.

* minor fixup for camlp5 8.00 there are now PPX attributes in many places, so (for example) what was a pair (pattern * expression) is now a triple (pattern * expression * attributes). Typically the attributes are empty in generated code. Since this is a spot that can have a meta-variable in quotations, we have to wrap the empty-list in a "vala". But again, this is pretty much a boilerplate value. Co-authored-by: Chet Murthy <[email protected]>
ocaml-community · Jan 23, 2023 · c907390 · c907390
1 parent 45218ff
commit c907390
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+1.3 camlp5 version
+     * Ported to ocaml 5.0.0
+
 -camlp5 version
      * Backported from camlp4 to camlp5
 

diff --git a/META b/META
@@ -1,5 +1,5 @@
 version = "1.2"
-requires = "camlp5"
+requires = "camlp-streams unix"
 description = "Runtime support for ulex"
 archive(byte) = "ulexing.cma"
 archive(native) = "ulexing.cmxa"

diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 ALL=pa_ulex.cma ulexing.cma
-OCAMLBUILD=ocamlbuild -byte-plugin -use-ocamlfind
+OCAMLBUILD=ocamlbuild -byte-plugin -use-ocamlfind -package camlp-streams
+DESTDIR?=`ocamlfind printconf destdir`
 
 all::
 	$(OCAMLBUILD) $(ALL)

diff --git a/opam b/opam
@@ -1,8 +1,9 @@
 opam-version: "2.0"
 name: "ulex-camlp5"
-version: "1.2"
+version: "1.3"
 maintainer: "[email protected]"
 authors: ["[email protected]"]
+license: "MIT"
 homepage: "https://github.com/whitequark/ulex"
 dev-repo: "git+https://github.com/whitequark/ulex.git"
 bug-reports: "https://github.com/whitequark/ulex/issues"
@@ -15,8 +16,9 @@ install: [make "install"]
 remove: [["ocamlfind" "remove" "ulex-camlp5"]]
 flags: light-uninstall
 depends: [
-  "ocaml" {>="4.02.0"} 
+  "ocaml" {>="4.14.1"} 
   "ocamlfind" {build}
-  "camlp5" {> "7.99"}
+  "camlp5" {>= "8.00.04"}
+  "camlp-streams"
   "ocamlbuild" {build}
 ]