mirage · talex5 · Nov 7, 2024 · Nov 7, 2024 · Nov 7, 2024
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ clean:
 
 test:
 	rm -rf _build/_tests
-	dune build test/test.exe test-lwt/test_lwt.exe test-bin/calc.exe test-bin/echo/echo_bench.exe @install
+	dune build test test-bin @install
 	#./_build/default/test/test.bc test core -ev 36
 	#./_build/default/test-lwt/test.bc test lwt -ev 3
 	dune build @runtest --no-buffer -j 1
diff --git a/capnp-rpc-lwt/dune b/capnp-rpc-lwt/dune
diff --git a/capnp-rpc-lwt/capability.ml → capnp-rpc/capability.ml b/capnp-rpc-lwt/capability.ml → capnp-rpc/capability.ml
diff --git a/capnp-rpc-lwt/capnp_core.ml → capnp-rpc/capnp_core.ml b/capnp-rpc-lwt/capnp_core.ml → capnp-rpc/capnp_core.ml
diff --git a/capnp-rpc-lwt/capnp_rpc.ml → capnp-rpc/capnp_rpc.ml b/capnp-rpc-lwt/capnp_rpc.ml → capnp-rpc/capnp_rpc.ml
diff --git a/capnp-rpc-lwt/capnp_rpc.mli → capnp-rpc/capnp_rpc.mli b/capnp-rpc-lwt/capnp_rpc.mli → capnp-rpc/capnp_rpc.mli
diff --git a/capnp-rpc/dune b/capnp-rpc/dune
@@ -1,4 +1,16 @@
 (library
- (name capnp_rpc_proto)
- (public_name capnp-rpc.proto)
- (libraries astring fmt logs stdint asetmap))
+ (name capnp_rpc)
+ (public_name capnp-rpc)
+ (ocamlc_flags :standard -w -55-53)
+ (ocamlopt_flags :standard -w -55-53)
+ (libraries astring capnp capnp-rpc.proto fmt logs lwt uri))
+
+(rule
+ (targets rpc_schema.ml rpc_schema.mli)
+ (deps rpc_schema.capnp)
+ (action (run capnp compile -o %{bin:capnpc-ocaml} %{deps})))
+
+(rule
+ (targets persistent.ml persistent.mli)
+ (deps persistent.capnp)
+ (action (run capnp compile -o %{bin:capnpc-ocaml} %{deps})))
diff --git a/capnp-rpc-lwt/msg.ml → capnp-rpc/msg.ml b/capnp-rpc-lwt/msg.ml → capnp-rpc/msg.ml
diff --git a/capnp-rpc-lwt/msg.mli → capnp-rpc/msg.mli b/capnp-rpc-lwt/msg.mli → capnp-rpc/msg.mli
diff --git a/capnp-rpc-lwt/persistence.ml → capnp-rpc/persistence.ml b/capnp-rpc-lwt/persistence.ml → capnp-rpc/persistence.ml
diff --git a/capnp-rpc-lwt/persistent.capnp → capnp-rpc/persistent.capnp b/capnp-rpc-lwt/persistent.capnp → capnp-rpc/persistent.capnp
diff --git a/capnp-rpc-lwt/private.ml → capnp-rpc/private.ml b/capnp-rpc-lwt/private.ml → capnp-rpc/private.ml
diff --git a/capnp-rpc/capTP.ml → capnp-rpc/proto/capTP.ml b/capnp-rpc/capTP.ml → capnp-rpc/proto/capTP.ml
diff --git a/capnp-rpc/capTP.mli → capnp-rpc/proto/capTP.mli b/capnp-rpc/capTP.mli → capnp-rpc/proto/capTP.mli
diff --git a/capnp-rpc/cap_proxy.ml → capnp-rpc/proto/cap_proxy.ml b/capnp-rpc/cap_proxy.ml → capnp-rpc/proto/cap_proxy.ml
diff --git a/capnp-rpc/cap_proxy.mli → capnp-rpc/proto/cap_proxy.mli b/capnp-rpc/cap_proxy.mli → capnp-rpc/proto/cap_proxy.mli
diff --git a/capnp-rpc/capnp_rpc_proto.ml → capnp-rpc/proto/capnp_rpc_proto.ml b/capnp-rpc/capnp_rpc_proto.ml → capnp-rpc/proto/capnp_rpc_proto.ml
diff --git a/capnp-rpc/capnp_rpc_proto.mli → capnp-rpc/proto/capnp_rpc_proto.mli b/capnp-rpc/capnp_rpc_proto.mli → capnp-rpc/proto/capnp_rpc_proto.mli
diff --git a/capnp-rpc/core_types.ml → capnp-rpc/proto/core_types.ml b/capnp-rpc/core_types.ml → capnp-rpc/proto/core_types.ml
diff --git a/capnp-rpc/debug.ml → capnp-rpc/proto/debug.ml b/capnp-rpc/debug.ml → capnp-rpc/proto/debug.ml
diff --git a/capnp-rpc/debug.mli → capnp-rpc/proto/debug.mli b/capnp-rpc/debug.mli → capnp-rpc/proto/debug.mli
diff --git a/capnp-rpc/proto/dune b/capnp-rpc/proto/dune
@@ -0,0 +1,4 @@
+(library
+ (name capnp_rpc_proto)
+ (public_name capnp-rpc.proto)
+ (libraries astring fmt logs stdint asetmap))
diff --git a/capnp-rpc/dyn_array.ml → capnp-rpc/proto/dyn_array.ml b/capnp-rpc/dyn_array.ml → capnp-rpc/proto/dyn_array.ml
diff --git a/capnp-rpc/error.ml → capnp-rpc/proto/error.ml b/capnp-rpc/error.ml → capnp-rpc/proto/error.ml
diff --git a/capnp-rpc/exception.ml → capnp-rpc/proto/exception.ml b/capnp-rpc/exception.ml → capnp-rpc/proto/exception.ml
diff --git a/capnp-rpc/id.ml → capnp-rpc/proto/id.ml b/capnp-rpc/id.ml → capnp-rpc/proto/id.ml
diff --git a/capnp-rpc/local_struct_promise.ml → capnp-rpc/proto/local_struct_promise.ml b/capnp-rpc/local_struct_promise.ml → capnp-rpc/proto/local_struct_promise.ml
diff --git a/capnp-rpc/local_struct_promise.mli → capnp-rpc/proto/local_struct_promise.mli b/capnp-rpc/local_struct_promise.mli → capnp-rpc/proto/local_struct_promise.mli
diff --git a/capnp-rpc/message_types.ml → capnp-rpc/proto/message_types.ml b/capnp-rpc/message_types.ml → capnp-rpc/proto/message_types.ml
diff --git a/capnp-rpc/rC.ml → capnp-rpc/proto/rC.ml b/capnp-rpc/rC.ml → capnp-rpc/proto/rC.ml
diff --git a/capnp-rpc/rC.mli → capnp-rpc/proto/rC.mli b/capnp-rpc/rC.mli → capnp-rpc/proto/rC.mli
diff --git a/capnp-rpc/rO_array.ml → capnp-rpc/proto/rO_array.ml b/capnp-rpc/rO_array.ml → capnp-rpc/proto/rO_array.ml
diff --git a/capnp-rpc/rO_array.mli → capnp-rpc/proto/rO_array.mli b/capnp-rpc/rO_array.mli → capnp-rpc/proto/rO_array.mli
diff --git a/capnp-rpc/s.ml → capnp-rpc/proto/s.ml b/capnp-rpc/s.ml → capnp-rpc/proto/s.ml
diff --git a/capnp-rpc/stats.ml → capnp-rpc/proto/stats.ml b/capnp-rpc/stats.ml → capnp-rpc/proto/stats.ml
diff --git a/capnp-rpc/struct_proxy.ml → capnp-rpc/proto/struct_proxy.ml b/capnp-rpc/struct_proxy.ml → capnp-rpc/proto/struct_proxy.ml
diff --git a/capnp-rpc/table.ml → capnp-rpc/proto/table.ml b/capnp-rpc/table.ml → capnp-rpc/proto/table.ml
diff --git a/capnp-rpc/weak_ptr.ml → capnp-rpc/proto/weak_ptr.ml b/capnp-rpc/weak_ptr.ml → capnp-rpc/proto/weak_ptr.ml
diff --git a/capnp-rpc/weak_ptr.mli → capnp-rpc/proto/weak_ptr.mli b/capnp-rpc/weak_ptr.mli → capnp-rpc/proto/weak_ptr.mli
diff --git a/capnp-rpc-lwt/request.ml → capnp-rpc/request.ml b/capnp-rpc-lwt/request.ml → capnp-rpc/request.ml
diff --git a/capnp-rpc-lwt/request.mli → capnp-rpc/request.mli b/capnp-rpc-lwt/request.mli → capnp-rpc/request.mli
diff --git a/capnp-rpc-lwt/response.ml → capnp-rpc/response.ml b/capnp-rpc-lwt/response.ml → capnp-rpc/response.ml
diff --git a/capnp-rpc-lwt/rpc_schema.capnp → capnp-rpc/rpc_schema.capnp b/capnp-rpc-lwt/rpc_schema.capnp → capnp-rpc/rpc_schema.capnp
diff --git a/capnp-rpc-lwt/schema.ml → capnp-rpc/schema.ml b/capnp-rpc-lwt/schema.ml → capnp-rpc/schema.ml
diff --git a/capnp-rpc-lwt/service.ml → capnp-rpc/service.ml b/capnp-rpc-lwt/service.ml → capnp-rpc/service.ml
diff --git a/capnp-rpc-lwt/sturdy_ref.ml → capnp-rpc/sturdy_ref.ml b/capnp-rpc-lwt/sturdy_ref.ml → capnp-rpc/sturdy_ref.ml
diff --git a/capnp-rpc-lwt/xform.ml → capnp-rpc/xform.ml b/capnp-rpc-lwt/xform.ml → capnp-rpc/xform.ml
diff --git a/capnp-rpc-lwt/xform.mli → capnp-rpc/xform.mli b/capnp-rpc-lwt/xform.mli → capnp-rpc/xform.mli
diff --git a/test-lwt/dune b/test-lwt/dune
diff --git a/test/dune b/test/dune
@@ -1,4 +1,5 @@
 (test
- (name test)
- (package capnp-rpc)
- (libraries capnp-rpc.proto alcotest logs.fmt testbed))
+ (package capnp-rpc-unix)
+ (name test_lwt)
+ (libraries capnp-rpc capnp-rpc-unix alcotest-lwt testlib logs.fmt
+   testbed))
diff --git a/test/proto/dune b/test/proto/dune
@@ -0,0 +1,4 @@
+(test
+ (name test)
+ (package capnp-rpc)
+ (libraries capnp-rpc.proto alcotest logs.fmt testbed))
diff --git a/test/test.ml → test/proto/test.ml b/test/test.ml → test/proto/test.ml
diff --git a/test/test.mli → test/proto/test.mli b/test/test.mli → test/proto/test.mli
diff --git a/test/testbed/capnp_direct.ml → test/proto/testbed/capnp_direct.ml b/test/testbed/capnp_direct.ml → test/proto/testbed/capnp_direct.ml
diff --git a/test/testbed/connection.ml → test/proto/testbed/connection.ml b/test/testbed/connection.ml → test/proto/testbed/connection.ml
diff --git a/test/testbed/connection.mli → test/proto/testbed/connection.mli b/test/testbed/connection.mli → test/proto/testbed/connection.mli
diff --git a/test/testbed/dune → test/proto/testbed/dune b/test/testbed/dune → test/proto/testbed/dune
diff --git a/test/testbed/services.ml → test/proto/testbed/services.ml b/test/testbed/services.ml → test/proto/testbed/services.ml
diff --git a/test/testbed/test_utils.ml → test/proto/testbed/test_utils.ml b/test/testbed/test_utils.ml → test/proto/testbed/test_utils.ml
diff --git a/test-lwt/test_lwt.ml → test/test_lwt.ml b/test-lwt/test_lwt.ml → test/test_lwt.ml
diff --git a/test-lwt/test_lwt.mli → test/test_lwt.mli b/test-lwt/test_lwt.mli → test/test_lwt.mli