Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Provide Release_bytes in a separate module

  • Loading branch information...
commit a11632e338d00490b394265fe2905e01cf459d5d 1 parent 896e7aa
Andre Nathan authored
18 _oasis
@@ -13,14 +13,10 @@ Library release
13 13 BuildDepends: extunix (>= 0.0.4),
14 14 lwt (>= 2.3.2),
15 15 lwt.unix (>= 2.3.2),
16   - lwt.syntax (>= 2.3.2),
17   - uint.uint32 (>= 1.0.1),
18   - uint.uint64 (>= 1.0.1),
19   - uint.uint128 (>= 1.0.1)
  16 + lwt.syntax (>= 2.3.2)
20 17 CompiledObject: best
21 18 Modules: Release,
22 19 Release_buffer,
23   - Release_bytes,
24 20 Release_io,
25 21 Release_ipc,
26 22 Release_privileges,
@@ -28,6 +24,18 @@ Library release
28 24 InternalModules: Option
29 25 XMETADescription: OCaml daemon framework
30 26
  27 +Library "release-bytes"
  28 + FindlibName: bytes
  29 + FindlibParent: release
  30 + Path: lib
  31 + BuildDepends: release,
  32 + uint.uint32 (>= 1.0.1),
  33 + uint.uint64 (>= 1.0.1),
  34 + uint.uint128 (>= 1.0.1)
  35 + CompiledObject: best
  36 + Modules: Release_bytes
  37 + XMETADescription: Binary operations for Release daemons
  38 +
31 39 Library "release-config"
32 40 FindlibName: config
33 41 FindlibParent: release
22 _tags
... ... @@ -1,5 +1,5 @@
1 1 # OASIS_START
2   -# DO NOT EDIT (digest: 3611e9779bb14b348c8f76b7aacce394)
  2 +# DO NOT EDIT (digest: ba854114c745bfe1be4a54e7df72ed6d)
