Client refactor: Move non-unix depend modules of stdlib-lwt into stdlib

This commit is contained in:
Grégoire Henry 2018-02-08 10:51:01 +01:00
parent 154b932713
commit c55181273c
19 changed files with 21 additions and 34 deletions

View File

@ -3,7 +3,12 @@
(library
((name tezos_stdlib)
(public_name tezos-stdlib)
(libraries (ocplib-endian.bigstring cstruct stringext hex))
(libraries (ocplib-endian.bigstring
cstruct
stringext
hex
lwt
lwt.log))
(flags (:standard -safe-string))))
(alias

View File

@ -7,7 +7,7 @@
(* *)
(**************************************************************************)
open Error_monad
open Lwt.Infix
type t =
{ mutable pending_tasks : unit Lwt.u list ;

View File

@ -154,7 +154,7 @@ let rec peek ({ closed ; queue ; _ } as q) =
wait_push q >>= fun () ->
peek q
let peek_all { queue ; closed } =
let peek_all { queue ; closed ; _ } =
if closed then
[]
else

View File

@ -2,8 +2,10 @@
(executables
((names (test_tzList
test_mbytes_buffer))
(libraries (tezos-stdlib tezos-test-helpers))
test_mbytes_buffer
test_lwt_pipe))
(libraries (tezos-stdlib
tezos-test-helpers))
(flags (:standard -w -9-32
-safe-string
-open Tezos_test_helpers
@ -12,7 +14,8 @@
(alias
((name buildtest)
(deps (test_tzList.exe
test_mbytes_buffer.exe))))
test_mbytes_buffer.exe
test_lwt_pipe.exe))))
(alias
((name runtest_tzList)
@ -22,10 +25,15 @@
((name runtest_mbytes_buffer)
(action (run ${exe:test_mbytes_buffer.exe}))))
(alias
((name runtest_lwt_pipe)
(action (run ${exe:test_lwt_pipe.exe}))))
(alias
((name runtest)
(deps ((alias runtest_tzList)
(alias runtest_mbytes_buffer)))))
(alias runtest_mbytes_buffer)
(alias runtest_lwt_pipe)))))
(alias
((name runtest_indent)

View File

@ -14,6 +14,7 @@ depends: [
"hex"
"ocplib-endian"
"stringext"
"lwt"
]
build: [
[ "jbuilder" "build" "-p" name "-j" jobs ]

View File

@ -1,27 +0,0 @@
(jbuild_version 1)
(executables
((names (test_lwt_pipe))
(libraries (tezos-stdlib-lwt tezos-test-helpers))
(flags (:standard -w -9-32
-safe-string
-open Tezos_test_helpers
-open Tezos_stdlib_lwt))))
(alias
((name buildtest)
(deps (test_lwt_pipe.exe))))
(alias
((name runtest_lwt_pipe)
(action (run ${exe:test_lwt_pipe.exe}))))
(alias
((name runtest)
(deps ((alias runtest_lwt_pipe)))))
(alias
((name runtest_indent)
(deps ((glob_files *.ml*)))
(action (run bash ${libexec:tezos-stdlib:test-ocp-indent.sh} ${^}))))