summaryrefslogtreecommitdiff
blob: 225d081ca7f9685fc96fc2a09d684c524b667aa1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml.old	2017-10-18 09:07:03.118919785 +0200
+++ why3-for-spark-gpl-2017-src/src/gnat/gnat_config.ml	2017-10-18 09:07:45.198216939 +0200
@@ -12,10 +12,7 @@
   | Limit_Check of Gnat_expl.check
   | Limit_Line of Gnat_loc.loc
 
-let spark_prefix =
-  (Filename.dirname
-          (Filename.dirname (Filename.dirname
-          (Filename.dirname Sys.executable_name))))
+let spark_prefix = "/usr"
 
 let rec file_concat l =
   match l with
--- why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4.old	2017-10-26 22:25:55.289094778 +0200
+++ why3-for-spark-gpl-2017-src/src/coq-tactic/why3tac.ml4	2017-10-26 22:26:10.719807270 +0200
@@ -1352,7 +1352,7 @@
     let limit =
     { Call_provers.empty_limit with Call_provers.limit_time = timelimit } in
     let call = Driver.prove_task ~command ~limit drv !task in
-    wait_on_call call
+    wait_on_call (ServerCall call)
   with
     | NotFO ->
         if debug then Printexc.print_backtrace stderr; flush stderr;
@@ -1399,14 +1399,8 @@
   | StepLimitExceeded -> error "Step Limit Exceeded"
   | HighFailure -> error ("Prover failure\n" ^ res.pr_output ^ "\n")
 
-IFDEF COQ84 THEN
-
-ELSE
-
 let why3tac ?timelimit s = Proofview.V82.tactic (why3tac ?timelimit s)
 
-END
-
 end
 
 TACTIC EXTEND Why3