[gnunet] 02/02: BUILD: Move set/consensus/secretsharing to contrib/service

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 98c00bad3d29a80c514818615c224a29307400cc
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 09:54:35 2023 +0200

    BUILD: Move set/consensus/secretsharing to contrib/service
---
 configure.ac                                       | 12 ++++----
 po/POTFILES.in                                     | 34 +++++++++++-----------
 src/Makefile.am                                    |  3 --
 src/contrib/service/Makefile.am                    |  3 ++
 src/{ => contrib/service}/consensus/.gitignore     |  0
 src/{ => contrib/service}/consensus/Makefile.am    |  4 +--
 .../service}/consensus/consensus-simulation.py.in  |  0
 .../service}/consensus/consensus.conf.in           |  0
 src/{ => contrib/service}/consensus/consensus.h    |  0
 .../service}/consensus/consensus_api.c             |  0
 .../service}/consensus/consensus_protocol.h        |  0
 .../service}/consensus/gnunet-service-consensus.c  |  0
 src/{ => contrib/service}/consensus/meson.build    |  0
 .../service}/consensus/plugin_block_consensus.c    |  0
 .../service}/consensus/test_consensus.conf         |  0
 .../service}/consensus/test_consensus_api.c        |  0
 src/{ => contrib/service}/secretsharing/.gitignore |  0
 .../service}/secretsharing/Makefile.am             |  2 +-
 .../secretsharing/gnunet-secretsharing-profiler.c  |  0
 .../secretsharing/gnunet-service-secretsharing.c   |  0
 .../service}/secretsharing/meson.build             |  0
 .../service}/secretsharing/secretsharing.conf.in   |  0
 .../service}/secretsharing/secretsharing.h         |  0
 .../service}/secretsharing/secretsharing_api.c     |  0
 .../service}/secretsharing/secretsharing_common.c  |  0
 .../secretsharing/secretsharing_protocol.h         |  0
 .../service}/secretsharing/test_secretsharing.conf |  0
 .../secretsharing/test_secretsharing_api.c         |  0
 src/{ => contrib/service}/set/.gitignore           |  0
 src/{ => contrib/service}/set/Makefile.am          |  0
 src/{ => contrib/service}/set/gnunet-service-set.c |  0
 src/{ => contrib/service}/set/gnunet-service-set.h |  0
 .../service}/set/gnunet-service-set_intersection.c |  0
 .../service}/set/gnunet-service-set_intersection.h |  0
 .../service}/set/gnunet-service-set_protocol.h     |  0
 .../service}/set/gnunet-service-set_union.c        |  0
 .../service}/set/gnunet-service-set_union.h        |  0
 .../gnunet-service-set_union_strata_estimator.c    |  0
 .../gnunet-service-set_union_strata_estimator.h    |  0
 .../service}/set/gnunet-set-ibf-profiler.c         |  0
 .../service}/set/gnunet-set-profiler.c             |  0
 src/{ => contrib/service}/set/ibf.c                |  0
 src/{ => contrib/service}/set/ibf.h                |  0
 src/{ => contrib/service}/set/ibf_sim.c            |  0
 src/{ => contrib/service}/set/meson.build          |  0
 .../service}/set/plugin_block_set_test.c           |  0
 src/{ => contrib/service}/set/set.conf.in          |  0
 src/{ => contrib/service}/set/set.h                |  0
 src/{ => contrib/service}/set/set_api.c            |  0
 src/{ => contrib/service}/set/test_set.conf        |  0
 src/{ => contrib/service}/set/test_set_api.c       |  0
 .../set/test_set_intersection_result_full.c        |  0
 .../service}/set/test_set_union_copy.c             |  0
 .../service}/set/test_set_union_result_symmetric.c |  0
 54 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/configure.ac b/configure.ac
index d4a84a989..5df94e8e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1303,12 +1303,16 @@ src/contrib/service/Makefile
 src/contrib/service/abd/Makefile
 src/contrib/service/abd/abd.conf
 src/contrib/service/auction/Makefile
+src/contrib/service/consensus/Makefile
+src/contrib/service/consensus/consensus.conf
+src/contrib/service/secretsharing/Makefile
+src/contrib/service/secretsharing/secretsharing.conf
+src/contrib/service/set/Makefile
+src/contrib/service/set/set.conf
 src/contrib/service/rps/Makefile
 src/contrib/service/rps/rps.conf
 src/contrib/service/template/Makefile
 src/contrib/cli/template/Makefile
