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

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2011-09-29 at 22:17 +0100, Jon Ludlam wrote:
> 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.

So you do "ocamlfind xenbus" in your code but subsequently "import" xl.*
(forgive my lack of actual ocaml syntax)?

I'm happy with that if its acceptable practice in ocaml, but given it's
"just" a sed invocation away should we bite the bullet and change the
module name too?

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

The next patch removes uuid which by my count leaves just the mmap
library, any plans for that one?

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

Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

> diff -r 7998217630e2 -r c5df5f625ee2 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 7998217630e2 -r c5df5f625ee2 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 7998217630e2 -r c5df5f625ee2 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 7998217630e2 -r c5df5f625ee2 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 7998217630e2 -r c5df5f625ee2 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



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