Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mirage-conduit ocamlfind dependencies #232

Merged
merged 3 commits into from
Jul 25, 2017
Merged

Fix mirage-conduit ocamlfind dependencies #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d74633
Fix mirage-conduit ocamlfind dependencies
samoht Jul 25, 2017
5d043e8
Fix appveyor scripts
samoht Jul 25, 2017
1473f61
Add simple linking tests for mirage-conduit
samoht Jul 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ environment:
CYG_ROOT: "C:\\cygwin"
CYG_BASH: "%CYG_ROOT%\\bin\\bash -lc"
TESTS: "false"
PINS: "conduit.0.15.0:. mirage-conduit:."
PINS: "conduit.dev:. conduit-lwt.dev:. mirage-conduit.dev:."
EXTRA_REMOTES: "https://github.com/mirage/mirage-dev.git"
PACKAGE: "mirage-conduit"
PACKAGE: "mirage-conduit.dev"

install:
- appveyor DownloadFile https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/appveyor-opam.sh
Expand Down
3 changes: 2 additions & 1 deletion mirage-conduit.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ build: [
["jbuilder" "subst" "-p" name "--name" name] {pinned}
["jbuilder" "build" "-p" name "-j" jobs]
]
build-test: ["jbuilder" "runtest" "-p" name]

depends: [
"cstruct" {>= "3.0.0"}
"mirage-types-lwt" {>= "3.0.0"}
"mirage-flow-lwt" {>= "1.2.0"}
"mirage-dns" {>= "3.0.0"}
"conduit-lwt"
"conduit-lwt"
"vchan" {>= "3.0.0"}
"tls" {>="0.8.0"}
]
Expand Down
3 changes: 2 additions & 1 deletion mirage/jbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
(preprocess (pps (ppx_sexp_conv)))
(modules (conduit_mirage resolver_mirage conduit_xenstore))
(wrapped false)
(libraries (conduit conduit-lwt mirage-types-lwt mirage-dns vchan tls tls.lwt))))
(libraries (conduit conduit-lwt mirage-types-lwt mirage-dns vchan
tls tls.mirage))))
11 changes: 11 additions & 0 deletions tests/mirage/simple/jbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
(jbuild_version 1)

(executable
((name test)
(libraries (mirage-conduit))))

(alias
((name runtest)
(package mirage-conduit)
(deps (test.exe))
(action (run ${exe:test.exe} --color=always))))
10 changes: 10 additions & 0 deletions tests/mirage/simple/test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(* this is just to test that linking works properly *)

let client: Conduit_mirage.client =
`TCP (Ipaddr.of_string_exn "127.0.0.1", 12345)

let server: Conduit_mirage.server =
`TCP 12345

let _client () = Conduit_mirage.(connect empty) client
let _server () = Conduit_mirage.(listen empty) server