-src/consensus/Makefile
-src/consensus/consensus.conf
 src/conversation/Makefile
 src/conversation/conversation.conf
 src/exit/Makefile
@@ -1323,12 +1327,8 @@ src/include/gnunet_config.h
 src/pt/Makefile
 src/revocation/Makefile
 src/revocation/revocation.conf
-src/secretsharing/Makefile
-src/secretsharing/secretsharing.conf
 src/scalarproduct/Makefile
 src/scalarproduct/scalarproduct.conf
-src/set/Makefile
-src/set/set.conf
 src/seti/Makefile
 src/seti/seti.conf
 src/setu/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index be60d2b50..05bc968e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,9 +27,6 @@ src/cli/util/gnunet-resolver.c
 src/cli/util/gnunet-scrypt.c
 src/cli/util/gnunet-timeout.c
 src/cli/util/gnunet-uri.c
-src/consensus/consensus_api.c
-src/consensus/gnunet-service-consensus.c
-src/consensus/plugin_block_consensus.c
 src/contrib/cli/template/gnunet-template.c
 src/contrib/service/abd/abd_api.c
 src/contrib/service/abd/abd_serialization.c
@@ -41,6 +38,9 @@ src/contrib/service/auction/gnunet-auction-create.c
 src/contrib/service/auction/gnunet-auction-info.c
 src/contrib/service/auction/gnunet-auction-join.c
 src/contrib/service/auction/gnunet-service-auction.c
+src/contrib/service/consensus/consensus_api.c
+src/contrib/service/consensus/gnunet-service-consensus.c
+src/contrib/service/consensus/plugin_block_consensus.c
 src/contrib/service/rps/gnunet-rps-profiler.c
 src/contrib/service/rps/gnunet-rps.c
 src/contrib/service/rps/gnunet-service-rps.c
@@ -52,6 +52,20 @@ src/contrib/service/rps/rps-sampler_client.c
 src/contrib/service/rps/rps-sampler_common.c
 src/contrib/service/rps/rps-test_util.c
 src/contrib/service/rps/rps_api.c
+src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c
+src/contrib/service/secretsharing/gnunet-service-secretsharing.c
+src/contrib/service/secretsharing/secretsharing_api.c
+src/contrib/service/secretsharing/secretsharing_common.c
+src/contrib/service/set/gnunet-service-set.c
+src/contrib/service/set/gnunet-service-set_intersection.c
+src/contrib/service/set/gnunet-service-set_union.c
+src/contrib/service/set/gnunet-service-set_union_strata_estimator.c
+src/contrib/service/set/gnunet-set-ibf-profiler.c
+src/contrib/service/set/gnunet-set-profiler.c
+src/contrib/service/set/ibf.c
+src/contrib/service/set/ibf_sim.c
+src/contrib/service/set/plugin_block_set_test.c
+src/contrib/service/set/set_api.c
 src/contrib/service/template/gnunet-service-template.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
@@ -308,10 +322,6 @@ src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 src/scalarproduct/gnunet-service-scalarproduct_alice.c
 src/scalarproduct/gnunet-service-scalarproduct_bob.c
 src/scalarproduct/scalarproduct_api.c
-src/secretsharing/gnunet-secretsharing-profiler.c
-src/secretsharing/gnunet-service-secretsharing.c
-src/secretsharing/secretsharing_api.c
-src/secretsharing/secretsharing_common.c
 src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
@@ -469,16 +479,6 @@ src/service/transport/transport_api_cmd_start_peer.c
 src/service/transport/transport_api_cmd_stop_peer.c
 src/service/transport/transport_api_traits.c
 src/service/util/gnunet-service-resolver.c
-src/set/gnunet-service-set.c
-src/set/gnunet-service-set_intersection.c
-src/set/gnunet-service-set_union.c
-src/set/gnunet-service-set_union_strata_estimator.c
-src/set/gnunet-set-ibf-profiler.c
-src/set/gnunet-set-profiler.c
-src/set/ibf.c
-src/set/ibf_sim.c
-src/set/plugin_block_set_test.c
-src/set/set_api.c
 src/seti/gnunet-service-seti.c
 src/seti/gnunet-seti-profiler.c
 src/seti/plugin_block_seti_test.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 208049b50..0cafaf276 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,10 +17,8 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  set \
   seti \
   setu \
-  consensus \
   scalarproduct \
   revocation \
   vpn \
@@ -30,6 +28,5 @@ SUBDIRS = \
   fs \
   exit \
   pt \
-  secretsharing \
   reclaim \
   messenger
