X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=myocamlbuild.ml;h=5ce02af533c6bb663649a58225053673b7d1042b;hp=d198faa9dea745b0d9a7ee412c289b60b40611dc;hb=ce09a30489dce8ac9e389c8c1525a34d1e02354e;hpb=f749a3e33d759fddef63a69e54ff1336411d5e16 diff --git a/myocamlbuild.ml b/myocamlbuild.ml index d198faa..5ce02af 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -26,10 +26,13 @@ let macro_flags = [ let () = dispatch begin function - | Before_rules -> - set_flags [["ocaml";"compile"]; ["ocaml";"ocamldep"] ] macro_flags; + | Before_rules -> () + | After_rules -> + set_flags [["ocaml";"compile"]; ["ocaml"; "ocamldep"] ] macro_flags; pflag [ "ocaml"; "compile" ] "warning" (fun s -> (S[ A"-w"; A s])); flag [ "ocaml"; "compile"; "debug" ] (S[ A"-g"; A"-ppopt"; A"-DDEBUG"]); + flag [ "ocaml"; "compile"; "htmltrace" ] (S[ A"-ppopt"; A"-DHTMLTRACE"]); + flag [ "ocaml"; "ocamldep"; "htmltrace" ] (S[ A"-ppopt"; A"-DHTMLTRACE"]); flag [ "ocaml"; "link"; "debug" ] (A"-g"); flag [ "ocaml"; "compile"; "profile"] (S[A"-ppopt"; A"-DPROFILE"]); flag [ "ocaml"; "compile"; "profile"; "native"] (A"-p"); @@ -37,5 +40,14 @@ let () = dispatch begin pflag [ "ocaml"; "compile"; "native" ] "inline" (fun i -> (S[ A"-inline"; A i ])); pflag [ "ocaml"; "compile" ] "unsafe" (fun s -> (if s = "true" then S[A"-ppopt";A "-unsafe"] else N)); + + rule "Java compilation" + ~prod:"%.class" + ~dep:"%.java" + begin fun env _build -> + let java = env "%.java" in + let tags = tags_of_pathname java ++ "compile" in + Cmd( S[ A"javac" ; P java; T tags ]) + end | _ -> () end