Merge pull request #150 from kc284/master

Moved from jbuilder to dune and deprecated xcp and xcp-inventory in f…

Author: lindig

.merlin

@@ -5,10 +5,10 @@ MANDIR ?= /usr/share/man/man1
 .PHONY: release build install uninstall clean test doc reindent
 
 release:
-	jbuilder build @install @networkd/man
+	dune build @install @networkd/man --profile=release
 
 build:
-	jbuilder build @install @networkd/man --dev
+	dune build @install @networkd/man
 
 install:
 	mkdir -p $(DESTDIR)$(SBINDIR)
@@ -24,14 +24,14 @@ uninstall:
 	rm -f $(DESTDIR)$(SBINDIR)/networkd_db
 
 clean:
-	jbuilder clean
+	dune clean
 
 test:
-	jbuilder runtest
+	dune runtest --profile=release
 
 # requires odoc
 doc:
-	jbuilder build @doc
+	dune build @doc --profile=release
 
 reindent:
 	ocp-indent --inplace **/*.ml*

Makefile

@@ -0,0 +1 @@
+(lang dune 1.4)

dune-project

@@ -0,0 +1,18 @@
+(library
+  (name networklibs)
+  (flags (:standard :standard -bin-annot -safe-string))
+  (libraries
+    astring
+    forkexec
+    mtime
+    mtime.clock.os
+    rpclib
+    systemd
+    threads
+    re.perl
+    xapi-stdext-unix
+    xapi-inventory
+    xapi-idl.network
+   )
+  (wrapped false)
+)

jbuild

@@ -0,0 +1,40 @@
+(rule
+  (targets version.ml)
+  (deps ../VERSION)
+  (action (with-stdout-to %{targets} (bash "cat %{deps} | sed s/^/\"let version = \"\\\"/ | sed s/$/\\\"/")))
+)
+
+(rule
+  (targets xcp-networkd.1)
+  (deps networkd.exe)
+  (action  (with-stdout-to %{targets} (run %{deps} "--help=groff")))
+)
+
+(executable
+  (name networkd)
+  (public_name xapi-networkd)
+  (package xapi-networkd)
+  (flags (:standard -bin-annot -safe-string))
+  (libraries
+    forkexec
+    netlink
+    networklibs
+    profiling
+    rpclib
+    systemd
+    threads
+    xapi-stdext-monadic
+    xapi-stdext-pervasives
+    xapi-stdext-threads
+    xapi-stdext-unix
+    xapi-inventory
+    xapi-idl
+    xapi-idl.network
+    xen-api-client
+  )
+)
+
+(alias
+  (name man)
+  (deps xcp-networkd.1)
+)

lib/dune

@@ -0,0 +1,12 @@
+(executable
+  (name networkd_db)
+  (public_name networkd_db)
+  (package xapi-networkd)
+  (flags (:standard -bin-annot -safe-string))
+  (libraries
+    networklibs
+    profiling
+    threads
+    xapi-idl.network
+  )
+)