Merge pull request #18 from djs55/fixes

Fix the makefiles

.gitignore

@@ -20,7 +20,10 @@ generator/_build
 generator/main.native
 ocaml/lib/v.ml
 ocaml/lib/d.ml
-python/V.py
-python/D.py
+ocaml/lib/p.ml
 doc
 ocaml/examples
+python/build
+python/d.py
+python/v.py
+python/p.py

Makefile

@@ -7,16 +7,24 @@ build:
 	mkdir -p ocaml/examples
 	./generator/main.native
 	make -C ocaml
+	make -C python
+
+.PHONY: html
+html: build
+	./generator/main.native -html
 
 .PHONY: install
 install:
 	make -C ocaml install
+	make -C python install
 
 .PHONY: reinstall
 reinstall:
 	make -C ocaml reinstall
+	make -C python reinstall
 
 .PHONY: clean
 clean:
 	make -C generator clean
 	make -C ocaml clean
+	make -C python clean

generator/src/control.ml

@@ -1,4 +1,5 @@
 open Types
+open Type
 
 let api =
   let volume_decl =

generator/src/main.ml

@@ -1,7 +1,13 @@
-open Types
-open Files
 
 let _ =
+  let generate_html = ref false in
+  Arg.parse [
+    "-html", Arg.Set generate_html, "Output HTML docs";
+  ] (fun x -> Printf.fprintf stderr "Unknown argument: %s\n%!" x; exit 1)
+  "Generate OCaml/Python/HTML documentation";
+
+  let open Types in
+  let open Files in
   let apis = [
     Plugin.api;
     Control.api;
@@ -10,7 +16,8 @@ let _ =
   (* Prepend the debug_info argument *)
   let apis = List.map Types.prepend_dbg apis in
 
-  Www.write apis;
+  if !generate_html
+  then Www.write apis;
 
   List.iter
     (fun api ->

python/Makefile

@@ -0,0 +1,14 @@
+PREFIX?=/
+
+.PHONY: build
+build:
+	python setup.py build
+
+.PHONY: clean
+clean:
+	python setup.py clean
+	rm -rf build
+
+.PHONY: install
+install: build
+	python setup.py install --prefix $(PREFIX)

python/setup.py

@@ -0,0 +1,3 @@
+from distutils.core import setup
+setup (name = "xapi-storage", version = "0.1",
+       py_modules = ["d", "p", "v", "xapi"])