Merge pull request #391 from avsm/to-dune

release 3.7: port to dune, switch to topkg

CHANGES.md

@@ -4,6 +4,8 @@
   upstream in Lwt (ocsigen/lwt#361) (#388 by @avsm).
 * Remove arpv4 and ethif sublibraries, now provided by ethernet and arp-mirage
   opam packages (#380 by @hannesm).
+* Upgrade from jbuilder to dune (#391 @avsm)
+* Switch from topkg to dune-release (#391 @avsm)
 
 ### v3.6.0 (2019-01-04)
 

Makefile

@@ -2,29 +2,16 @@
 .PHONY: build clean test
 
 build:
-	jbuilder build @install --dev
+	dune build
 
 test:
-	jbuilder runtest --dev
+	dune runtest
 
 install:
-	jbuilder install
+	dune install
 
 uninstall:
-	jbuilder uninstall
+	dune uninstall
 
 clean:
-	jbuilder clean
-
-REPO=../../mirage/opam-repository
-PACKAGES=$(REPO)/packages
-# until we have https://github.com/ocaml/opam-publish/issues/38
-pkg-%:
-	topkg opam pkg -n $*
-	mkdir -p $(PACKAGES)/$*
-	cp -r _build/$*.* $(PACKAGES)/$*/
-	cd $(PACKAGES) && git add $*
-
-PKGS=$(basename $(wildcard *.opam))
-opam-pkg:
-	$(MAKE) $(PKGS:%=pkg-%)
+	dune clean

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.0)
+(name tcpip)

examples/ping/dune

@@ -0,0 +1,3 @@
+(executables
+ (names ping)
+ (libraries cmdliner logs logs.fmt tcpip.icmpv4-socket))

src/config/dune

@@ -0,0 +1,3 @@
+(executable
+ (name discover)
+ (libraries base stdio configurator))

src/icmp/dune

@@ -0,0 +1,7 @@
+(library
+ (name tcpip_icmpv4)
+ (public_name tcpip.icmpv4)
+ (libraries mirage-protocols-lwt rresult logs tcpip mirage-profile tcpip.udp)
+ (preprocess
+  (pps ppx_cstruct))
+ (wrapped false))

src/ipv4/dune

@@ -0,0 +1,8 @@
+(library
+ (name tcpip_ipv4)
+ (public_name tcpip.ipv4)
+ (libraries logs io-page mirage-protocols-lwt ipaddr cstruct rresult tcpip
+   ethernet tcpip.udp mirage-random mirage-clock randomconv lru)
+ (preprocess
+  (pps ppx_cstruct))
+ (wrapped false))

src/ipv6/dune

@@ -0,0 +1,9 @@
+(library
+ (name tcpip_ipv6)
+ (public_name tcpip.ipv6)
+ (libraries logs io-page mirage-protocols-lwt mirage-time-lwt
+   mirage-clock-lwt duration ipaddr cstruct rresult mirage-random tcpip
+   randomconv ethernet)
+ (preprocess
+  (pps ppx_cstruct))
+ (wrapped false))

src/stack-direct/dune

@@ -0,0 +1,5 @@
+(library
+ (name tcpip_stack_direct)
+ (public_name tcpip.stack-direct)
+ (libraries logs ipaddr lwt result fmt mirage-time-lwt mirage-random
+   mirage-protocols-lwt mirage-stack-lwt mirage-net-lwt))

src/stack-unix/dune

@@ -0,0 +1,54 @@
+(library
+ (name icmpv4_socket)
+ (public_name tcpip.icmpv4-socket)
+ (modules icmpv4_socket)
+ (wrapped false)
+ (libraries lwt.unix ipaddr.unix cstruct-lwt io-page-unix tcpip.icmpv4
+   tcpip.ipv4 tcpip.ipv6 mirage-protocols-lwt))
+
+(library
+ (name udpv4_socket)
+ (public_name tcpip.udpv4-socket)
+ (modules udpv4_socket)
+ (wrapped false)
+ (libraries lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols-lwt))
+
+(library
+ (name udpv6_socket)
+ (public_name tcpip.udpv6-socket)
+ (modules udpv6_socket)
+ (wrapped false)
+ (libraries lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols-lwt))
+
+(library
+ (name tcp_socket_options)
+ (public_name tcpip.tcp_socket_options)
+ (modules tcp_socket_options)
+ (c_names tcp_socket_options_stubs)
+ (wrapped false)
+ (libraries lwt.unix duration))
+
+(library
+ (name tcpv4_socket)
+ (public_name tcpip.tcpv4-socket)
+ (modules tcpv4_socket tcp_socket)
+ (wrapped false)
+ (libraries lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols
+   mirage-protocols-lwt tcp_socket_options))
+
+(library
+ (name tcpv6_socket)
+ (public_name tcpip.tcpv6-socket)
+ (modules tcpv6_socket)
+ (wrapped false)
+ (libraries lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols
+   mirage-protocols-lwt tcpv4_socket tcp_socket_options))
+
+(library
+ (name tcpip_stack_socket)
+ (public_name tcpip.stack-socket)
+ (modules tcpip_stack_socket ipv4_socket ipv6_socket)
+ (wrapped false)
+ (libraries lwt.unix cstruct-lwt ipaddr.unix io-page-unix logs
+   tcpip.tcpv4-socket tcpip.udpv4-socket tcpip.ipv4 tcpip.ipv6 tcpip.icmpv4
+   mirage-protocols-lwt mirage-stack-lwt))

src/tcp/dune

@@ -0,0 +1,8 @@
+(library
+ (name tcp)
+ (public_name tcpip.tcp)
+ (libraries logs mirage-protocols-lwt ipaddr cstruct lwt-dllist rresult
+   mirage-profile io-page tcpip duration randomconv fmt mirage-time-lwt
+   mirage-clock mirage-random)
+ (preprocess
+  (pps ppx_cstruct)))

src/tcpip_checksum/dune

@@ -0,0 +1,37 @@
+(library
+ (name tcpip)
+ (public_name tcpip)
+ (modules tcpip_checksum)
+ (libraries cstruct tcpip.unix)
+ (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 %{<} -ocamlc %{ocamlc})))
+
+(rule
+ (targets checksum_stubs_xen.c)
+ (deps
+  (:< checksum_stubs.c))
+ (action
+  (copy# %{<} %{targets})))
+
+(library
+ (name tcpip_unix)
+ (public_name tcpip.unix)
+ (modules tcpip_unix)
+ (c_names checksum_stubs)
+ (wrapped false))

src/udp/dune

@@ -0,0 +1,7 @@
+(library
+ (name tcpip_udpv4)
+ (public_name tcpip.udp)
+ (libraries mirage-protocols-lwt mirage-random rresult logs tcpip randomconv)
+ (preprocess
+  (pps ppx_cstruct))
+ (wrapped false))

tcpip.opam

@@ -13,13 +13,13 @@ license: "ISC"
 tags: ["org:mirage"]
 
 build: [
-  ["jbuilder" "subst" "-p" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 
 depends: [
-  "jbuilder"     {build & >="1.0+beta10"}
+  "dune"     {build & >= "1.0"}
   "configurator" {build}
   "ocaml" {>= "4.03.0"}
   "rresult" {>= "0.5.0"}

test/dune

@@ -0,0 +1,15 @@
+(executables
+ (names test)
+ (libraries alcotest mirage-random-test lwt.unix io-page-unix tcpip.unix logs
+   logs.fmt mirage-profile mirage-flow mirage-vnetif mirage-clock-unix
+   pcap-format duration mirage-random rresult mirage-protocols-lwt
+   mirage-stack-lwt 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))
+
+(alias
+ (name runtest)
+ (deps
+  (:< test.exe))
+ (action
+  (run %{<} -q -e --color=always)))