diff --git a/src/contrib/service/Makefile.am b/src/contrib/service/Makefile.am
index d7cb9946d..cfab56206 100644
--- a/src/contrib/service/Makefile.am
+++ b/src/contrib/service/Makefile.am
@@ -7,4 +7,7 @@ endif
 
 SUBDIRS = \
        template \
+       set \
+       consensus \
+       secretsharing \
        $(EXP_DIR)
diff --git a/src/consensus/.gitignore b/src/contrib/service/consensus/.gitignore
similarity index 100%
rename from src/consensus/.gitignore
rename to src/contrib/service/consensus/.gitignore
diff --git a/src/consensus/Makefile.am 
b/src/contrib/service/consensus/Makefile.am
similarity index 95%
rename from src/consensus/Makefile.am
rename to src/contrib/service/consensus/Makefile.am
index a578a62cc..69405b90e 100644
--- a/src/consensus/Makefile.am
+++ b/src/contrib/service/consensus/Makefile.am
@@ -40,7 +40,7 @@ gnunet_service_consensus_SOURCES = \
 gnunet_service_consensus_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/contrib/service/set/libgnunetset.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 
@@ -50,7 +50,7 @@ gnunet_service_evil_consensus_SOURCES = \
 gnunet_service_evil_consensus_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/contrib/service/set/libgnunetset.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 gnunet_service_evil_consensus_CFLAGS = -DEVIL
diff --git a/src/consensus/consensus-simulation.py.in 
b/src/contrib/service/consensus/consensus-simulation.py.in
similarity index 100%
rename from src/consensus/consensus-simulation.py.in
rename to src/contrib/service/consensus/consensus-simulation.py.in
diff --git a/src/consensus/consensus.conf.in 
b/src/contrib/service/consensus/consensus.conf.in
similarity index 100%
rename from src/consensus/consensus.conf.in
rename to src/contrib/service/consensus/consensus.conf.in
diff --git a/src/consensus/consensus.h 
b/src/contrib/service/consensus/consensus.h
similarity index 100%
rename from src/consensus/consensus.h
rename to src/contrib/service/consensus/consensus.h
diff --git a/src/consensus/consensus_api.c 
b/src/contrib/service/consensus/consensus_api.c
similarity index 100%
rename from src/consensus/consensus_api.c
rename to src/contrib/service/consensus/consensus_api.c
diff --git a/src/consensus/consensus_protocol.h 
b/src/contrib/service/consensus/consensus_protocol.h
similarity index 100%
rename from src/consensus/consensus_protocol.h
rename to src/contrib/service/consensus/consensus_protocol.h
diff --git a/src/consensus/gnunet-service-consensus.c 
b/src/contrib/service/consensus/gnunet-service-consensus.c
similarity index 100%
rename from src/consensus/gnunet-service-consensus.c
rename to src/contrib/service/consensus/gnunet-service-consensus.c
diff --git a/src/consensus/meson.build 
b/src/contrib/service/consensus/meson.build
similarity index 100%
rename from src/consensus/meson.build
rename to src/contrib/service/consensus/meson.build
diff --git a/src/consensus/plugin_block_consensus.c 
b/src/contrib/service/consensus/plugin_block_consensus.c
similarity index 100%
rename from src/consensus/plugin_block_consensus.c
rename to src/contrib/service/consensus/plugin_block_consensus.c
diff --git a/src/consensus/test_consensus.conf 
b/src/contrib/service/consensus/test_consensus.conf
similarity index 100%
rename from src/consensus/test_consensus.conf
rename to src/contrib/service/consensus/test_consensus.conf
diff --git a/src/consensus/test_consensus_api.c 
b/src/contrib/service/consensus/test_consensus_api.c
similarity index 100%
rename from src/consensus/test_consensus_api.c
rename to src/contrib/service/consensus/test_consensus_api.c
diff --git a/src/secretsharing/.gitignore 
b/src/contrib/service/secretsharing/.gitignore
similarity index 100%
rename from src/secretsharing/.gitignore
rename to src/contrib/service/secretsharing/.gitignore
diff --git a/src/secretsharing/Makefile.am 
b/src/contrib/service/secretsharing/Makefile.am
similarity index 96%
rename from src/secretsharing/Makefile.am
rename to src/contrib/service/secretsharing/Makefile.am
index c22d57fea..afc42309c 100644
--- a/src/secretsharing/Makefile.am
+++ b/src/contrib/service/secretsharing/Makefile.am
@@ -40,7 +40,7 @@ gnunet_service_secretsharing_SOURCES = \
 gnunet_service_secretsharing_CFLAGS = $(AM_CFLAGS)
 gnunet_service_secretsharing_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/consensus/libgnunetconsensus.la \
