Skip to content

Commit

Permalink
Add RPC client to use with rpc-light
Browse files Browse the repository at this point in the history
The RPC client is placed next to the original XMLRPC client and does not replace it. It can, however, already be used by xapi's helper daemons.

This patch was originally written by Thomas Gazagnaire <thomas@gazagnaire.org>.

Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
  • Loading branch information
robhoes authored and matthiasgoergens committed Jan 31, 2011
1 parent bb1d647 commit 0eb627f
Show file tree
Hide file tree
Showing 6 changed files with 501 additions and 4 deletions.
5 changes: 4 additions & 1 deletion OMakeroot
Expand Up @@ -91,10 +91,13 @@ OCamlDoc(name, modules, type) =


OCamlDocProgram(name, modules) = OCamlDocProgram(name, modules) =
OCamlDoc($(name), $(modules), "program") OCamlDoc($(name), $(modules), "program")

OCamlDocLibrary(name, modules) = OCamlDocLibrary(name, modules) =
OCamlDoc($(name), $(modules), "library") OCamlDoc($(name), $(modules), "library")


OCamlDocPackage(name, modules) =
OCamlDoc($(name), $(modules), "package")

# #
# Use Camlp4 # Use Camlp4
# #
Expand Down
2 changes: 1 addition & 1 deletion ocaml/idl/ocaml_backend/META.in
@@ -1,5 +1,5 @@
version = "@VERSION@" version = "@VERSION@"
description = "XenAPI client bindings for OCaml" description = "XenAPI client bindings for OCaml"
requires = "xml-light2,stdext,stunnel,http-svr,log" requires = "rpc-light,xml-light2,stdext,stunnel,http-svr,log"
archive(byte) = "xapi_client.cma" archive(byte) = "xapi_client.cma"
archive(native) = "xapi_client.cmxa" archive(native) = "xapi_client.cmxa"
4 changes: 3 additions & 1 deletion ocaml/idl/ocaml_backend/OMakefile
Expand Up @@ -54,7 +54,7 @@ COMMON_OBJS = ref \
../datamodel_types xMLRPC event_types \ ../datamodel_types xMLRPC event_types \
../api_errors ../api_messages ../../xapi/xapi_globs \ ../api_errors ../api_messages ../../xapi/xapi_globs \
../constants ../constants
CLIENT_OBJS = xmlrpcclient $(AUTOGEN_DIR)/aPI $(AUTOGEN_DIR)/client event_helper CLIENT_OBJS = xmlrpcclient rpc_client $(AUTOGEN_DIR)/aPI $(AUTOGEN_DIR)/client event_helper
SERVER_OBJS = ../../database/escaping locking_helpers \ SERVER_OBJS = ../../database/escaping locking_helpers \
$(AUTOGEN_DIR)/server \ $(AUTOGEN_DIR)/server \
$(AUTOGEN_DIR)/db_actions $(AUTOGEN_DIR)/custom_actions \ $(AUTOGEN_DIR)/db_actions $(AUTOGEN_DIR)/custom_actions \
Expand Down Expand Up @@ -111,6 +111,7 @@ XAPI_CLIENT_OBJS = \
../../util/util_globs_inventory \ ../../util/util_globs_inventory \
../../util/util_inventory \ ../../util/util_inventory \
../../util/version \ ../../util/version \
../../xapi/xapi_inventory \
$(COMMON_OBJS) \ $(COMMON_OBJS) \
$(CLIENT_OBJS) $(CLIENT_OBJS)


Expand All @@ -129,6 +130,7 @@ OCAMLPACKS=$(_OCAMLPACKS)
OCamlDocLibrary(common, $(COMMON_OBJS)) OCamlDocLibrary(common, $(COMMON_OBJS))
OCamlDocLibrary(client, $(CLIENT_OBJS)) OCamlDocLibrary(client, $(CLIENT_OBJS))
OCamlDocLibrary(server, $(SERVER_OBJS)) OCamlDocLibrary(server, $(SERVER_OBJS))
OCamlDocPackage(xapi-client, $(XAPI_CLIENT_OBJS))


.PHONY: clean .PHONY: clean
clean: clean:
Expand Down

0 comments on commit 0eb627f

Please sign in to comment.