Merge pull request xapi-project#37 from jonludlam/xenguestbin_flag

Conditionally build xenguest.

Author: djs55

Makefile

@@ -22,7 +22,7 @@ setup.bin: setup.ml
 	@rm -f setup.cmx setup.cmi setup.o setup.cmo
 
 setup.data: setup.bin
-	@./setup.bin -configure $(ENABLE_XEN) $(ENABLE_XENLIGHT) $(ENABLE_LIBVIRT)
+	@./setup.bin -configure $(ENABLE_XEN) $(ENABLE_XENLIGHT) $(ENABLE_LIBVIRT) $(ENABLE_XENGUESTBIN)
 
 build: setup.data setup.bin
 	@./setup.bin -build -j $(J)

_oasis

@@ -23,6 +23,10 @@ Flag simulator
   Description:        Build server with simulator support
   Default:            true
 
+Flag xenguestbin
+  Description:        Build the xenguest binary
+  Default:            true
+
 Library xenopsd
   CompiledObject:     best
   Path:               lib
@@ -34,7 +38,7 @@ Executable xenguest
   CompiledObject:     best
   Path:               xenguest
   MainIs:             xenguest_main.ml
-  Build$:             flag(xen)
+  Build$:             flag(xen) && flag(xenguestbin)
   Custom:             true
   Install:            false
   BuildDepends:       xenctrl, unix

configure.ml

@@ -41,17 +41,34 @@ let find_ocamlfind verbose name =
   if verbose then Printf.fprintf stderr "querying for ocamlfind package %s: %s" name (if found then "ok" else "missing");
   found
 
-
 let output_file filename lines =
   let oc = open_out filename in
   let lines = List.map (fun line -> line ^ "\n") lines in
   List.iter (output_string oc) lines;
   close_out oc
 
+let find_ml_val verbose name libs =
+  let ml_program = [
+    Printf.sprintf "let f = %s" name;
+  ] in
+  let basename = Filename.temp_file "looking_for_val" "" in
+  let ml_file = basename ^ ".ml" in
+  let cmo_file = basename ^ ".cmo" in
+  let cmi_file = basename ^ ".cmi" in
+  output_file ml_file ml_program;
+  let found = Sys.command (Printf.sprintf "ocamlfind ocamlc -package %s -c %s %s" (String.concat "," libs) ml_file (if verbose then "" else "2>/dev/null")) = 0 in
+  if Sys.file_exists ml_file then Sys.remove ml_file;
+  if Sys.file_exists cmo_file then Sys.remove cmo_file;
+  if Sys.file_exists cmi_file then Sys.remove cmi_file;
+  Printf.printf "Looking for %s: %s\n" name (if found then "ok" else "missing");
+  found
+
 let configure bindir sbindir libexecdir scriptsdir etcdir =
   let xenctrl = find_ocamlfind false "xenctrl" in
   let xenlight = find_ocamlfind false "xenlight" in
   let libvirt = find_ocamlfind false "libvirt" in
+  let xenguest = find_ml_val true "Xenguest.init" ["xenctrl"] in
+
   Printf.printf "Configuring with:\n\tbindir=%s\n\tsbindir=%s\n\tlibexecdir=%s\n\tscriptsdir=%s\n\tetcdir=%s\n\txenctrl=%b\n\txenlight=%b\n\tlibvirt=%b\n\n" bindir sbindir libexecdir scriptsdir etcdir xenctrl xenlight libvirt;
 
   (* Write config.mk *)
@@ -66,6 +83,7 @@ let configure bindir sbindir libexecdir scriptsdir etcdir =
       Printf.sprintf "ENABLE_XEN=--%s-xen" (if xenctrl then "enable" else "disable");
       Printf.sprintf "ENABLE_XENLIGHT=--%s-xenlight" (if xenlight then "enable" else "disable");
       Printf.sprintf "ENABLE_LIBVIRT=--%s-libvirt" (if libvirt then "enable" else "disable");
+      Printf.sprintf "ENABLE_XENGUESTBIN=--%s-xenguestbin" (if xenguest then "enable" else "disable");
     ] in
   output_file config_mk lines
 

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: d2f67611ff247d68337005d5da1d7e50) *)
+(* DO NOT EDIT (digest: 2db37ae3212d2989c6c4ff0d5f3011da) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5674,6 +5674,16 @@ let setup_t =
                         Some "Build server with simulator support";
                       flag_default = [(OASISExpr.EBool true, true)];
                       });
+               Flag
+                 ({
+                     cs_name = "xenguestbin";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      flag_description = Some "Build the xenguest binary";
+                      flag_default = [(OASISExpr.EBool true, true)];
+                      });
                Library
                  ({
                      cs_name = "xenopsd";
@@ -5753,7 +5763,10 @@ let setup_t =
                       bs_build =
                         [
                            (OASISExpr.EBool true, false);
-                           (OASISExpr.EFlag "xen", true)
+                           (OASISExpr.EAnd
+                              (OASISExpr.EFlag "xen",
+                                OASISExpr.EFlag "xenguestbin"),
+                             true)
                         ];
                       bs_install = [(OASISExpr.EBool true, false)];
                       bs_path = "xenguest";
@@ -5941,14 +5954,14 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\1820\199gQ\20568}\206Q\188(\017\004\021";
+     oasis_digest = Some "t9|\020R>E\230\153\146\1555-C/9";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
      };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 5953 "setup.ml"
+# 5966 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;