Adding META

Change-Id: I7c084603c8c709767e6f50c5642419418d603592

Author: okahn

META

@@ -0,0 +1,12 @@
+# OASIS_START
+# DO NOT EDIT (digest: 043d7edb52f5d422d6ff26da03c2bdef)
+version = "0.1"
+description = "BAP Trace Format"
+requires = "core_kernel piqirun.pb piqirun.ext piqilib"
+archive(byte) = "bap-traces.cma"
+archive(byte, plugin) = "bap-traces.cma"
+archive(native) = "bap-traces.cmxa"
+archive(native, plugin) = "bap-traces.cmxs"
+exists_if = "bap-traces.cma"
+# OASIS_STOP
+

myocamlbuild.ml

@@ -1,7 +1,7 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: b9c71e7d1ddd2a4412821af705169ba7) *)
+(* DO NOT EDIT (digest: fb39601598e0c8e6f4698a5182f16985) *)
 module OASISGettext = struct
-# 22 "/home/maurer/Sources/live/oasis/src/oasis/OASISGettext.ml"
+  (* # 22 "src/oasis/OASISGettext.ml" *)
 
 
   let ns_ str =
@@ -30,7 +30,7 @@ module OASISGettext = struct
 end
 
 module OASISExpr = struct
-# 22 "/home/maurer/Sources/live/oasis/src/oasis/OASISExpr.ml"
+  (* # 22 "src/oasis/OASISExpr.ml" *)
 
 
 
@@ -39,10 +39,10 @@ module OASISExpr = struct
   open OASISGettext
 
 
-  type test = string 
+  type test = string
 
 
-  type flag = string 
+  type flag = string
 
 
   type t =
@@ -55,7 +55,7 @@ module OASISExpr = struct
 
 
 
-  type 'a choices = (t * 'a) list 
+  type 'a choices = (t * 'a) list
 
 
   let eval var_get t =
@@ -131,7 +131,7 @@ end
 
 # 132 "myocamlbuild.ml"
 module BaseEnvLight = struct
