X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fmain.ml;h=7e1c2f0e8b8366783d48e8d6c5addf8fa9ae5cad;hb=156de1e0df4aace1a42957491118cc2174d70c6a;hp=9890dbaa08a35bfe1b08dd1cb861e51cf5fa9827;hpb=ec7d2c76a7ae7447866522103b18107f154083cb;p=goals.git

diff --git a/src/main.ml b/src/main.ml
index 9890dba..7e1c2f0 100644
--- a/src/main.ml
+++ b/src/main.ml
@@ -33,6 +33,19 @@ let main () =
   (* Change directory (-C option). *)
   Sys.chdir (Cmdline.directory ());
 
+  (* Create a temporary directory which is always cleaned up at exit. *)
+  let tmpdir =
+    let temp_dir = try Unix.getenv "TMPDIR" with Not_found -> "/var/tmp" in
+    let t = Filename.temp_file ~temp_dir "goals" ".d" in
+    Unix.unlink t;
+    Unix.mkdir t 0o700;
+    at_exit (
+      fun () ->
+        let cmd = sprintf "rm -rf %s" (Filename.quote t) in
+        ignore (Sys.command cmd)
+    );
+    t in
+
   (* Create the initial environment, containing the system environment
    * and a few other standard strings.
    *)
@@ -43,6 +56,8 @@ let main () =
         Ast.Env.add k (Ast.EConstant (Ast.noloc, Ast.CString v)) env
     ) Ast.Env.empty (Unix.environment ()) in
   let env =
+    Ast.Env.add "tmpdir" (Ast.EConstant (Ast.noloc, Ast.CString tmpdir)) env in
+  let env =
     Ast.Env.add "stdlib"
       (Ast.EConstant (Ast.noloc, Ast.CString Cmdline.stdlibdir))
       env in
@@ -77,13 +92,20 @@ let main () =
   if Cmdline.debug_flag () then
     Ast.print_env stderr env;
 
-  (* Run the target expressions. *)
-  Run.run_targets_to_completion env targets
+  (* Construct the dependency DAG with the root(s) being the targets. *)
+  let dag = Deps.create env targets in
+
+  (* Run the jobs. *)
+  let state = Deps.new_state dag Run.goal_runner Run.exists_runner in
+  let next_job () = Deps.next_job state in
+  let retire_job job = Deps.retire_job state job in
+  let fail_job job = Deps.fail_job state job in
+  let string_of_job job = Deps.string_of_job job in
+  Jobs.run next_job retire_job fail_job string_of_job
 
 let () =
   try main ()
   with
   | Failure msg | Sys_error msg ->
-     Run.stop_all ();
      prerr_endline ("*** error: " ^ msg);
      exit 1