Enable native code compilation when ocamlopt is available.

[whenjobs.git] / tools / whenjobs.ml

diff --git a/tools/whenjobs.ml b/tools/whenjobs.ml
index 1334aec..a9ae7b7 100644 (file)
--- a/tools/whenjobs.ml
+++ b/tools/whenjobs.ml
@@ -307,26 +307,48 @@ and list_file () =
   close_in chan
 
 and upload_file () =
-  (* Recompile the jobs file. *)
-  let file = get_jobs_filename () in
-  let cmo_file = sprintf "%s/jobs.cmo" jobsdir in
-  let cmd = sprintf "ocamlfind ocamlc -I +camlp4 -I %s -package unix,camlp4.lib -pp 'camlp4o %s/pa_when.cmo' -c %s -o %s"
-    !libdir !libdir file cmo_file in
-  if Sys.command cmd <> 0 then (
-    eprintf "whenjobs: could not compile jobs script, see earlier error messages\n";
-    eprintf "compile command was:\n%s\n" cmd;
-    exit 1
-  );
+  (* Recompile the jobs file(s). *)
+  let files = get_multijobs_filenames () in
+  List.iter (
+    fun file ->
+      let cmd =
+        if not Config.have_ocamlopt then
+          (* bytecode *)
+          sprintf "%s c -I +camlp4 -I %s -package unix,camlp4.lib -pp 'camlp4o %s/pa_when.cmo' -c %s"
+            Config.ocamlfind !libdir !libdir file
+        else (
+          (* native code *)
+          let base = Filename.chop_extension file in (* without .ml suffix *)
+          sprintf "%s opt -I +camlp4 -I %s -package unix,camlp4.lib -pp 'camlp4o %s/pa_when.cmo' -c %s &&\n%s opt -shared -linkall %s.cmx -o %s.cmxs"
+            Config.ocamlfind !libdir !libdir file
+            Config.ocamlfind base base
+        ) in
+      if Sys.command cmd <> 0 then (
+        eprintf "whenjobs: %s: could not compile jobs script, see earlier errors\n"
+          file;
+        eprintf "compile command was:\n%s\n" cmd;
+        exit 1
+      )
+  ) files;
 
-  (* Test-load the jobs file to ensure it makes sense. *)
+  let suffix = if not Dynlink.is_native then "cmo" else "cmxs" in
+
+  let compiled_files = List.map (
+    fun file ->
+      let n = String.length file in
+      if n < 4 then assert false;
+      sprintf "%s.%s" (String.sub file 0 (n-3)) suffix
+  ) files in
+
+  (* Test-load the jobs files to ensure they make sense. *)
   Whenfile.init Whenstate.empty;
   (try
-     Dynlink.loadfile cmo_file
+     List.iter Dynlink.loadfile compiled_files
    with
      Dynlink.Error err ->
-       eprintf "whenjobs: %s\n" (Dynlink.error_message err);
-       (* Since it failed, unlink it. *)
-       (try unlink cmo_file with Unix_error _ -> ());
+       eprintf "whenjobs: dynlink: %s\n" (Dynlink.error_message err);
+       (* Since it failed, unlink the compiled files. *)
+       List.iter (fun f -> try unlink f with Unix_error _ -> ()) compiled_files;
        exit 1
   );
 
@@ -555,6 +577,13 @@ and suggest_check_server_logs () =
 and get_jobs_filename () =
   sprintf "%s/jobs.ml" jobsdir
 
+and get_multijobs_filenames () =
+  (* Get dir/*.ml *)
+  let files = Array.to_list (Sys.readdir jobsdir) in
+  let files = List.filter (fun file -> string_endswith file ".ml") files in
+  let files = List.map (fun file -> jobsdir // file) files in
+  List.sort compare files
+
 and create_tutorial file =
   let chan = open_out file in
   output_string chan Tutorial.tutorial;