-# 22 "/home/maurer/Sources/live/oasis/src/base/BaseEnvLight.ml"
+  (* # 22 "src/base/BaseEnvLight.ml" *)
 
 
   module MapString = Map.Make(String)
@@ -236,7 +236,7 @@ end
 
 # 237 "myocamlbuild.ml"
 module MyOCamlbuildFindlib = struct
-# 22 "/home/maurer/Sources/live/oasis/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
+  (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml" *)
 
 
   (** OCamlbuild extension, copied from
@@ -249,9 +249,6 @@ module MyOCamlbuildFindlib = struct
   *)
   open Ocamlbuild_plugin
 
-  type conf =
-    { no_automatic_syntax: bool;
-    }
 
   (* these functions are not really officially exported *)
   let run_and_read =
@@ -341,7 +338,7 @@ module MyOCamlbuildFindlib = struct
   ]
 
 
-  let dispatch conf =
+  let dispatch =
     function
     | After_options ->
       (* By using Before_options one let command line options have an higher
@@ -360,39 +357,31 @@ module MyOCamlbuildFindlib = struct
        * -linkpkg *)
       flag ["ocaml"; "link"; "program"] & A"-linkpkg";
 
-      if not (conf.no_automatic_syntax) then begin
-        (* For each ocamlfind package one inject the -package option when
-         * compiling, computing dependencies, generating documentation and
-         * linking. *)
-        List.iter
-          begin fun pkg ->
-            let base_args = [A"-package"; A pkg] in
-            (* TODO: consider how to really choose camlp4o or camlp4r. *)
-            let syn_args = [A"-syntax"; A "camlp4o"] in
-            let (args, pargs) =
-              (* Heuristic to identify syntax extensions: whether they end in
-                 ".syntax"; some might not.
-              *)
-              if Filename.check_suffix pkg "syntax" ||
-                 List.mem pkg well_known_syntax then
-                (syn_args @ base_args, syn_args)
-              else
-                (base_args, [])
-            in
-            flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
-            flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
-            flag ["ocaml"; "doc";      "pkg_"^pkg] & S args;
-            flag ["ocaml"; "link";     "pkg_"^pkg] & S base_args;
-            flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
-
-            (* TODO: Check if this is allowed for OCaml < 3.12.1 *)
-            flag ["ocaml"; "compile";  "package("^pkg^")"] & S pargs;
-            flag ["ocaml"; "ocamldep"; "package("^pkg^")"] & S pargs;
-            flag ["ocaml"; "doc";      "package("^pkg^")"] & S pargs;
-            flag ["ocaml"; "infer_interface"; "package("^pkg^")"] & S pargs;
-          end
-          (find_packages ());
-      end;
+      (* For each ocamlfind package one inject the -package option when
+       * compiling, computing dependencies, generating documentation and
+       * linking. *)
+      List.iter
+        begin fun pkg ->
+          let base_args = [A"-package"; A pkg] in
+          (* TODO: consider how to really choose camlp4o or camlp4r. *)
+          let syn_args = [A"-syntax"; A "camlp4o"] in
+          let args =
+            (* Heuristic to identify syntax extensions: whether they end in
+               ".syntax"; some might not.
+            *)
+            if Filename.check_suffix pkg "syntax" ||
+               List.mem pkg well_known_syntax then
+              syn_args @ base_args
+            else
+              base_args
+          in
+          flag ["ocaml"; "compile";  "pkg_"^pkg] & S args;
+          flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S args;
+          flag ["ocaml"; "doc";      "pkg_"^pkg] & S args;
+          flag ["ocaml"; "link";     "pkg_"^pkg] & S base_args;
+          flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S args;
+        end
+        (find_packages ());
 
       (* Like -package but for extensions syntax. Morover -syntax is useless
        * when linking. *)
@@ -426,7 +415,7 @@ module MyOCamlbuildFindlib = struct
 end
 
 module MyOCamlbuildBase = struct
-# 22 "/home/maurer/Sources/live/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+  (* # 22 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
 
   (** Base functions for writing myocamlbuild.ml
@@ -441,13 +430,13 @@ module MyOCamlbuildBase = struct
   module OC = Ocamlbuild_pack.Ocaml_compiler
 
 
-  type dir = string 
-  type file = string 
-  type name = string 
-  type tag = string 
+  type dir = string
+  type file = string
+  type name = string
+  type tag = string
 
 
-# 62 "/home/maurer/Sources/live/oasis/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+  (* # 62 "src/plugins/ocamlbuild/MyOCamlbuildBase.ml" *)
 
 
   type t =
@@ -459,7 +448,7 @@ module MyOCamlbuildBase = struct
        * directory.
       *)
       includes:  (dir * dir list) list;
-    } 
+    }
 
 
   let env_filename =
@@ -557,12 +546,11 @@ module MyOCamlbuildBase = struct
 
            (* When ocaml link something that use the C library, then one
               need that file to be up to date.
-              This holds both for programs and for libraries.
            *)
-           dep ["link"; "ocaml"; tag_libstubs lib]
+           dep ["link"; "ocaml"; "program"; tag_libstubs lib]
              [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
 
-           dep  ["compile"; "ocaml"; tag_libstubs lib]
+           dep  ["compile"; "ocaml"; "program"; tag_libstubs lib]
              [dir/"lib"^(nm_libstubs lib)^"."^(!Options.ext_lib)];
 
            (* TODO: be more specific about what depends on headers *)
@@ -592,18 +580,18 @@ module MyOCamlbuildBase = struct
       ()
 
 
-  let dispatch_default conf t =
+  let dispatch_default t =
     dispatch_combine
       [
         dispatch t;
-        MyOCamlbuildFindlib.dispatch conf;
+        MyOCamlbuildFindlib.dispatch;
       ]
 
 
 end
 
 
-# 606 "myocamlbuild.ml"
+# 594 "myocamlbuild.ml"
 open Ocamlbuild_plugin;;
 let package_default =
   {
@@ -614,11 +602,9 @@ let package_default =
   }
 ;;
 
-let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false}
-
-let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;;
+let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
 
-# 622 "myocamlbuild.ml"
+# 608 "myocamlbuild.ml"
 (* OASIS_STOP *)
 (*
 let dispatch_local e =