From 9d194d48d8389826dd74a71ddf19b3c84890422b Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 18 Jun 2014 00:18:02 +0200 Subject: [PATCH] oasis files --- _tags | 12 ++++++-- myocamlbuild.ml | 5 ++-- setup.ml | 80 ++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 89 insertions(+), 8 deletions(-) diff --git a/_tags b/_tags index c48fb7c8..29ba6791 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 356c5881cb77df7fd532a71e15afb806) +# DO NOT EDIT (digest: 38b5b440371d718e4e43cec96202bee7) # Ignore VCS directories, you can use the same kind of rule outside # OASIS_START/STOP if you want to exclude directories that contains # useless stuff for the build process @@ -98,7 +98,6 @@ # Executable test_levenshtein "tests/test_levenshtein.native": package(qcheck) "tests/test_levenshtein.native": use_containers -: package(qcheck) # Executable test_lwt : package(lwt) : package(lwt.unix) @@ -126,8 +125,10 @@ : use_containers_misc # Executable run_tests "tests/run_tests.native": package(oUnit) +"tests/run_tests.native": package(qcheck) "tests/run_tests.native": use_containers : package(oUnit) +: package(qcheck) : use_containers # Executable web_pwd "examples/cgi/web_pwd.byte": package(CamlGI) @@ -138,6 +139,13 @@ : package(threads) : use_containers : use_containers_cgi +# Executable lambda +"examples/lambda.byte": package(unix) +"examples/lambda.byte": use_containers +"examples/lambda.byte": use_containers_misc +: package(unix) +: use_containers +: use_containers_misc # OASIS_STOP : thread : thread diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 89e41c2c..99b05281 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 446468e76fe674ec3de56b3e7fbf2e8b) *) +(* DO NOT EDIT (digest: 92eca59de110c4aba9cdf64e8cc0f3b5) *) module OASISGettext = struct (* # 22 "src/oasis/OASISGettext.ml" *) @@ -614,6 +614,7 @@ let package_default = ("misc", ["core"]); ("lwt", ["core"; "misc"]); ("examples/cgi", ["cgi"; "core"]); + ("examples", ["core"; "misc"]); ("cgi", ["core"]) ] } @@ -621,6 +622,6 @@ let package_default = let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;; -# 625 "myocamlbuild.ml" +# 626 "myocamlbuild.ml" (* OASIS_STOP *) Ocamlbuild_plugin.dispatch dispatch_default;; diff --git a/setup.ml b/setup.ml index 7569e351..420cb70b 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.4 *) (* OASIS_START *) -(* DO NOT EDIT (digest: a8bc1c98b357b6dec44c619b4237f5db) *) +(* DO NOT EDIT (digest: fe5bd2b07887db6c08d6cc2023ab6bcd) *) (* Regenerated by OASIS v0.4.4 Visit http://oasis.forge.ocamlcore.org for more information and @@ -6788,6 +6788,12 @@ let setup_t = run_path = "." }); ("containers_misc", + OCamlbuildDocPlugin.doc_build + { + OCamlbuildDocPlugin.extra_args = ["-use-ocamlfind"]; + run_path = "." + }); + ("containers_string", OCamlbuildDocPlugin.doc_build { OCamlbuildDocPlugin.extra_args = ["-use-ocamlfind"]; @@ -6817,6 +6823,12 @@ let setup_t = run_path = "." }); ("containers_misc", + OCamlbuildDocPlugin.doc_clean + { + OCamlbuildDocPlugin.extra_args = ["-use-ocamlfind"]; + run_path = "." + }); + ("containers_string", OCamlbuildDocPlugin.doc_clean { OCamlbuildDocPlugin.extra_args = ["-use-ocamlfind"]; @@ -7305,6 +7317,34 @@ let setup_t = doc_build_tools = [ExternalTool "ocamlbuild"; ExternalTool "ocamldoc"] }); + Doc + ({ + cs_name = "containers_string"; + cs_data = PropList.Data.create (); + cs_plugin_data = [] + }, + { + doc_type = (`Doc, "ocamlbuild", Some "0.3"); + doc_custom = + { + pre_command = [(OASISExpr.EBool true, None)]; + post_command = [(OASISExpr.EBool true, None)] + }; + doc_build = + [ + (OASISExpr.ENot (OASISExpr.EFlag "docs"), false); + (OASISExpr.EFlag "docs", true) + ]; + doc_install = [(OASISExpr.EBool true, true)]; + doc_install_dir = "$docdir"; + doc_title = "Containers_string docs"; + doc_authors = []; + doc_abstract = None; + doc_format = OtherDoc; + doc_data_files = []; + doc_build_tools = + [ExternalTool "ocamlbuild"; ExternalTool "ocamldoc"] + }); Executable ({ cs_name = "benchs"; @@ -7523,7 +7563,8 @@ let setup_t = bs_build_depends = [ InternalLibrary "containers"; - FindlibPackage ("oUnit", None) + FindlibPackage ("oUnit", None); + FindlibPackage ("qcheck", None) ]; bs_build_tools = [ExternalTool "ocamlbuild"]; bs_c_sources = []; @@ -7600,6 +7641,37 @@ let setup_t = bs_nativeopt = [(OASISExpr.EBool true, [])] }, {exec_custom = false; exec_main_is = "web_pwd.ml"}); + Executable + ({ + cs_name = "lambda"; + cs_data = PropList.Data.create (); + cs_plugin_data = [] + }, + { + bs_build = + [ + (OASISExpr.EBool true, false); + (OASISExpr.EFlag "misc", true) + ]; + bs_install = [(OASISExpr.EBool true, false)]; + bs_path = "examples/"; + bs_compiled_object = Byte; + bs_build_depends = + [ + InternalLibrary "containers"; + InternalLibrary "containers_misc" + ]; + bs_build_tools = [ExternalTool "ocamlbuild"]; + bs_c_sources = []; + bs_data_files = []; + bs_ccopt = [(OASISExpr.EBool true, [])]; + bs_cclib = [(OASISExpr.EBool true, [])]; + bs_dlllib = [(OASISExpr.EBool true, [])]; + bs_dllpath = [(OASISExpr.EBool true, [])]; + bs_byteopt = [(OASISExpr.EBool true, [])]; + bs_nativeopt = [(OASISExpr.EBool true, [])] + }, + {exec_custom = false; exec_main_is = "lambda.ml"}); SrcRepo ({ cs_name = "head"; @@ -7627,7 +7699,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.4"; - oasis_digest = Some "?<\169\199O.)\139\240\184o\194\241M4\232"; + oasis_digest = Some "\nX\138\218t6.\019\019&&J\236o\130\237"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7635,6 +7707,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7639 "setup.ml" +# 7711 "setup.ml" (* OASIS_STOP *) let () = setup ();;