Merge pull request #17 from jestabro/commit-post

T7272: update vyconf config tree on results from commitd

1 files changed, 20 insertions, 28 deletions

diff --git a/src/dune b/src/dune
index 5e08579..63e1167 100644
--- a/src/dune
+++ b/src/dune
@@ -4,23 +4,8 @@
  (name vyconf_connect)
  (public_name vyconf.vyconf-connect)
  (modules vyconf_pbt message)
- (libraries lwt lwt.unix lwt_log lwt_ppx ocaml-protoc fileutils ppx_deriving_yojson)
- (preprocess (pps lwt_ppx ppx_deriving_yojson)))
-
-(library
- (name vyconfd_config)
- (public_name vyconf.vyconfd-config)
- (modules vyconf_config startup session directories defaults commit)
- (libraries vyos1x-config vyconf_connect toml sha ppx_deriving.show)
- (preprocess (pps lwt_ppx ppx_deriving.show ppx_deriving_yojson)))
-
-(library
- (name client)
- (public_name vyconf.vyconf-client)
- (modules vyconf_client vyconf_client_session)
- (libraries vyos1x-config vyconf_connect lwt lwt.unix lwt_log lwt_ppx ocaml-protoc toml sha
-            yojson ppx_deriving.show ppx_deriving_yojson)
- (preprocess (pps lwt_ppx ppx_deriving.show ppx_deriving_yojson)))
+ (libraries lwt lwt.unix lwt_log lwt_ppx ocaml-protoc ocplib-endian)
+ (preprocess (pps lwt_ppx)))
 
 (library
  (name vycall_message)
@@ -31,8 +16,22 @@
 (library
  (name commitd_client)
  (public_name vyconf.vycall-client)
- (modules vycall_client)
- (libraries vyos1x-config vyconfd_config vycall_message lwt lwt.unix lwt_log lwt_ppx ocplib-endian)
+ (modules vycall_client commit)
+ (libraries vyos1x-config vycall_message lwt lwt.unix lwt_log lwt_ppx ocplib-endian)
+ (preprocess (pps lwt_ppx)))
+
+(library
+ (name vyconfd_config)
+ (public_name vyconf.vyconfd-config)
+ (modules vyconf_config startup session directories defaults)
+ (libraries vyos1x-config vyconf_connect commitd_client toml sha ppx_deriving.show yojson ppx_deriving_yojson)
+ (preprocess (pps lwt_ppx ppx_deriving.show ppx_deriving_yojson)))
+
+(library
+ (name vyconfd_client)
+ (public_name vyconf.vyconf-client)
+ (modules vyconf_client vyconf_client_session)
+ (libraries vyos1x-config vyconf_connect lwt lwt.unix lwt_log lwt_ppx)
  (preprocess (pps lwt_ppx)))
 
 (executable
@@ -46,21 +45,14 @@
  (name vycli)
  (public_name vycli)
  (modules vycli)
- (libraries client)
+ (libraries vyconfd_client)
  (preprocess (pps lwt_ppx)))
 
 (executable
  (name validate)
  (public_name validate)
  (modules validate)
- (libraries client))
-
-(executable
- (name test_commit_data)
- (public_name test-commit-data)
- (modules test_commit_data)
- (libraries vyos1x-config vyconfd_config)
- (preprocess (pps lwt_ppx)))
+ (libraries vyconfd_client))
 
 (rule
  (mode promote)