camlspotter avatar camlspotter committed 33ef15a Merge

merge with annot

Comments (0)

Files changed (6)

-.*\.(o|cmo|cmi|cmx|cma|cmx|cmxa|cmxs|a|so|output|3o|rej|orig|spot|spit|annot|bak)$
+.*\.(o|cm.*|a|so|output|3o|rej|orig|sp.t|annot|bak)$
 .*~$
 
 ^ocamlspot/ocamlspot$
 73079ded8dc97ba343854cf488f2264bc43e2990 ocaml-4.00.0-rc1-12755
 731b4b8013012de8e34bb9f0de16a0f510d05001 ocaml-4.00.0-12779
 a1487e7d929b5aa7086f476d6d1d31edbd55a9ce ocaml-4.00.1-12983
+72a6ec86f9a499184150a50951315eb6d14dcc38 annot-4.00.1-12983
+=====================
+OCaml annot patch
+=====================
+
+This small modification to OCaml compiler introduces OCAML_ANNOT environment variable which enables annotation file creation by default without the compiler switch -annot and -bin-annot.
+
+For example::
+
+   OCAML_ANNOT=1 ocamlc hello.ml
+
+creates hello.annot and hello.cmt even without -annot or -bin-annot.
+
+
-4.00.1+camlp4-lexer-plug
+4.00.1+camlp4-lexer-plug+annot+p4-expand-directory
 
 # The version string is the first line of this file.
 # It must be in the format described in stdlib/sys.mli
 
 let main () =
   try
+    (* OCAML_ANNOT env variable to turn on -annot by default *)
+    (try ignore (Sys.getenv "OCAML_ANNOT"); 
+         Clflags.annotations := true;
+         Clflags.binary_annotations := true;
+    with Not_found -> ()); 
     Arg.parse Options.list anonymous usage;
     if
       List.length (List.filter (fun x -> !x)

driver/optmain.ml

   native_code := true;
   let ppf = Format.err_formatter in
   try
+    (* OCAML_ANNOT env variable to turn on -annot by default *)
+    (try ignore (Sys.getenv "OCAML_ANNOT"); 
+         Clflags.annotations := true;
+         Clflags.binary_annotations := true;
+    with Not_found -> ()); 
     Arg.parse (Arch.command_line_options @ Options.list) anonymous usage;
     if
       List.length (List.filter (fun x -> !x)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.