+  $(top_builddir)/src/contrib/service/consensus/libgnunetconsensus.la \
   $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL)
 
diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c 
b/src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c
similarity index 100%
rename from src/secretsharing/gnunet-secretsharing-profiler.c
rename to src/contrib/service/secretsharing/gnunet-secretsharing-profiler.c
diff --git a/src/secretsharing/gnunet-service-secretsharing.c 
b/src/contrib/service/secretsharing/gnunet-service-secretsharing.c
similarity index 100%
rename from src/secretsharing/gnunet-service-secretsharing.c
rename to src/contrib/service/secretsharing/gnunet-service-secretsharing.c
diff --git a/src/secretsharing/meson.build 
b/src/contrib/service/secretsharing/meson.build
similarity index 100%
rename from src/secretsharing/meson.build
rename to src/contrib/service/secretsharing/meson.build
diff --git a/src/secretsharing/secretsharing.conf.in 
b/src/contrib/service/secretsharing/secretsharing.conf.in
similarity index 100%
rename from src/secretsharing/secretsharing.conf.in
rename to src/contrib/service/secretsharing/secretsharing.conf.in
diff --git a/src/secretsharing/secretsharing.h 
b/src/contrib/service/secretsharing/secretsharing.h
similarity index 100%
rename from src/secretsharing/secretsharing.h
rename to src/contrib/service/secretsharing/secretsharing.h
diff --git a/src/secretsharing/secretsharing_api.c 
b/src/contrib/service/secretsharing/secretsharing_api.c
similarity index 100%
rename from src/secretsharing/secretsharing_api.c
rename to src/contrib/service/secretsharing/secretsharing_api.c
diff --git a/src/secretsharing/secretsharing_common.c 
b/src/contrib/service/secretsharing/secretsharing_common.c
similarity index 100%
rename from src/secretsharing/secretsharing_common.c
rename to src/contrib/service/secretsharing/secretsharing_common.c
diff --git a/src/secretsharing/secretsharing_protocol.h 
b/src/contrib/service/secretsharing/secretsharing_protocol.h
similarity index 100%
rename from src/secretsharing/secretsharing_protocol.h
rename to src/contrib/service/secretsharing/secretsharing_protocol.h
diff --git a/src/secretsharing/test_secretsharing.conf 
b/src/contrib/service/secretsharing/test_secretsharing.conf
similarity index 100%
rename from src/secretsharing/test_secretsharing.conf
rename to src/contrib/service/secretsharing/test_secretsharing.conf
diff --git a/src/secretsharing/test_secretsharing_api.c 
b/src/contrib/service/secretsharing/test_secretsharing_api.c
similarity index 100%
rename from src/secretsharing/test_secretsharing_api.c
rename to src/contrib/service/secretsharing/test_secretsharing_api.c
diff --git a/src/set/.gitignore b/src/contrib/service/set/.gitignore
similarity index 100%
rename from src/set/.gitignore
rename to src/contrib/service/set/.gitignore
diff --git a/src/set/Makefile.am b/src/contrib/service/set/Makefile.am
similarity index 100%
rename from src/set/Makefile.am
rename to src/contrib/service/set/Makefile.am
diff --git a/src/set/gnunet-service-set.c 
b/src/contrib/service/set/gnunet-service-set.c
similarity index 100%
rename from src/set/gnunet-service-set.c
rename to src/contrib/service/set/gnunet-service-set.c
diff --git a/src/set/gnunet-service-set.h 
b/src/contrib/service/set/gnunet-service-set.h
similarity index 100%
rename from src/set/gnunet-service-set.h
rename to src/contrib/service/set/gnunet-service-set.h
diff --git a/src/set/gnunet-service-set_intersection.c 
b/src/contrib/service/set/gnunet-service-set_intersection.c
similarity index 100%
rename from src/set/gnunet-service-set_intersection.c
rename to src/contrib/service/set/gnunet-service-set_intersection.c
diff --git a/src/set/gnunet-service-set_intersection.h 
b/src/contrib/service/set/gnunet-service-set_intersection.h
similarity index 100%
rename from src/set/gnunet-service-set_intersection.h
rename to src/contrib/service/set/gnunet-service-set_intersection.h
diff --git a/src/set/gnunet-service-set_protocol.h 
b/src/contrib/service/set/gnunet-service-set_protocol.h
similarity index 100%
rename from src/set/gnunet-service-set_protocol.h
rename to src/contrib/service/set/gnunet-service-set_protocol.h
diff --git a/src/set/gnunet-service-set_union.c 
b/src/contrib/service/set/gnunet-service-set_union.c
similarity index 100%
rename from src/set/gnunet-service-set_union.c
rename to src/contrib/service/set/gnunet-service-set_union.c
diff --git a/src/set/gnunet-service-set_union.h 
b/src/contrib/service/set/gnunet-service-set_union.h
similarity index 100%
rename from src/set/gnunet-service-set_union.h
rename to src/contrib/service/set/gnunet-service-set_union.h
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c 
b/src/contrib/service/set/gnunet-service-set_union_strata_estimator.c
similarity index 100%
rename from src/set/gnunet-service-set_union_strata_estimator.c
rename to src/contrib/service/set/gnunet-service-set_union_strata_estimator.c
diff --git a/src/set/gnunet-service-set_union_strata_estimator.h 
b/src/contrib/service/set/gnunet-service-set_union_strata_estimator.h
similarity index 100%
rename from src/set/gnunet-service-set_union_strata_estimator.h
rename to src/contrib/service/set/gnunet-service-set_union_strata_estimator.h
diff --git a/src/set/gnunet-set-ibf-profiler.c 
b/src/contrib/service/set/gnunet-set-ibf-profiler.c
similarity index 100%
rename from src/set/gnunet-set-ibf-profiler.c
rename to src/contrib/service/set/gnunet-set-ibf-profiler.c
diff --git a/src/set/gnunet-set-profiler.c 
b/src/contrib/service/set/gnunet-set-profiler.c
similarity index 100%
rename from src/set/gnunet-set-profiler.c
rename to src/contrib/service/set/gnunet-set-profiler.c
diff --git a/src/set/ibf.c b/src/contrib/service/set/ibf.c
similarity index 100%
rename from src/set/ibf.c
rename to src/contrib/service/set/ibf.c
diff --git a/src/set/ibf.h b/src/contrib/service/set/ibf.h
similarity index 100%
rename from src/set/ibf.h
rename to src/contrib/service/set/ibf.h
diff --git a/src/set/ibf_sim.c b/src/contrib/service/set/ibf_sim.c
similarity index 100%
rename from src/set/ibf_sim.c
rename to src/contrib/service/set/ibf_sim.c
diff --git a/src/set/meson.build b/src/contrib/service/set/meson.build
similarity index 100%
rename from src/set/meson.build
rename to src/contrib/service/set/meson.build
diff --git a/src/set/plugin_block_set_test.c 
b/src/contrib/service/set/plugin_block_set_test.c
similarity index 100%
rename from src/set/plugin_block_set_test.c
rename to src/contrib/service/set/plugin_block_set_test.c
diff --git a/src/set/set.conf.in b/src/contrib/service/set/set.conf.in
similarity index 100%
rename from src/set/set.conf.in
rename to src/contrib/service/set/set.conf.in
diff --git a/src/set/set.h b/src/contrib/service/set/set.h
similarity index 100%
rename from src/set/set.h
rename to src/contrib/service/set/set.h
diff --git a/src/set/set_api.c b/src/contrib/service/set/set_api.c
similarity index 100%
rename from src/set/set_api.c
rename to src/contrib/service/set/set_api.c
diff --git a/src/set/test_set.conf b/src/contrib/service/set/test_set.conf
similarity index 100%
rename from src/set/test_set.conf
rename to src/contrib/service/set/test_set.conf
diff --git a/src/set/test_set_api.c b/src/contrib/service/set/test_set_api.c
similarity index 100%
rename from src/set/test_set_api.c
rename to src/contrib/service/set/test_set_api.c
diff --git a/src/set/test_set_intersection_result_full.c 
b/src/contrib/service/set/test_set_intersection_result_full.c
similarity index 100%
rename from src/set/test_set_intersection_result_full.c
rename to src/contrib/service/set/test_set_intersection_result_full.c
diff --git a/src/set/test_set_union_copy.c 
b/src/contrib/service/set/test_set_union_copy.c
similarity index 100%
rename from src/set/test_set_union_copy.c
rename to src/contrib/service/set/test_set_union_copy.c
diff --git a/src/set/test_set_union_result_symmetric.c 
b/src/contrib/service/set/test_set_union_result_symmetric.c
similarity index 100%
rename from src/set/test_set_union_result_symmetric.c
rename to src/contrib/service/set/test_set_union_result_symmetric.c

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.