# HG changeset patch
# User haftmann
# Date 1283153282 -7200
# Node ID 9070a7c356c96c4ebebb75f8e11d163679edb435
# Parent  2795499a20bdb02080c48c2e1da6e27b52810b1b
code checking: compiler invocation happens in same directory as generated file -- avoid problem with different path representations on cygwin

diff -r 2795499a20bd -r 9070a7c356c9 src/Tools/Code/code_haskell.ML
--- a/src/Tools/Code/code_haskell.ML	Mon Aug 30 15:52:09 2010 +0900
+++ b/src/Tools/Code/code_haskell.ML	Mon Aug 30 09:28:02 2010 +0200
@@ -483,7 +483,7 @@
   Code_Target.add_target
     (target, { serializer = isar_serializer, literals = literals,
       check = { env_var = "EXEC_GHC", make_destination = I,
-        make_command = fn ghc => fn p => fn module_name =>
+        make_command = fn ghc => fn module_name =>
           ghc ^ " -fglasgow-exts -odir build -hidir build -stubdir build -e \"\" " ^ module_name ^ ".hs" } })
   #> Code_Target.add_syntax_tyco target "fun" (SOME (2, fn print_typ => fn fxy => fn [ty1, ty2] =>
       brackify_infix (1, R) fxy (
diff -r 2795499a20bd -r 9070a7c356c9 src/Tools/Code/code_ml.ML
--- a/src/Tools/Code/code_ml.ML	Mon Aug 30 15:52:09 2010 +0900
+++ b/src/Tools/Code/code_ml.ML	Mon Aug 30 09:28:02 2010 +0200
@@ -966,11 +966,11 @@
   Code_Target.add_target
     (target_SML, { serializer = isar_serializer_sml, literals = literals_sml,
       check = { env_var = "ISABELLE_PROCESS", make_destination = fn p => Path.append p (Path.explode "ROOT.ML"),
-        make_command = fn isabelle => fn p => fn _ => isabelle ^ " -r -q -u Pure" } })
+        make_command = fn isabelle => fn _ => isabelle ^ " -r -q -u Pure" } })
   #> Code_Target.add_target
     (target_OCaml, { serializer = isar_serializer_ocaml, literals = literals_ocaml,
       check = { env_var = "EXEC_OCAML", make_destination = fn p => Path.append p (Path.explode "ROOT.ocaml"),
-        make_command = fn ocaml => fn p => fn _ => ocaml ^ " -w pu nums.cma " ^ File.shell_path p } })
+        make_command = fn ocaml => fn _ => ocaml ^ " -w pu nums.cma ROOT.ocaml" } })
   #> Code_Target.add_syntax_tyco target_SML "fun" (SOME (2, fn print_typ => fn fxy => fn [ty1, ty2] =>
       brackify_infix (1, R) fxy (
         print_typ (INFX (1, X)) ty1,
diff -r 2795499a20bd -r 9070a7c356c9 src/Tools/Code/code_scala.ML
--- a/src/Tools/Code/code_scala.ML	Mon Aug 30 15:52:09 2010 +0900
+++ b/src/Tools/Code/code_scala.ML	Mon Aug 30 09:28:02 2010 +0200
@@ -521,9 +521,9 @@
   Code_Target.add_target
     (target, { serializer = isar_serializer, literals = literals,
       check = { env_var = "SCALA_HOME", make_destination = fn p => Path.append p (Path.explode "ROOT.scala"),
-        make_command = fn scala_home => fn p => fn _ =>
+        make_command = fn scala_home => fn _ =>
           "export JAVA_OPTS='-Xms128m -Xmx512m -Xss2m' && "
-            ^ Path.implode (Path.append (Path.explode scala_home) (Path.explode "bin/scalac")) ^ " " ^ File.shell_path p } })
+            ^ Path.implode (Path.append (Path.explode scala_home) (Path.explode "bin/scalac")) ^ " ROOT.scala" } })
   #> Code_Target.add_syntax_tyco target "fun"
      (SOME (2, fn print_typ => fn fxy => fn [ty1, ty2] =>
         brackify_infix (1, R) fxy (
diff -r 2795499a20bd -r 9070a7c356c9 src/Tools/Code/code_target.ML
--- a/src/Tools/Code/code_target.ML	Mon Aug 30 15:52:09 2010 +0900
+++ b/src/Tools/Code/code_target.ML	Mon Aug 30 09:28:02 2010 +0200
@@ -13,7 +13,7 @@
   type literals = Code_Printer.literals
   val add_target: string * { serializer: serializer, literals: literals,
     check: { env_var: string, make_destination: Path.T -> Path.T,
-      make_command: string -> Path.T -> string -> string } } -> theory -> theory
+      make_command: string -> string -> string } } -> theory -> theory
   val extend_target: string *
       (string * (Code_Thingol.naming -> Code_Thingol.program -> Code_Thingol.program))
     -> theory -> theory
@@ -116,7 +116,7 @@
 
 datatype description = Fundamental of { serializer: serializer, literals: Code_Printer.literals,
       check: { env_var: string, make_destination: Path.T -> Path.T,
-        make_command: string -> Path.T -> string -> string } }
+        make_command: string -> string -> string } }
   | Extension of string * (Code_Thingol.naming -> Code_Thingol.program -> Code_Thingol.program);
 
 datatype target = Target of {
@@ -336,7 +336,7 @@
         val destination = make_destination p;
         val _ = file destination (serialize thy target (SOME 80)
           (SOME module_name) args naming program names_cs);
-        val cmd = make_command env_param destination module_name;
+        val cmd = make_command env_param module_name;
       in if bash ("cd " ^ File.shell_path p ^ " && " ^ cmd ^ " 2>&1") <> 0
         then error ("Code check failed for " ^ target ^ ": " ^ cmd)
         else ()