Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Provide Release_bytes in a separate module

  • Loading branch information...
commit a11632e338d00490b394265fe2905e01cf459d5d 1 parent 896e7aa
Andre Nathan authored
18 _oasis
View
@@ -13,14 +13,10 @@ Library release
BuildDepends: extunix (>= 0.0.4),
lwt (>= 2.3.2),
lwt.unix (>= 2.3.2),
- lwt.syntax (>= 2.3.2),
- uint.uint32 (>= 1.0.1),
- uint.uint64 (>= 1.0.1),
- uint.uint128 (>= 1.0.1)
+ lwt.syntax (>= 2.3.2)
CompiledObject: best
Modules: Release,
Release_buffer,
- Release_bytes,
Release_io,
Release_ipc,
Release_privileges,
@@ -28,6 +24,18 @@ Library release
InternalModules: Option
XMETADescription: OCaml daemon framework
+Library "release-bytes"
+ FindlibName: bytes
+ FindlibParent: release
+ Path: lib
+ BuildDepends: release,
+ uint.uint32 (>= 1.0.1),
+ uint.uint64 (>= 1.0.1),
+ uint.uint128 (>= 1.0.1)
+ CompiledObject: best
+ Modules: Release_bytes
+ XMETADescription: Binary operations for Release daemons
+
Library "release-config"
FindlibName: config
FindlibParent: release
22 _tags
View
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 3611e9779bb14b348c8f76b7aacce394)
+# DO NOT EDIT (digest: ba854114c745bfe1be4a54e7df72ed6d)
# 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
@@ -15,13 +15,16 @@
"_darcs": not_hygienic
# Library release
"lib/release.cmxs": use_release
+# Library release-bytes
+"lib/release-bytes.cmxs": use_release-bytes
+<lib/*.ml{,i}>: use_release
<lib/*.ml{,i}>: pkg_lwt
<lib/*.ml{,i}>: pkg_lwt.unix
<lib/*.ml{,i}>: pkg_lwt.syntax
-<lib/*.ml{,i}>: pkg_extunix
<lib/*.ml{,i}>: pkg_uint.uint32
<lib/*.ml{,i}>: pkg_uint.uint64
<lib/*.ml{,i}>: pkg_uint.uint128
+<lib/*.ml{,i}>: pkg_extunix
# Library release-config
"lib/release-config.cmxs": use_release-config
# Executable test_master
@@ -31,9 +34,6 @@
<lib_test/master.{native,byte}>: pkg_lwt.syntax
<lib_test/master.{native,byte}>: pkg_str
<lib_test/master.{native,byte}>: pkg_extunix
-<lib_test/master.{native,byte}>: pkg_uint.uint32
-<lib_test/master.{native,byte}>: pkg_uint.uint64
-<lib_test/master.{native,byte}>: pkg_uint.uint128
# Executable test_slave
<lib_test/slave.{native,byte}>: use_release
<lib_test/slave.{native,byte}>: pkg_lwt
@@ -41,9 +41,6 @@
<lib_test/slave.{native,byte}>: pkg_lwt.syntax
<lib_test/slave.{native,byte}>: pkg_str
<lib_test/slave.{native,byte}>: pkg_extunix
-<lib_test/slave.{native,byte}>: pkg_uint.uint32
-<lib_test/slave.{native,byte}>: pkg_uint.uint64
-<lib_test/slave.{native,byte}>: pkg_uint.uint128
# Executable test_helper
<lib_test/helper.{native,byte}>: use_release
<lib_test/helper.{native,byte}>: pkg_lwt
@@ -51,9 +48,6 @@
<lib_test/helper.{native,byte}>: pkg_lwt.syntax
<lib_test/helper.{native,byte}>: pkg_str
<lib_test/helper.{native,byte}>: pkg_extunix
-<lib_test/helper.{native,byte}>: pkg_uint.uint32
-<lib_test/helper.{native,byte}>: pkg_uint.uint64
-<lib_test/helper.{native,byte}>: pkg_uint.uint128
# Executable masterctl
<lib_test/masterctl.{native,byte}>: use_release
<lib_test/masterctl.{native,byte}>: pkg_lwt
@@ -61,18 +55,12 @@
<lib_test/masterctl.{native,byte}>: pkg_lwt.syntax
<lib_test/masterctl.{native,byte}>: pkg_str
<lib_test/masterctl.{native,byte}>: pkg_extunix
-<lib_test/masterctl.{native,byte}>: pkg_uint.uint32
-<lib_test/masterctl.{native,byte}>: pkg_uint.uint64
-<lib_test/masterctl.{native,byte}>: pkg_uint.uint128
<lib_test/*.ml{,i}>: use_release
<lib_test/*.ml{,i}>: pkg_lwt
<lib_test/*.ml{,i}>: pkg_lwt.unix
<lib_test/*.ml{,i}>: pkg_lwt.syntax
<lib_test/*.ml{,i}>: pkg_str
<lib_test/*.ml{,i}>: pkg_extunix
-<lib_test/*.ml{,i}>: pkg_uint.uint32
-<lib_test/*.ml{,i}>: pkg_uint.uint64
-<lib_test/*.ml{,i}>: pkg_uint.uint128
# Executable test_config
<lib_test/config_test.{native,byte}>: use_release-config
<lib_test/*.ml{,i}>: use_release-config
16 lib/META
View
@@ -1,9 +1,8 @@
# OASIS_START
-# DO NOT EDIT (digest: e9a989a5b4408442f07078c19eb6b726)
+# DO NOT EDIT (digest: f8ce5ec5b092d3550a19d2441be486d8)
version = "0.1.0"
description = "OCaml daemon framework"
-requires =
-"extunix lwt lwt.unix lwt.syntax uint.uint32 uint.uint64 uint.uint128"
+requires = "extunix lwt lwt.unix lwt.syntax"
archive(byte) = "release.cma"
archive(byte, plugin) = "release.cma"
archive(native) = "release.cmxa"
@@ -18,5 +17,16 @@ package "config" (
archive(native, plugin) = "release-config.cmxs"
exists_if = "release-config.cma"
)
+
+package "bytes" (
+ version = "0.1.0"
+ description = "Binary operations for Release daemons"
+ requires = "release uint.uint32 uint.uint64 uint.uint128"
+ archive(byte) = "release-bytes.cma"
+ archive(byte, plugin) = "release-bytes.cma"
+ archive(native) = "release-bytes.cmxa"
+ archive(native, plugin) = "release-bytes.cmxs"
+ exists_if = "release-bytes.cma"
+)
# OASIS_STOP
4 lib/release-bytes.mllib
View
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: 3c42dbfd2c46e7ce8626d5fd5346b621)
+Release_bytes
+# OASIS_STOP
3  lib/release.mllib
View
@@ -1,8 +1,7 @@
# OASIS_START
-# DO NOT EDIT (digest: b419313078fc3804949b97c81907c355)
+# DO NOT EDIT (digest: 61e184c7787ffbd4ff7411096008fbe4)
Release
Release_buffer
-Release_bytes
Release_io
Release_ipc
Release_privileges
3  lib/release.odocl
View
@@ -1,8 +1,7 @@
# OASIS_START
-# DO NOT EDIT (digest: 56b5920a2833df90763ff8610cc068c6)
+# DO NOT EDIT (digest: 0e6bc7b93963bcaa5ecd64eccf5e4e7c)
Release
Release_buffer
-Release_bytes
Release_io
Release_ipc
Release_privileges
10 myocamlbuild.ml
View
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 8470ec6be40938477fddc71e186dff3e) *)
+(* DO NOT EDIT (digest: 62e2939402e015ffef3daca3045b8c01) *)
module OASISGettext = struct
# 21 "/home/andre/src/oasis-0.3.0/src/oasis/OASISGettext.ml"
@@ -478,7 +478,11 @@ open Ocamlbuild_plugin;;
let package_default =
{
MyOCamlbuildBase.lib_ocaml =
- [("release", ["lib"]); ("release-config", ["lib"])];
+ [
+ ("release", ["lib"]);
+ ("release-bytes", ["lib"]);
+ ("release-config", ["lib"])
+ ];
lib_c = [];
flags = [];
includes = [("lib_test", ["lib"])];
@@ -487,7 +491,7 @@ let package_default =
let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
-# 491 "myocamlbuild.ml"
+# 495 "myocamlbuild.ml"
(* OASIS_STOP *)
(*flag ["ocaml"; "compile"; "ppopt_lwt_debug"] & S[A"-ppopt"; A"-lwt-debug"];*)
flag ["ocaml"; "compile"; "warn_error"] & S[A"-warn-error"; A"A"];
61 setup.ml
View
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.2.0 *)
(* OASIS_START *)
-(* DO NOT EDIT (digest: 168d0d7899f3f75f58a313c239eb2a62) *)
+(* DO NOT EDIT (digest: 9a85af2cc41ca774c6f9c0b7ece32e32) *)
(*
Regenerated by OASIS v0.3.0
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5655,16 +5655,7 @@ let setup_t =
Some (OASISVersion.VGreaterEqual "2.3.2"));
FindlibPackage
("lwt.syntax",
- Some (OASISVersion.VGreaterEqual "2.3.2"));
- FindlibPackage
- ("uint.uint32",
- Some (OASISVersion.VGreaterEqual "1.0.1"));
- FindlibPackage
- ("uint.uint64",
- Some (OASISVersion.VGreaterEqual "1.0.1"));
- FindlibPackage
- ("uint.uint128",
- Some (OASISVersion.VGreaterEqual "1.0.1"))
+ Some (OASISVersion.VGreaterEqual "2.3.2"))
];
bs_build_tools = [ExternalTool "ocamlbuild"];
bs_c_sources = [];
@@ -5681,7 +5672,6 @@ let setup_t =
[
"Release";
"Release_buffer";
- "Release_bytes";
"Release_io";
"Release_ipc";
"Release_privileges";
@@ -5695,6 +5685,48 @@ let setup_t =
});
Library
({
+ cs_name = "release-bytes";
+ cs_data = PropList.Data.create ();
+ cs_plugin_data = [];
+ },
+ {
+ bs_build = [(OASISExpr.EBool true, true)];
+ bs_install = [(OASISExpr.EBool true, true)];
+ bs_path = "lib";
+ bs_compiled_object = Best;
+ bs_build_depends =
+ [
+ InternalLibrary "release";
+ FindlibPackage
+ ("uint.uint32",
+ Some (OASISVersion.VGreaterEqual "1.0.1"));
+ FindlibPackage
+ ("uint.uint64",
+ Some (OASISVersion.VGreaterEqual "1.0.1"));
+ FindlibPackage
+ ("uint.uint128",
+ Some (OASISVersion.VGreaterEqual "1.0.1"))
+ ];
+ 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 = ["Release_bytes"];
+ lib_pack = false;
+ lib_internal_modules = [];
+ lib_findlib_parent = Some "release";
+ lib_findlib_name = Some "bytes";
+ lib_findlib_containers = [];
+ });
+ Library
+ ({
cs_name = "release-config";
cs_data = PropList.Data.create ();
cs_plugin_data = [];
@@ -5912,7 +5944,8 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.3.0";
- oasis_digest = Some "\2454\138\223]\176\\#U\229{\251[\183c\026";
+ oasis_digest =
+ Some "\024\215\184 X\200\020\015\244\183\231\022\000d\145\r";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false;
@@ -5920,6 +5953,6 @@ let setup_t =
let setup () = BaseSetup.setup setup_t;;
-# 5924 "setup.ml"
+# 5957 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;
Please sign in to comment.
Something went wrong with that request. Please try again.