Merge pull request #42 from djs55/cmdliner

Use cmdliner for command-line parsing and manpage generation

Author: robhoes

.gitignore

@@ -1,3 +1,9 @@
 *.swp
-
+setup.bin
+networkd/version.ml
+xcp-networkd
+xcp-networkd.1
+*.native
+setup.data
+setup.log
 dist/

ChangeLog

@@ -1,3 +1,12 @@
+0.9.5 (27-Sep-2014):
+* Add man page and standard command-line options
+* Use libnl to read stats from interfaces
+* CA-137227: Checking xen-backend in link of /sys/class/net/*/device/...
+* Don't let naughty dhcp servers trick us into setting default routes
+* Don't record RRDs for the "ovs-system" interface
+* CA-137591: Removing all the interfaces before bringing the bridge down
+* CA-140402: set max-idle to 5000ms on OVS
+
 0.9.4 (3-Jun-2014):
 * Use oasis for building
 * Update to new stdext interface

Makefile

@@ -1,6 +1,7 @@
 BINDIR ?= /usr/bin
 SBINDIR ?= /usr/sbin
 ETCDIR ?= /etc
+MANDIR ?= /usr/share/man/man1
 all: build doc
 
 .PHONY: test install uninstall clean
@@ -15,8 +16,13 @@ setup.bin: setup.ml
 setup.data: setup.bin
 	@./setup.bin -configure --enable-tests
 
-build: setup.data setup.bin
+build: setup.data setup.bin networkd/version.ml
 	@./setup.bin -build -j $(J)
+	mv networkd.native xcp-networkd
+	./xcp-networkd --help=groff > xcp-networkd.1
+
+networkd/version.ml: VERSION
+	echo "let version = \"$(shell cat VERSION)\"" > networkd/version.ml
 
 doc: setup.data setup.bin
 	@./setup.bin -doc -j $(J)
@@ -25,13 +31,20 @@ test: setup.bin build
 	@./setup.bin -test
 
 install:
-	install -D networkd.native $(DESTDIR)$(SBINDIR)/xcp-networkd
-	install -D networkd_db.native $(DESTDIR)$(BINDIR)/networkd_db
+	mkdir -p $(DESTDIR)$(SBINDIR)
+	install xcp-networkd $(DESTDIR)$(SBINDIR)/xcp-networkd
+	mkdir -p $(DESTDIR)$(MANDIR)
+	install xcp-networkd.1 $(DESTDIR)$(MANDIR)/xcp-networkd.1
+	mkdir -p $(DESTDIR)$(BINDIR)
+	install networkd_db.native $(DESTDIR)$(BINDIR)/networkd_db
 
 uninstall:
 	rm -f $(DESTDIR)$(SBINDIR)/xcp-networkd
+	rm -f $(DESTDIR)$(MANDIR)/xcp-networkd.1
 	rm -f $(DESTDIR)$(SBINDIR)/networkd_db
 
 clean:
 	@ocamlbuild -clean
 	@rm -f setup.data setup.log setup.bin
+	rm networkd/version.ml
+	rm xcp-networkd xcp-networkd.1

VERSION

@@ -1 +1 @@
-0.9.3
+0.9.5

_oasis

@@ -1,6 +1,6 @@
 OASISFormat: 0.3
 Name:        xcp-networkd
-Version:     0.9.4
+Version:     0.9.5
 Synopsis:    XCP Network Daemon
 Authors:     Rob Hoes
 License:     LGPL-2.1 with OCaml linking exception

networkd/networkd.ml

@@ -60,8 +60,22 @@ let handle_shutdown () =
 	Sys.set_signal Sys.sigint (Sys.Signal_handle stop);
 	Sys.set_signal Sys.sigpipe Sys.Signal_ignore
 
+let doc = String.concat "\n" [
+	"This is the xapi toolstack network management daemon.";
+	"";
+	"This service looks after host network configuration, including setting up bridges and/or openvswitch instances, configuring IP addresses etc.";
+]
+
 let _ =
-	Xcp_service.configure ~resources ();
+	begin match Xcp_service.configure2
+		~name:Sys.argv.(0)
+		~version:Version.version
+		~doc ~resources () with
+	| `Ok () -> ()
+	| `Error m ->
+		Printf.fprintf stderr "%s\n" m;
+		exit 1
+	end;
 
 	let server = Xcp_service.make
 		~path:!Network_interface.default_path