[Xen-devel] [PATCH 1 of 7] [OCAML] Rename the ocamlfind packages

[Jon Ludlam <jonathan.ludlam@xxxxxxxxxxxxx>]

ocamlfind does not support namespaces, so to avoid
name clashes the ocamlfind package names have been
changed. Note that this does not change the names
of the actual modules themselves.

xb becomes xenbus, xc becomes xenctrl, xl becomes xenlight,
xs becomes xenstore, eventchn becomes xeneventchn.

Signed-off-by: Jon Ludlam <jonathan.ludlam@xxxxxxxxxxxxx>

diff -r 3d1664cc9e45 -r ad1b4634d0d0 tools/ocaml/libs/eventchn/Makefile
--- a/tools/ocaml/libs/eventchn/Makefile
+++ b/tools/ocaml/libs/eventchn/Makefile
@@ -24,12 +24,12 @@
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) eventchn
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore eventchn META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn
+       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xeneventchn 
META $(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) eventchn
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xeneventchn
 
 include $(TOPLEVEL)/Makefile.rules
 
diff -r 3d1664cc9e45 -r ad1b4634d0d0 tools/ocaml/libs/xb/Makefile
--- a/tools/ocaml/libs/xb/Makefile
+++ b/tools/ocaml/libs/xb/Makefile
@@ -36,11 +36,11 @@
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xb
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xb META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus
+       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenbus META 
$(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xb
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenbus
 
 include $(TOPLEVEL)/Makefile.rules
diff -r 3d1664cc9e45 -r ad1b4634d0d0 tools/ocaml/libs/xc/Makefile
--- a/tools/ocaml/libs/xc/Makefile
+++ b/tools/ocaml/libs/xc/Makefile
@@ -23,11 +23,11 @@
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xc
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xc META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl
+       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenctrl META 
$(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xc
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenctrl
 
 include $(TOPLEVEL)/Makefile.rules
diff -r 3d1664cc9e45 -r ad1b4634d0d0 tools/ocaml/libs/xl/Makefile
--- a/tools/ocaml/libs/xl/Makefile
+++ b/tools/ocaml/libs/xl/Makefile
@@ -56,11 +56,11 @@
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xl
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xl META 
$(INTF) $(LIBS) *.a *.so *.cmx
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight
+       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenlight META 
$(INTF) $(LIBS) *.a *.so *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xl
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenlight
 
 include $(TOPLEVEL)/Makefile.rules
diff -r 3d1664cc9e45 -r ad1b4634d0d0 tools/ocaml/libs/xs/META.in
--- a/tools/ocaml/libs/xs/META.in
+++ b/tools/ocaml/libs/xs/META.in
@@ -1,5 +1,5 @@
 version = "@VERSION@"
 description = "XenStore Interface"
-requires = "unix,xb"
+requires = "unix,xenbus"
 archive(byte) = "xs.cma"
 archive(native) = "xs.cmxa"
diff -r 3d1664cc9e45 -r ad1b4634d0d0 tools/ocaml/libs/xs/Makefile
--- a/tools/ocaml/libs/xs/Makefile
+++ b/tools/ocaml/libs/xs/Makefile
@@ -26,12 +26,12 @@
 .PHONY: install
 install: $(LIBS) META
        mkdir -p $(OCAMLDESTDIR)
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xs
-       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xs META 
$(INTF) xs.mli xst.mli xsraw.mli $(LIBS) *.a *.cmx
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore
+       ocamlfind install -destdir $(OCAMLDESTDIR) -ldconf ignore xenstore META 
$(INTF) xs.mli xst.mli xsraw.mli $(LIBS) *.a *.cmx
 
 .PHONY: uninstall
 uninstall:
-       ocamlfind remove -destdir $(OCAMLDESTDIR) xs
+       ocamlfind remove -destdir $(OCAMLDESTDIR) xenstore
 
 include $(TOPLEVEL)/Makefile.rules
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel