Skip to content

Commit

Permalink
Functorization
Browse files Browse the repository at this point in the history 
This makes release independent of Lwt. The release.lwt library
provides an Lwt-based implementation.
  • Loading branch information
@andrenth
andrenth committed Feb 5, 2015
1 parent 7aa9e3f commit 1343f8c
Show file tree
Hide file tree
Showing 56 changed files with 3,183 additions and 2,448 deletions.
126 changes: 33 additions & 93 deletions _oasis
View file
Expand Up @@ -9,66 +9,41 @@ BuildTools: ocamlbuild
Plugins: META (0.3), DevFiles (0.3)

Library "release"
FindlibName: release
Path: lib/core
BuildDepends: lwt (>= 2.4.7),
lwt.unix (>= 2.4.7),
release.buffer,
release.util
CompiledObject: best
Modules: Release,
Release_io,
Release_ipc,
Release_privileges,
Release_socket
XMETADescription: OCaml daemon framework

Library "release-buffer"
Path: lib/buffer
FindlibName: buffer
FindlibParent: release
CompiledObject: best
BuildDepends: lwt (>= 2.4.7),
lwt.unix (>= 2.4.7)
Modules: Release_buffer
XMETADescription: Buffer type for Release

Library "release-bytes"
FindlibName: bytes
FindlibParent: release
Path: lib/bytes
BuildDepends: release.buffer,
BuildDepends: str,
unix,
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
Path: lib/config
BuildDepends: lwt (>= 2.4.7),
release.util,
str,
unix
BuildTools+: ocamllex, ocamlyacc
CompiledObject: best
Modules: Release_config,
Modules: Release,
Release_buffer,
Release_bytes,
Release_config,
Release_config_lexer,
Release_config_parser,
Release_config_global,
Release_config_values,
Release_config_validations
XMETADescription: Configuration file support for Release daemons
Release_config_validations,
Release_future,
Release_io,
Release_ipc,
Release_privileges,
Release_socket,
Release_util
XMETADescription: OCaml daemon framework

Library "release-util"
Path: lib/util
FindlibName: util
Library "release-lwt"
FindlibName: lwt
FindlibParent: release
Path: lib/lwt
BuildDepends: lwt (>= 2.4.7),
lwt.unix (>= 2.4.7),
release
CompiledObject: best
Modules: Release_util
XMETADescription: Miscellaneuous utility functions
Modules: Release_lwt
XMETADescription: OCaml daemon framework

Document "release"
Title: Release documentation
Expand All @@ -77,77 +52,42 @@ Document "release"
XOCamlbuildPath: lib/core
XOCamlbuildLibraries: release

Document "release-buffer"
Title: Release_buffer documentation
Type: ocamlbuild (0.3)
BuildTools+: ocamldoc
XOCamlbuildPath: lib/buffer
XOCamlbuildLibraries: release.buffer

Document "release-bytes"
Title: Release_bytes documentation
Type: ocamlbuild (0.3)
BuildTools+: ocamldoc
XOCamlbuildPath: lib/bytes
XOCamlbuildLibraries: release.bytes

Document "release-config"
Title: Release_config documentation
Type: ocamlbuild (0.3)
BuildTools+: ocamldoc
XOCamlbuildPath: lib/config
XOCamlbuildLibraries: release.config

Executable test_master
Executable "test_master"
Path: lib_test
MainIs: master.ml
Install: false
CompiledObject: best
BuildDepends: camlp4,
lwt,
lwt.unix,
release,
BuildDepends: release.lwt,
str

Executable test_slave
Executable "test_slave"
Path: lib_test
MainIs: slave.ml
Install: false
CompiledObject: best
BuildDepends: camlp4,
lwt,
lwt.unix,
release,
BuildDepends: release.lwt,
str

Executable test_helper
Executable "test_helper"
Path: lib_test
MainIs: helper.ml
Install: false
CompiledObject: best
BuildDepends: camlp4,
lwt,
lwt.unix,
release,
BuildDepends: release.lwt,
str

Executable masterctl
Executable "masterctl"
Path: lib_test
MainIs: masterctl.ml
Install: false
CompiledObject: best
BuildDepends: camlp4,
lwt,
lwt.unix,
release,
BuildDepends: release.lwt,
str

Executable test_config
Executable "test_config"
Path: lib_test
MainIs: config_test.ml
Install: false
CompiledObject: best
BuildTools+: ocamllex, ocamlyacc
BuildDepends: lwt (>= 2.4.7),
lwt.unix (>= 2.4.7),
release.config
BuildDepends: release.lwt
90 changes: 46 additions & 44 deletions _tags
View file
@@ -1,5 +1,5 @@
# OASIS_START
# DO NOT EDIT (digest: 8419587680524e13f0652ce1124784dd)
# DO NOT EDIT (digest: 029fe3563e1910a41565202745a0ac8f)
# 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
Expand All @@ -14,80 +14,82 @@ true: annot, bin_annot
".git": not_hygienic
"_darcs": -traverse
"_darcs": not_hygienic
# Library release-buffer
"lib/buffer/release-buffer.cmxs": use_release-buffer
<lib/buffer/*.ml{,i,y}>: pkg_lwt
<lib/buffer/*.ml{,i,y}>: pkg_lwt.unix
# Library release-bytes
"lib/bytes/release-bytes.cmxs": use_release-bytes
<lib/bytes/*.ml{,i,y}>: pkg_lwt
<lib/bytes/*.ml{,i,y}>: pkg_lwt.unix
<lib/bytes/*.ml{,i,y}>: pkg_uint.uint128
<lib/bytes/*.ml{,i,y}>: pkg_uint.uint32
<lib/bytes/*.ml{,i,y}>: pkg_uint.uint64
<lib/bytes/*.ml{,i,y}>: use_release-buffer
# Library release-util
"lib/util/release-util.cmxs": use_release-util
# Library release-config
"lib/config/release-config.cmxs": use_release-config
<lib/config/*.ml{,i,y}>: pkg_lwt
<lib/config/*.ml{,i,y}>: pkg_str
<lib/config/*.ml{,i,y}>: pkg_unix
<lib/config/*.ml{,i,y}>: use_release-util
# Library release
"lib/core/release.cmxs": use_release
<lib/core/*.ml{,i,y}>: pkg_lwt
<lib/core/*.ml{,i,y}>: pkg_lwt.unix
<lib/core/*.ml{,i,y}>: use_release-buffer
<lib/core/*.ml{,i,y}>: use_release-util
<lib/core/*.ml{,i,y}>: pkg_str
<lib/core/*.ml{,i,y}>: pkg_uint.uint128
<lib/core/*.ml{,i,y}>: pkg_uint.uint32
<lib/core/*.ml{,i,y}>: pkg_uint.uint64
<lib/core/*.ml{,i,y}>: pkg_unix
# Library release-lwt
"lib/lwt/release-lwt.cmxs": use_release-lwt
<lib/lwt/*.ml{,i,y}>: pkg_lwt
<lib/lwt/*.ml{,i,y}>: pkg_lwt.unix
<lib/lwt/*.ml{,i,y}>: pkg_str
<lib/lwt/*.ml{,i,y}>: pkg_uint.uint128
<lib/lwt/*.ml{,i,y}>: pkg_uint.uint32
<lib/lwt/*.ml{,i,y}>: pkg_uint.uint64
<lib/lwt/*.ml{,i,y}>: pkg_unix
<lib/lwt/*.ml{,i,y}>: use_release
# Executable test_master
<lib_test/master.{native,byte}>: pkg_camlp4
<lib_test/master.{native,byte}>: pkg_lwt
<lib_test/master.{native,byte}>: pkg_lwt.unix
<lib_test/master.{native,byte}>: pkg_str
<lib_test/master.{native,byte}>: pkg_uint.uint128
<lib_test/master.{native,byte}>: pkg_uint.uint32
<lib_test/master.{native,byte}>: pkg_uint.uint64
<lib_test/master.{native,byte}>: pkg_unix
<lib_test/master.{native,byte}>: use_release
<lib_test/master.{native,byte}>: use_release-buffer
<lib_test/master.{native,byte}>: use_release-util
<lib_test/master.{native,byte}>: use_release-lwt
# Executable test_slave
<lib_test/slave.{native,byte}>: pkg_camlp4
<lib_test/slave.{native,byte}>: pkg_lwt
<lib_test/slave.{native,byte}>: pkg_lwt.unix
<lib_test/slave.{native,byte}>: pkg_str
<lib_test/slave.{native,byte}>: pkg_uint.uint128
<lib_test/slave.{native,byte}>: pkg_uint.uint32
<lib_test/slave.{native,byte}>: pkg_uint.uint64
<lib_test/slave.{native,byte}>: pkg_unix
<lib_test/slave.{native,byte}>: use_release
<lib_test/slave.{native,byte}>: use_release-buffer
<lib_test/slave.{native,byte}>: use_release-util
<lib_test/slave.{native,byte}>: use_release-lwt
# Executable test_helper
<lib_test/helper.{native,byte}>: pkg_camlp4
<lib_test/helper.{native,byte}>: pkg_lwt
<lib_test/helper.{native,byte}>: pkg_lwt.unix
<lib_test/helper.{native,byte}>: pkg_str
<lib_test/helper.{native,byte}>: pkg_uint.uint128
<lib_test/helper.{native,byte}>: pkg_uint.uint32
<lib_test/helper.{native,byte}>: pkg_uint.uint64
<lib_test/helper.{native,byte}>: pkg_unix
<lib_test/helper.{native,byte}>: use_release
<lib_test/helper.{native,byte}>: use_release-buffer
<lib_test/helper.{native,byte}>: use_release-util
<lib_test/helper.{native,byte}>: use_release-lwt
# Executable masterctl
<lib_test/masterctl.{native,byte}>: pkg_camlp4
<lib_test/masterctl.{native,byte}>: pkg_lwt
<lib_test/masterctl.{native,byte}>: pkg_lwt.unix
<lib_test/masterctl.{native,byte}>: pkg_str
<lib_test/masterctl.{native,byte}>: pkg_uint.uint128
<lib_test/masterctl.{native,byte}>: pkg_uint.uint32
<lib_test/masterctl.{native,byte}>: pkg_uint.uint64
<lib_test/masterctl.{native,byte}>: pkg_unix
<lib_test/masterctl.{native,byte}>: use_release
<lib_test/masterctl.{native,byte}>: use_release-buffer
<lib_test/masterctl.{native,byte}>: use_release-util
<lib_test/*.ml{,i,y}>: pkg_camlp4
<lib_test/*.ml{,i,y}>: use_release
<lib_test/*.ml{,i,y}>: use_release-buffer
<lib_test/masterctl.{native,byte}>: use_release-lwt
# Executable test_config
<lib_test/config_test.{native,byte}>: pkg_lwt
<lib_test/config_test.{native,byte}>: pkg_lwt.unix
<lib_test/config_test.{native,byte}>: pkg_str
<lib_test/config_test.{native,byte}>: pkg_uint.uint128
<lib_test/config_test.{native,byte}>: pkg_uint.uint32
<lib_test/config_test.{native,byte}>: pkg_uint.uint64
<lib_test/config_test.{native,byte}>: pkg_unix
<lib_test/config_test.{native,byte}>: use_release-config
<lib_test/config_test.{native,byte}>: use_release-util
<lib_test/config_test.{native,byte}>: use_release
<lib_test/config_test.{native,byte}>: use_release-lwt
<lib_test/*.ml{,i,y}>: pkg_lwt
<lib_test/*.ml{,i,y}>: pkg_lwt.unix
<lib_test/*.ml{,i,y}>: pkg_str
<lib_test/*.ml{,i,y}>: pkg_uint.uint128
<lib_test/*.ml{,i,y}>: pkg_uint.uint32
<lib_test/*.ml{,i,y}>: pkg_uint.uint64
<lib_test/*.ml{,i,y}>: pkg_unix
<lib_test/*.ml{,i,y}>: use_release-config
<lib_test/*.ml{,i,y}>: use_release-util
<lib_test/*.ml{,i,y}>: use_release
<lib_test/*.ml{,i,y}>: use_release-lwt
# OASIS_STOP
<lib/option/*.ml>: annot
<lib/option/*.ml>: warn_error_A
Expand Down
4 changes: 0 additions & 4 deletions lib/buffer/release-buffer.mldylib
View file

This file was deleted.

4 changes: 0 additions & 4 deletions lib/buffer/release-buffer.mllib
View file

This file was deleted.

4 changes: 0 additions & 4 deletions lib/buffer/release-buffer.odocl
View file

This file was deleted.

0 comments on commit 1343f8c

Please sign in to comment.