X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=build;h=75781b010f50abbc502ae0e05e13ee122ece4a7a;hp=d5eb3a558fe1345e9a71fdf47ef0488f7aebe69d;hb=e381c2bd8da5a33c0fdb1e6cfa9c1800386eafed;hpb=eb43a243ba418e6023de2fc76b129542a5a49aff

diff --git a/build b/build
index d5eb3a5..75781b0 100755
--- a/build
+++ b/build
@@ -1,9 +1,23 @@
 #!/usr/bin/env ocaml
 
-let target = ref [ "main.otarget" ]
+let read_lines f =
+  let lines = ref [] in
+  let in_f = open_in f in
+  try
+    while true do
+      let line = input_line in_f in
+      if String.length line != 0 then lines := line :: !lines
+    done;
+    []
+  with
+    End_of_file -> close_in in_f; List.rev !lines
+;;
+
+let target = ref [ ]
 let debug = ref false
 let profile = ref false
 let verbose = ref false
+let trace = ref false
 
 let dir = Sys.getcwd ()
 let project_root = Filename.dirname Sys.argv.(0)
@@ -14,23 +28,32 @@ let () =
     | "-d" -> debug := true
     | "-p" -> profile := true
     | "-v" -> verbose := true
+    | "-t" -> trace := true
     | x -> target := x :: !target
   done
-
+let otrace = if !trace then " -tag htmltrace " else ""
 let oprofile = if !profile then " -tag profile " else ""
-let odebug = if !profile then " -tag debug " else ""
-let otarget = List.fold_left (fun acc t ->
-  let t = if t = "clean" then "-clean" else t in
-  t ^ " " ^ acc) "" !target
-let overbose = if !verbose then " -classic-display " else ""
+let odebug = if !debug then " -tag debug " else ""
+let clean_first = ref false
 let () =
   Sys.chdir project_root;
   Printf.printf "Entering directory `%s'\n%!" project_root
 
-let cmd = Printf.sprintf "ocamlbuild -use-ocamlfind %s %s %s %s"
-  overbose  oprofile  odebug otarget
-let i = Sys.command cmd
+let otarget = List.fold_left (fun acc t ->
+  if t = "clean" || t = "-clean" then (clean_first := true; acc)
+  else
+    let t =
+      if Filename.check_suffix t ".otarget" then
+        String.concat " " (read_lines ((Filename.chop_suffix t ".otarget") ^ ".itarget"))
+      else t
+    in
+    t ^ " " ^ acc) "" (if (!target == []) then [ "main.otarget" ] else !target)
+let overbose = if !verbose then " -classic-display " else ""
+let clean_cmd = if !clean_first then "ocamlbuild -clean;" else ""
+let build_cmd = if otarget = "" then "" else
+    Printf.sprintf "ocamlbuild -use-ocamlfind %s %s %s %s %s"
+      overbose otrace oprofile  odebug otarget
+let i = Sys.command  (clean_cmd ^ build_cmd)
 let () = Sys.chdir dir;
   Printf.printf "Leaving directory `%s'\n%!" project_root
 let _ = exit i
-