Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 0 additions & 25 deletions src/config/discover.ml

This file was deleted.

3 changes: 0 additions & 3 deletions src/config/dune

This file was deleted.

2 changes: 1 addition & 1 deletion src/stack-direct/dune
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(library
(name tcpip_stack_direct)
(public_name tcpip.stack-direct)
(libraries logs ipaddr lwt result fmt mirage-time mirage-random
(libraries logs ipaddr lwt fmt mirage-time mirage-random
mirage-protocols mirage-stack mirage-net ethernet))
25 changes: 1 addition & 24 deletions src/tcpip_checksum/dune
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,9 @@
(name tcpip)
(public_name tcpip)
(modules tcpip_checksum)
(libraries cstruct tcpip.unix)
(libraries cstruct)
(wrapped false))

(library
(name tcpip_xen)
(public_name tcpip.xen)
(libraries tcpip)
(modules tcpip_xen)
(c_names checksum_stubs_xen)
(c_flags
(:include c_flags_xen.sexp))
(wrapped false))

(rule
(targets c_flags_xen.sexp)
(deps
(:< ../config/discover.exe))
(action (run %{<})))

(rule
(targets checksum_stubs_xen.c)
(deps
(:< checksum_stubs.c))
(action
(copy# %{<} %{targets})))

(library
(name tcpip_unix)
(public_name tcpip.unix)
Expand Down
Empty file removed src/tcpip_checksum/tcpip_xen.ml
Empty file.
8 changes: 3 additions & 5 deletions tcpip.opam
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ tags: ["org:mirage"]

build: [
["dune" "subst"] {pinned}
["env" "OPAM_PKG_CONFIG_PATH=%{prefix}%/lib/pkgconfig" "dune" "build" "-p" name "-j" jobs]
["env" "OPAM_PKG_CONFIG_PATH=%{prefix}%/lib/pkgconfig" "dune" "runtest" "-p" name "-j" jobs] {with-test}
["dune" "build" "-p" name "-j" jobs]
["dune" "runtest" "-p" name "-j" jobs] {with-test}
]

depopts: ["mirage-xen-ocaml"]
conflicts: [ "mirage-xen" {< "6.0.0"} ]
depends: [
"dune"
"dune-configurator"
"ocaml" {>= "4.06.0"}
"rresult" {>= "0.5.0"}
"cstruct" {>= "3.2.0"}
Expand Down
2 changes: 1 addition & 1 deletion test/dune
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
mirage-stack arp arp-mirage ethernet tcpip.ipv4 tcpip.tcp tcpip.udp
tcpip.stack-direct tcpip.icmpv4 tcpip.udpv4-socket tcpip.tcpv4-socket
tcpip.icmpv4-socket tcpip.stack-socket tcpip.ipv6 ipaddr-cstruct
macaddr-cstruct))
macaddr-cstruct tcpip.unix))

(alias
(name runtest)
Expand Down