Don't attempt to compile known-broken code for now

Makefile

@@ -7,12 +7,14 @@ SED=sed
 BZIP2=bzip2
 CP=cp
 OCAMLFIND=ocamlfind
+MAKE=make
 
 RPM_SPECSDIR?=$(shell rpm --eval='%_specdir')
 RPM_SRPMSDIR?=$(shell rpm --eval='%_srcrpmdir')
 RPM_SOURCESDIR?=$(shell rpm --eval='%_sourcedir')
 RPMBUILD?=rpmbuild
 
+default: build
 
 idl: files.cmx types.cmx smapiv2.cmx xenops.cmx memory.cmx python.cmx ocaml.cmx html.cmx main.cmx
 	${OCAMLFIND} ocamlopt -package xmlm -linkpkg -g -o idl files.cmx types.cmx smapiv2.cmx xenops.cmx memory.cmx python.cmx ocaml.cmx html.cmx main.cmx
@@ -28,9 +30,13 @@ toplevel: files.cmo types.cmo smapiv2.cmo xenops.cmo memory.cmo python.cmo ocaml
 
 PYPATH=/usr/lib/xcp-sm-fs
 
-.PHONY: install
-install: idl
+.PHONY: build
+build: idl
 	./idl
+	${MAKE} -C ocaml
+
+.PHONY: install
+install: build
 	${MKDIR} -p ${DESTDIR}${PYPATH}
 	${INSTALL} python/fs.py ${DESTDIR}${PYPATH}
 	${INSTALL} python/mount.py ${DESTDIR}${PYPATH}
@@ -71,3 +77,4 @@ srpm: python/xcp-sm-fs.spec xcp-sm-fs-0.9.tar.bz2
 .PHONY: clean
 clean:
 	rm -f *.cmx *.cmo *.cmi idl toplevel
+	${MAKE} -C ocaml clean

main.ml

@@ -23,7 +23,7 @@ let _ =
 
 	List.iter
 		(fun api ->
-			with_output_file (Printf.sprintf "ocaml/%s.ml" api.Interfaces.name)
+			with_output_file (Printf.sprintf "ocaml/lib/%s.ml" api.Interfaces.name)
 				(fun oc ->
 					let idents, api = resolve_refs_in_api api in
 					output_string oc (Ocaml.of_interfaces idents api |> Ocaml.string_of_ts)

ocaml/_oasis

@@ -19,7 +19,7 @@ Library "xcp-api-client"
   CompiledObject:     best
   Path: lib
   Findlibname: xcp-api-client
-  Modules: Xcp, Storage, Domains, Memory
+  Modules: Xcp, Storage
   BuildDepends:	rpc
 
 Executable xcp_api_test
@@ -29,7 +29,7 @@ Executable xcp_api_test
   Custom:             true
   CompiledObject:     best
   Install:            false
-  BuildDepends:       xcp-api-client, oUnit
+  BuildDepends:       xcp-api-client, lwt, lwt.unix, oUnit
 
 Test xcp_api_test_test
   Run$:               flag(tests)

ocaml/lib/xcp.ml

@@ -1,4 +1,3 @@
-module Xcp = struct
 module Result = struct
 	type ('a, 'b) t =
 		| Ok of 'a
@@ -35,4 +34,4 @@ end
 exception Unknown_method of string
 
 exception Internal_error of string
-end
+