simon/picos backend

.github/workflows/main.yml

@@ -2,10 +2,10 @@ name: build
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
 jobs:
   run:
     name: Build
@@ -16,8 +16,9 @@ jobs:
           # - macos-latest    # build issues with `ar` (!!!)
           #- windows-latest   # certificate problem
         ocaml-compiler:
-          - 4.03.x
+          - 4.08.x
           - 4.12.x
+          - 5.2.x
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2

.ocamlformat

@@ -1,4 +1,4 @@
-version = 0.24.1
+version = 0.26.2
 profile=conventional
 margin=80
 if-then-else=k-r

dune

@@ -1,6 +1,6 @@
 
-(alias
- (name runtest)
+(rule
+ (alias runtest)
  (package ezcurl-lwt)
  (deps (:file README.md))
  (action

dune-project

@@ -1,3 +1,58 @@
-(lang dune 1.0)
+(lang dune 3.0)
+
 (name ezcurl)
+
 (version 0.2.4)
+
+(generate_opam_files true)
+
+(license MIT)
+
+(maintainers "[email protected]")
+
+(authors "Simon Cruanes")
+(source (github c-cube/ezcurl))
+(documentation https://c-cube.github.io/ezcurl/)
+
+(package
+ (name ezcurl)
+ (synopsis "Friendly wrapper around OCurl")
+ (tags
+  ("curl" "web" "http" "client"))
+ (depends
+  (ocurl
+   (>= 0.8))
+  (odoc :with-doc)
+  (ocaml
+   (>= 4.03))))
+
+(package
+ (name ezcurl-lwt)
+ (synopsis "Friendly wrapper around OCurl, Lwt version")
+ (tags
+  ("curl" "web" "http" "client" "lwt"))
+ (depends
+  (ezcurl
+   (= :version))
+  lwt
+  (mdx :with-test)
+  (odoc :with-doc)
+  (ocaml
+   (>= 4.03))))
+
+(package
+ (name ezcurl-picos)
+ (synopsis "Friendly wrapper around OCurl, using picos")
+ (tags
+  ("curl" "web" "http" "client" "lwt"))
+ (depends
+  (ezcurl
+   (= :version))
+  (picos (and (>= 0.5) (< 0.6)))
+  (picos_std (and (>= 0.5) (< 0.6)))
+  (picos_io (and (>= 0.5) (< 0.6)))
+  (picos_mux (and (>= 0.5) (< 0.6) :with-test))
+  (mdx :with-test)
+  (odoc :with-doc)
+  (ocaml
+   (>= 4.03))))

ezcurl-lwt.opam

@@ -1,26 +1,34 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "ezcurl-lwt"
 version: "0.2.4"
+synopsis: "Friendly wrapper around OCurl, Lwt version"
+maintainer: ["[email protected]"]
 authors: ["Simon Cruanes"]
-maintainer: "[email protected]"
 license: "MIT"
-synopsis: "Friendly wrapper around OCurl, Lwt version"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
-  #["dune" "runtest" "-p" name] {with-test}
-]
+tags: ["curl" "web" "http" "client" "lwt"]
+homepage: "https://github.com/c-cube/ezcurl"
+doc: "https://c-cube.github.io/ezcurl/"
+bug-reports: "https://github.com/c-cube/ezcurl/issues"
 depends: [
-  "ocurl" {>= "0.8.0"}
-  "ezcurl" { = version }
+  "dune" {>= "3.0"}
+  "ezcurl" {= version}
   "lwt"
-  "dune" { >= "1.0" }
-  "odoc" {with-doc}
   "mdx" {with-test}
-  "ocaml" { >= "4.03.0" }
+  "odoc" {with-doc}
+  "ocaml" {>= "4.03"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
-tags: [ "curl" "web" "http" "client" "lwt" ]
-homepage: "https://github.com/c-cube/ezcurl/"
-doc: "https://c-cube.github.io/ezcurl/doc/1.2"
-bug-reports: "https://github.com/c-cube/ezcurl/issues"
 dev-repo: "git+https://github.com/c-cube/ezcurl.git"

ezcurl-picos.opam

@@ -0,0 +1,37 @@
+# This file is generated by dune, edit dune-project instead
+opam-version: "2.0"
+version: "0.2.4"
+synopsis: "Friendly wrapper around OCurl, using picos"
+maintainer: ["[email protected]"]
+authors: ["Simon Cruanes"]
+license: "MIT"
+tags: ["curl" "web" "http" "client" "lwt"]
+homepage: "https://github.com/c-cube/ezcurl"
+doc: "https://c-cube.github.io/ezcurl/"
+bug-reports: "https://github.com/c-cube/ezcurl/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ezcurl" {= version}
+  "picos" {>= "0.5" & < "0.6"}
+  "picos_std" {>= "0.5" & < "0.6"}
+  "picos_io" {>= "0.5" & < "0.6"}
+  "picos_mux" {>= "0.5" & < "0.6" & with-test}
+  "mdx" {with-test}
+  "odoc" {with-doc}
+  "ocaml" {>= "4.03"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
+dev-repo: "git+https://github.com/c-cube/ezcurl.git"

ezcurl.opam

@@ -1,23 +1,32 @@
+# This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-name: "ezcurl"
 version: "0.2.4"
+synopsis: "Friendly wrapper around OCurl"
+maintainer: ["[email protected]"]
 authors: ["Simon Cruanes"]
-maintainer: "[email protected]"
 license: "MIT"
-synopsis: "Friendly wrapper around OCurl"
-build: [
-  ["dune" "build" "@install" "-p" name "-j" jobs]
-  ["dune" "build" "@doc" "-p" name] {with-doc}
-  #["dune" "runtest" "-p" name] {with-test}
-]
+tags: ["curl" "web" "http" "client"]
+homepage: "https://github.com/c-cube/ezcurl"
+doc: "https://c-cube.github.io/ezcurl/"
+bug-reports: "https://github.com/c-cube/ezcurl/issues"
 depends: [
-  "ocurl" {>= "0.8.0"}
-  "dune" { >= "1.0" }
+  "dune" {>= "3.0"}
+  "ocurl" {>= "0.8"}
   "odoc" {with-doc}
-  "ocaml" { >= "4.03.0" }
+  "ocaml" {>= "4.03"}
+]
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
 ]
-tags: [ "curl" "web" "http" "client" ]
-homepage: "https://github.com/c-cube/ezcurl/"
-doc: "https://c-cube.github.io/ezcurl/doc/1.2"
-bug-reports: "https://github.com/c-cube/ezcurl/issues"
 dev-repo: "git+https://github.com/c-cube/ezcurl.git"

src/picos/dune

@@ -0,0 +1,12 @@
+(library
+ (name ezcurl_picos)
+ (public_name ezcurl-picos)
+ (flags :standard -warn-error -32)
+ (libraries
+  curl
+  ezcurl.core
+  picos
+  picos_std.sync
+  picos_std.event
+  picos_io.select
+  picos_io))