3 3 # Ignore VCS directories, you can use the same kind of rule outside
4 4 # OASIS_START/STOP if you want to exclude directories that contains
5 5 # useless stuff for the build process
@@ -15,13 +15,16 @@
15 15 "_darcs": not_hygienic
16 16 # Library release
17 17 "lib/release.cmxs": use_release
  18 +# Library release-bytes
  19 +"lib/release-bytes.cmxs": use_release-bytes
  20 +<lib/*.ml{,i}>: use_release
18 21 <lib/*.ml{,i}>: pkg_lwt
19 22 <lib/*.ml{,i}>: pkg_lwt.unix
20 23 <lib/*.ml{,i}>: pkg_lwt.syntax
21   -<lib/*.ml{,i}>: pkg_extunix
22 24 <lib/*.ml{,i}>: pkg_uint.uint32
23 25 <lib/*.ml{,i}>: pkg_uint.uint64
24 26 <lib/*.ml{,i}>: pkg_uint.uint128
  27 +<lib/*.ml{,i}>: pkg_extunix
25 28 # Library release-config
26 29 "lib/release-config.cmxs": use_release-config
27 30 # Executable test_master
@@ -31,9 +34,6 @@
31 34 <lib_test/master.{native,byte}>: pkg_lwt.syntax
32 35 <lib_test/master.{native,byte}>: pkg_str
33 36 <lib_test/master.{native,byte}>: pkg_extunix
34   -<lib_test/master.{native,byte}>: pkg_uint.uint32
35   -<lib_test/master.{native,byte}>: pkg_uint.uint64
36   -<lib_test/master.{native,byte}>: pkg_uint.uint128
37 37 # Executable test_slave
38 38 <lib_test/slave.{native,byte}>: use_release
39 39 <lib_test/slave.{native,byte}>: pkg_lwt
@@ -41,9 +41,6 @@
41 41 <lib_test/slave.{native,byte}>: pkg_lwt.syntax
42 42 <lib_test/slave.{native,byte}>: pkg_str
43 43 <lib_test/slave.{native,byte}>: pkg_extunix
44   -<lib_test/slave.{native,byte}>: pkg_uint.uint32
45   -<lib_test/slave.{native,byte}>: pkg_uint.uint64
46   -<lib_test/slave.{native,byte}>: pkg_uint.uint128
47 44 # Executable test_helper
48 45 <lib_test/helper.{native,byte}>: use_release
49 46 <lib_test/helper.{native,byte}>: pkg_lwt
@@ -51,9 +48,6 @@
51 48 <lib_test/helper.{native,byte}>: pkg_lwt.syntax
52 49 <lib_test/helper.{native,byte}>: pkg_str
53 50 <lib_test/helper.{native,byte}>: pkg_extunix
54   -<lib_test/helper.{native,byte}>: pkg_uint.uint32
55   -<lib_test/helper.{native,byte}>: pkg_uint.uint64
56   -<lib_test/helper.{native,byte}>: pkg_uint.uint128
57 51 # Executable masterctl
58 52 <lib_test/masterctl.{native,byte}>: use_release
59 53 <lib_test/masterctl.{native,byte}>: pkg_lwt
@@ -61,18 +55,12 @@
61 55 <lib_test/masterctl.{native,byte}>: pkg_lwt.syntax
62 56 <lib_test/masterctl.{native,byte}>: pkg_str
63 57 <lib_test/masterctl.{native,byte}>: pkg_extunix
64   -<lib_test/masterctl.{native,byte}>: pkg_uint.uint32
65   -<lib_test/masterctl.{native,byte}>: pkg_uint.uint64
66   -<lib_test/masterctl.{native,byte}>: pkg_uint.uint128
67 58 <lib_test/*.ml{,i}>: use_release
68 59 <lib_test/*.ml{,i}>: pkg_lwt
69 60 <lib_test/*.ml{,i}>: pkg_lwt.unix
70 61 <lib_test/*.ml{,i}>: pkg_lwt.syntax
71 62 <lib_test/*.ml{,i}>: pkg_str
72 63 <lib_test/*.ml{,i}>: pkg_extunix
73   -<lib_test/*.ml{,i}>: pkg_uint.uint32
74   -<lib_test/*.ml{,i}>: pkg_uint.uint64
75   -<lib_test/*.ml{,i}>: pkg_uint.uint128
76 64 # Executable test_config
77 65 <lib_test/config_test.{native,byte}>: use_release-config
78 66 <lib_test/*.ml{,i}>: use_release-config
16 lib/META
... ... @@ -1,9 +1,8 @@
1 1 # OASIS_START
2   -# DO NOT EDIT (digest: e9a989a5b4408442f07078c19eb6b726)
  2 +# DO NOT EDIT (digest: f8ce5ec5b092d3550a19d2441be486d8)
3 3 version = "0.1.0"
4 4 description = "OCaml daemon framework"
5   -requires =
6   -"extunix lwt lwt.unix lwt.syntax uint.uint32 uint.uint64 uint.uint128"
  5 +requires = "extunix lwt lwt.unix lwt.syntax"
7 6 archive(byte) = "release.cma"
8 7 archive(byte, plugin) = "release.cma"
9 8 archive(native) = "release.cmxa"
@@ -18,5 +17,16 @@ package "config" (
18 17 archive(native, plugin) = "release-config.cmxs"
19 18 exists_if = "release-config.cma"
20 19 )
  20 +
  21 +package "bytes" (
  22 + version = "0.1.0"
  23 + description = "Binary operations for Release daemons"
  24 + requires = "release uint.uint32 uint.uint64 uint.uint128"
  25 + archive(byte) = "release-bytes.cma"
  26 + archive(byte, plugin) = "release-bytes.cma"
  27 + archive(native) = "release-bytes.cmxa"
  28 + archive(native, plugin) = "release-bytes.cmxs"
  29 + exists_if = "release-bytes.cma"
  30 +)
21 31 # OASIS_STOP
22 32
4 lib/release-bytes.mllib
... ... @@ -0,0 +1,4 @@
  1 +# OASIS_START
  2 +# DO NOT EDIT (digest: 3c42dbfd2c46e7ce8626d5fd5346b621)
  3 +Release_bytes
  4 +# OASIS_STOP
3  lib/release.mllib
... ... @@ -1,8 +1,7 @@
1 1 # OASIS_START
2   -# DO NOT EDIT (digest: b419313078fc3804949b97c81907c355)
  2 +# DO NOT EDIT (digest: 61e184c7787ffbd4ff7411096008fbe4)
3 3 Release
4 4 Release_buffer
5   -Release_bytes
6 5 Release_io
7 6 Release_ipc
8 7 Release_privileges
3  lib/release.odocl
... ... @@ -1,8 +1,7 @@
1 1 # OASIS_START
2   -# DO NOT EDIT (digest: 56b5920a2833df90763ff8610cc068c6)
  2 +# DO NOT EDIT (digest: 0e6bc7b93963bcaa5ecd64eccf5e4e7c)
3 3 Release
4 4 Release_buffer
5   -Release_bytes
6 5 Release_io
7 6 Release_ipc
8 7 Release_privileges
10 myocamlbuild.ml
... ... @@ -1,5 +1,5 @@
1 1 (* OASIS_START *)
2   -(* DO NOT EDIT (digest: 8470ec6be40938477fddc71e186dff3e) *)
  2 +(* DO NOT EDIT (digest: 62e2939402e015ffef3daca3045b8c01) *)
3 3 module OASISGettext = struct
4 4 # 21 "/home/andre/src/oasis-0.3.0/src/oasis/OASISGettext.ml"
5 5
@@ -478,7 +478,11 @@ open Ocamlbuild_plugin;;
478 478 let package_default =
479 479 {
480 480 MyOCamlbuildBase.lib_ocaml =
481   - [("release", ["lib"]); ("release-config", ["lib"])];
  481 + [
  482 + ("release", ["lib"]);
  483 + ("release-bytes", ["lib"]);
  484 + ("release-config", ["lib"])
  485 + ];
482 486 lib_c = [];
483 487 flags = [];
484 488 includes = [("lib_test", ["lib"])];
@@ -487,7 +491,7 @@ let package_default =
487 491
488 492 let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
489 493
490   -# 491 "myocamlbuild.ml"
  494 +# 495 "myocamlbuild.ml"
491 495 (* OASIS_STOP *)
492 496 (*flag ["ocaml"; "compile"; "ppopt_lwt_debug"] & S[A"-ppopt"; A"-lwt-debug"];*)
493 497 flag ["ocaml"; "compile"; "warn_error"] & S[A"-warn-error"; A"A"];
61 setup.ml
... ... @@ -1,7 +1,7 @@
1 1 (* setup.ml generated for the first time by OASIS v0.2.0 *)
2 2
3 3 (* OASIS_START *)
4   -(* DO NOT EDIT (digest: 168d0d7899f3f75f58a313c239eb2a62) *)
  4 +(* DO NOT EDIT (digest: 9a85af2cc41ca774c6f9c0b7ece32e32) *)
5 5 (*
6 6 Regenerated by OASIS v0.3.0
7 7 Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5655,16 +5655,7 @@ let setup_t =
5655 5655 Some (OASISVersion.VGreaterEqual "2.3.2"));
5656 5656 FindlibPackage
5657 5657 ("lwt.syntax",
5658   - Some (OASISVersion.VGreaterEqual "2.3.2"));
5659   - FindlibPackage
5660   - ("uint.uint32",
5661   - Some (OASISVersion.VGreaterEqual "1.0.1"));
5662   - FindlibPackage
5663   - ("uint.uint64",
5664   - Some (OASISVersion.VGreaterEqual "1.0.1"));
5665   - FindlibPackage
5666   - ("uint.uint128",
5667   - Some (OASISVersion.VGreaterEqual "1.0.1"))
  5658 + Some (OASISVersion.VGreaterEqual "2.3.2"))
5668 5659 ];
5669 5660 bs_build_tools = [ExternalTool "ocamlbuild"];
5670 5661 bs_c_sources = [];
@@ -5681,7 +5672,6 @@ let setup_t =
5681 5672 [
5682 5673 "Release";
5683 5674 "Release_buffer";
5684   - "Release_bytes";
5685 5675 "Release_io";
5686 5676 "Release_ipc";
5687 5677 "Release_privileges";
@@ -5695,6 +5685,48 @@ let setup_t =
5695 5685 });
5696 5686 Library
5697 5687 ({
  5688 + cs_name = "release-bytes";
  5689 + cs_data = PropList.Data.create ();
  5690 + cs_plugin_data = [];
  5691 + },
  5692 + {
  5693 + bs_build = [(OASISExpr.EBool true, true)];
  5694 + bs_install = [(OASISExpr.EBool true, true)];
  5695 + bs_path = "lib";
  5696 + bs_compiled_object = Best;
  5697 + bs_build_depends =
  5698 + [
  5699 + InternalLibrary "release";
  5700 + FindlibPackage
  5701 + ("uint.uint32",
  5702 + Some (OASISVersion.VGreaterEqual "1.0.1"));
  5703 + FindlibPackage
  5704 + ("uint.uint64",
  5705 + Some (OASISVersion.VGreaterEqual "1.0.1"));
  5706 + FindlibPackage
  5707 + ("uint.uint128",
  5708 + Some (OASISVersion.VGreaterEqual "1.0.1"))
  5709 + ];
  5710 + bs_build_tools = [ExternalTool "ocamlbuild"];
  5711 + bs_c_sources = [];
  5712 + bs_data_files = [];
  5713 + bs_ccopt = [(OASISExpr.EBool true, [])];
  5714 + bs_cclib = [(OASISExpr.EBool true, [])];
  5715 + bs_dlllib = [(OASISExpr.EBool true, [])];
  5716 + bs_dllpath = [(OASISExpr.EBool true, [])];
  5717 + bs_byteopt = [(OASISExpr.EBool true, [])];
  5718 + bs_nativeopt = [(OASISExpr.EBool true, [])];
  5719 + },
  5720 + {
  5721 + lib_modules = ["Release_bytes"];
  5722 + lib_pack = false;
  5723 + lib_internal_modules = [];
  5724 + lib_findlib_parent = Some "release";
  5725 + lib_findlib_name = Some "bytes";
  5726 + lib_findlib_containers = [];
  5727 + });
  5728 + Library
  5729 + ({
5698 5730 cs_name = "release-config";
5699 5731 cs_data = PropList.Data.create ();
5700 5732 cs_plugin_data = [];
@@ -5912,7 +5944,8 @@ let setup_t =
5912 5944 };
5913 5945 oasis_fn = Some "_oasis";
5914 5946 oasis_version = "0.3.0";
5915   - oasis_digest = Some "\2454\138\223]\176\\#U\229{\251[\183c\026";
  5947 + oasis_digest =
  5948 + Some "\024\215\184 X\200\020\015\244\183\231\022\000d\145\r";
5916 5949 oasis_exec = None;
5917 5950 oasis_setup_args = [];
5918 5951 setup_update = false;
@@ -5920,6 +5953,6 @@ let setup_t =
5920 5953
5921 5954 let setup () = BaseSetup.setup setup_t;;
5922 5955
5923   -# 5924 "setup.ml"
  5956 +# 5957 "setup.ml"
5924 5957 (* OASIS_STOP *)
5925 5958 let () = setup ();;

0 comments on commit a11632e

Please sign in to comment.
Something went wrong with that request. Please try again.