From a3cfdacc78ff70d26697e13b4280d2f788c09219 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 30 Sep 2014 17:12:59 +0200 Subject: [PATCH] oasis files --- _tags | 19 ++++++++----- containers.odocl | 6 ++--- containers_misc.odocl | 3 +-- core/META | 13 ++++++++- core/containers.mldylib | 6 ++--- core/containers.mllib | 6 ++--- misc/containers_misc.mlpack | 3 +-- myocamlbuild.ml | 8 +++--- setup.ml | 53 +++++++++++++++++++++++++++---------- 9 files changed, 76 insertions(+), 41 deletions(-) diff --git a/_tags b/_tags index 352637f0..feece5c6 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 4eaa31a9f64d59d82a736ef275c18061) +# DO NOT EDIT (digest: 126bedd0d6759f38e9b7190eebb08140) # 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 @@ -19,6 +19,12 @@ "string/containers_string.cmxs": use_containers_string "string/KMP.cmx": for-pack(Containers_string) "string/levenshtein.cmx": for-pack(Containers_string) +# Library containers_advanced +"advanced/containers_advanced.cmxs": use_containers_advanced +"advanced/CCLinq.cmx": for-pack(Containers_advanced) +"advanced/CCBatch.cmx": for-pack(Containers_advanced) +"advanced/CCCat.cmx": for-pack(Containers_advanced) +: use_containers # Library containers_pervasives "pervasives/containers_pervasives.cmxs": use_containers_pervasives : use_containers @@ -39,7 +45,6 @@ "misc/bij.cmx": for-pack(Containers_misc) "misc/piCalculus.cmx": for-pack(Containers_misc) "misc/bencode.cmx": for-pack(Containers_misc) -"misc/sexp.cmx": for-pack(Containers_misc) "misc/RAL.cmx": for-pack(Containers_misc) "misc/unionFind.cmx": for-pack(Containers_misc) "misc/smallSet.cmx": for-pack(Containers_misc) @@ -85,9 +90,11 @@ "benchs/benchs.native": package(bench) "benchs/benchs.native": package(unix) "benchs/benchs.native": use_containers +"benchs/benchs.native": use_containers_advanced "benchs/benchs.native": use_containers_misc "benchs/benchs.native": use_containers_string : package(bench) +: use_containers_advanced : use_containers_string # Executable bench_conv "benchs/bench_conv.native": package(benchmark) @@ -157,13 +164,11 @@ "examples/lambda.byte": package(unix) "examples/lambda.byte": use_containers "examples/lambda.byte": use_containers_misc -# Executable id_sexp -"examples/id_sexp.native": package(unix) -"examples/id_sexp.native": use_containers -"examples/id_sexp.native": use_containers_misc : package(unix) -: use_containers : use_containers_misc +# Executable id_sexp +"examples/id_sexp.native": use_containers +: use_containers # OASIS_STOP : thread : thread diff --git a/containers.odocl b/containers.odocl index a5906cef..81171d2c 100644 --- a/containers.odocl +++ b/containers.odocl @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: a6bb53268d7bad1acff03396fa05033b) +# DO NOT EDIT (digest: f2008fc227a68cb26812ab37438e52a8) core/CCVector core/CCDeque core/CCGen @@ -17,21 +17,19 @@ core/CCOpt core/CCPair core/CCFun core/CCHash -core/CCCat core/CCKList core/CCInt core/CCBool core/CCArray -core/CCBatch core/CCOrd core/CCIO core/CCRandom -core/CCLinq core/CCKTree core/CCTrie core/CCString core/CCHashtbl core/CCFlatHashtbl +core/CCSexp string/KMP string/Levenshtein # OASIS_STOP diff --git a/containers_misc.odocl b/containers_misc.odocl index 66a9e568..8cf768fc 100644 --- a/containers_misc.odocl +++ b/containers_misc.odocl @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 1de551686e91870f31fc6db16438e2c0) +# DO NOT EDIT (digest: 5c08a0bf51a82d21179a12753e47acff) misc/Cache misc/FHashtbl misc/FlatHashtbl @@ -15,7 +15,6 @@ misc/Univ misc/Bij misc/PiCalculus misc/Bencode -misc/Sexp misc/RAL misc/UnionFind misc/SmallSet diff --git a/core/META b/core/META index e74efcb5..4d9de432 100644 --- a/core/META +++ b/core/META @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 176a952c03cc29ec8fbecdbfa8ef56f0) +# DO NOT EDIT (digest: 9ea9a3fbcbba3c5c19725ea1fd444cc8) version = "0.3.4" description = "A modular standard library focused on data structures." archive(byte) = "containers.cma" @@ -71,5 +71,16 @@ package "cgi" ( archive(native, plugin) = "containers_cgi.cmxs" exists_if = "containers_cgi.cma" ) + +package "advanced" ( + version = "0.3.4" + description = "A modular standard library focused on data structures." + requires = "containers" + archive(byte) = "containers_advanced.cma" + archive(byte, plugin) = "containers_advanced.cma" + archive(native) = "containers_advanced.cmxa" + archive(native, plugin) = "containers_advanced.cmxs" + exists_if = "containers_advanced.cma" +) # OASIS_STOP diff --git a/core/containers.mldylib b/core/containers.mldylib index 97c2b9fc..fec393c6 100644 --- a/core/containers.mldylib +++ b/core/containers.mldylib @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: bc148b0cd76b42738441881becfb4513) +# DO NOT EDIT (digest: f5cc3719f4c5e3e210a649e32f08ebde) CCVector CCDeque CCGen @@ -17,19 +17,17 @@ CCOpt CCPair CCFun CCHash -CCCat CCKList CCInt CCBool CCArray -CCBatch CCOrd CCIO CCRandom -CCLinq CCKTree CCTrie CCString CCHashtbl CCFlatHashtbl +CCSexp # OASIS_STOP diff --git a/core/containers.mllib b/core/containers.mllib index 97c2b9fc..fec393c6 100644 --- a/core/containers.mllib +++ b/core/containers.mllib @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: bc148b0cd76b42738441881becfb4513) +# DO NOT EDIT (digest: f5cc3719f4c5e3e210a649e32f08ebde) CCVector CCDeque CCGen @@ -17,19 +17,17 @@ CCOpt CCPair CCFun CCHash -CCCat CCKList CCInt CCBool CCArray -CCBatch CCOrd CCIO CCRandom -CCLinq CCKTree CCTrie CCString CCHashtbl CCFlatHashtbl +CCSexp # OASIS_STOP diff --git a/misc/containers_misc.mlpack b/misc/containers_misc.mlpack index ca83449f..e41e186c 100644 --- a/misc/containers_misc.mlpack +++ b/misc/containers_misc.mlpack @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 3b9f2ec4fc5d13ba4a9f0ac8f4d61ce6) +# DO NOT EDIT (digest: 9851db0fe3105f1a9f67c941d62c467a) Cache FHashtbl FlatHashtbl @@ -15,7 +15,6 @@ Univ Bij PiCalculus Bencode -Sexp RAL UnionFind SmallSet diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 3d30e08e..71a611f3 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 47cdd7e819f798e50723373435866cb7) *) +(* DO NOT EDIT (digest: 2ec2194dcebadfa4593677936942ece3) *) module OASISGettext = struct (* # 22 "src/oasis/OASISGettext.ml" *) @@ -599,6 +599,7 @@ let package_default = [ ("containers", ["core"], []); ("containers_string", ["string"], []); + ("containers_advanced", ["advanced"], []); ("containers_pervasives", ["pervasives"], []); ("containers_misc", ["misc"], []); ("containers_thread", ["threads"], []); @@ -618,13 +619,14 @@ let package_default = ("examples/cgi", ["cgi"; "core"]); ("examples", ["core"; "misc"]); ("cgi", ["core"]); - ("benchs", ["core"; "misc"; "string"]) + ("benchs", ["advanced"; "core"; "misc"; "string"]); + ("advanced", ["core"]) ] } ;; let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;; -# 629 "myocamlbuild.ml" +# 631 "myocamlbuild.ml" (* OASIS_STOP *) Ocamlbuild_plugin.dispatch dispatch_default;; diff --git a/setup.ml b/setup.ml index d1659093..1d601950 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: 183eaa6c7caeb5dfeb678eda23eb7dde) *) +(* DO NOT EDIT (digest: 0222fd16fc381f55925d964c1351f1d7) *) (* Regenerated by OASIS v0.4.4 Visit http://oasis.forge.ocamlcore.org for more information and @@ -7012,21 +7012,19 @@ let setup_t = "CCPair"; "CCFun"; "CCHash"; - "CCCat"; "CCKList"; "CCInt"; "CCBool"; "CCArray"; - "CCBatch"; "CCOrd"; "CCIO"; "CCRandom"; - "CCLinq"; "CCKTree"; "CCTrie"; "CCString"; "CCHashtbl"; - "CCFlatHashtbl" + "CCFlatHashtbl"; + "CCSexp" ]; lib_pack = false; lib_internal_modules = []; @@ -7064,6 +7062,36 @@ let setup_t = lib_findlib_name = Some "string"; lib_findlib_containers = [] }); + Library + ({ + cs_name = "containers_advanced"; + cs_data = PropList.Data.create (); + cs_plugin_data = [] + }, + { + bs_build = [(OASISExpr.EBool true, true)]; + bs_install = [(OASISExpr.EBool true, true)]; + bs_path = "advanced"; + bs_compiled_object = Best; + bs_build_depends = [InternalLibrary "containers"]; + 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, [])] + }, + { + lib_modules = ["CCLinq"; "CCBatch"; "CCCat"]; + lib_pack = true; + lib_internal_modules = []; + lib_findlib_parent = Some "containers"; + lib_findlib_name = Some "advanced"; + lib_findlib_containers = [] + }); Library ({ cs_name = "containers_pervasives"; @@ -7138,7 +7166,6 @@ let setup_t = "Bij"; "PiCalculus"; "Bencode"; - "Sexp"; "RAL"; "UnionFind"; "SmallSet"; @@ -7404,7 +7431,8 @@ let setup_t = InternalLibrary "containers"; InternalLibrary "containers_string"; InternalLibrary "containers_misc"; - FindlibPackage ("bench", None) + FindlibPackage ("bench", None); + InternalLibrary "containers_advanced" ]; bs_build_tools = [ExternalTool "ocamlbuild"]; bs_c_sources = []; @@ -7765,11 +7793,7 @@ let setup_t = bs_install = [(OASISExpr.EBool true, false)]; bs_path = "examples/"; bs_compiled_object = Native; - bs_build_depends = - [ - InternalLibrary "containers"; - InternalLibrary "containers_misc" - ]; + bs_build_depends = [InternalLibrary "containers"]; bs_build_tools = [ExternalTool "ocamlbuild"]; bs_c_sources = []; bs_data_files = []; @@ -7808,7 +7832,8 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.4"; - oasis_digest = Some "\214\176\018E\1355\180\012\196\136b\005\024\030Sz"; + oasis_digest = + Some "\205\189\170!\227\180\207y\249\201\198\237\173\205\222\""; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7816,6 +7841,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7820 "setup.ml" +# 7845 "setup.ml" (* OASIS_STOP *) let () = setup ();;