[gnunet] 06/10: BUILD: Move arm to service/cli

[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 b4f068d6c7b111d0713e880dbffb06927450ebf1
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Oct 18 14:17:54 2023 +0200

    BUILD: Move arm to service/cli
---
 configure.ac                                     | 19 +++++-----
 po/POTFILES.in                                   | 10 +++---
 src/Makefile.am                                  |  1 -
 src/cli/Makefile.am                              |  3 +-
 src/cli/arm/.gitignore                           |  1 +
 src/cli/arm/Makefile.am                          | 45 ++++++++++++++++++++++++
 src/{ => cli}/arm/gnunet-arm.c                   |  0
 src/core/Makefile.am                             |  4 +--
 src/lib/testing/Makefile.am                      |  2 +-
 src/plugin/dhtu/Makefile.am                      |  4 +--
 src/service/Makefile.am                          |  3 +-
 src/{ => service}/arm/.gitignore                 |  2 +-
 src/{ => service}/arm/Makefile.am                | 27 +-------------
 src/{ => service}/arm/arm.conf.in                |  0
 src/{ => service}/arm/arm.h                      |  0
 src/{ => service}/arm/arm_api.c                  |  0
 src/{ => service}/arm/arm_monitor_api.c          |  0
 src/{ => service}/arm/gnunet-service-arm.c       |  0
 src/{ => service}/arm/meson.build                |  0
 src/{ => service}/arm/mockup-service.c           |  0
 src/{ => service}/arm/mockup_service             |  0
 src/{ => service}/arm/test_arm_api.c             |  0
 src/{ => service}/arm/test_arm_api_data.conf     |  0
 src/{ => service}/arm/test_exponential_backoff.c |  0
 src/{ => service}/arm/test_gnunet_arm.py.in      |  0
 src/{ => service}/arm/test_gnunet_service_arm.c  |  0
 src/transport/Makefile.am                        | 14 ++++----
 27 files changed, 79 insertions(+), 56 deletions(-)

diff --git a/configure.ac b/configure.ac
index 644d8adbd..87543d15f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1228,9 +1228,10 @@ doc/doxygen/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile
-src/arm/Makefile
-src/arm/arm.conf
 src/auction/Makefile
+src/lib/Makefile
+src/lib/util/Makefile
+src/lib/util/resolver.conf
 src/lib/block/Makefile
 src/lib/curl/Makefile
 src/lib/gnsrecord/Makefile
@@ -1242,6 +1243,13 @@ src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/dhtu/Makefile
 src/plugin/gnsrecord/Makefile
+src/service/Makefile
+src/service/arm/Makefile
+src/service/arm/arm.conf
+src/service/util/Makefile
+src/cli/Makefile
+src/cli/arm/Makefile
+src/cli/util/Makefile
 src/cadet/Makefile
 src/cadet/cadet.conf
 src/core/Makefile
@@ -1304,13 +1312,6 @@ src/template/Makefile
 src/topology/Makefile
 src/transport/Makefile
 src/transport/transport.conf
-src/lib/Makefile
-src/lib/util/Makefile
-src/lib/util/resolver.conf
-src/service/Makefile
-src/service/util/Makefile
-src/cli/Makefile
-src/cli/util/Makefile
 src/vpn/Makefile
 src/vpn/vpn.conf
 src/zonemaster/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f2981502d..b152a6f19 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,11 +4,6 @@ src/abd/delegate_misc.c
 src/abd/gnunet-abd.c
 src/abd/gnunet-service-abd.c
 src/abd/plugin_gnsrecord_abd.c
-src/arm/arm_api.c
-src/arm/arm_monitor_api.c
-src/arm/gnunet-arm.c
-src/arm/gnunet-service-arm.c
-src/arm/mockup-service.c
 src/auction/gnunet-auction-create.c
 src/auction/gnunet-auction-info.c
 src/auction/gnunet-auction-join.c
@@ -32,6 +27,7 @@ src/cadet/gnunet-service-cadet_hello.c
 src/cadet/gnunet-service-cadet_paths.c
 src/cadet/gnunet-service-cadet_peer.c
 src/cadet/gnunet-service-cadet_tunnels.c
+src/cli/arm/gnunet-arm.c
 src/cli/util/gnunet-base32.c
 src/cli/util/gnunet-config-diff.c
 src/cli/util/gnunet-config.c
@@ -438,6 +434,10 @@ 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
+src/service/arm/mockup-service.c
 src/service/util/gnunet-service-resolver.c
 src/set/gnunet-service-set.c
 src/set/gnunet-service-set_intersection.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 647ccd88d..88bb59a8e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ SUBDIRS = \
        service \
        cli \
   statistics \
-  arm \
   $(REST_DIR) \
   datacache \
   datastore \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index d94046cde..88a8507b7 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = \
-       util
+       util \
+       arm
diff --git a/src/cli/arm/.gitignore b/src/cli/arm/.gitignore
new file mode 100644
index 000000000..f010c20a1
--- /dev/null
+++ b/src/cli/arm/.gitignore
@@ -0,0 +1 @@
+gnunet-arm
diff --git a/src/cli/arm/Makefile.am b/src/cli/arm/Makefile.am
new file mode 100644
index 000000000..e8bc1c42c
--- /dev/null
+++ b/src/cli/arm/Makefile.am
@@ -0,0 +1,45 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+bin_PROGRAMS = \
+ gnunet-arm
+
+gnunet_arm_SOURCES = \
+ gnunet-arm.c
+gnunet_arm_LDADD = \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+# FIXME the respective conf file now resides in service/arm/
+#if HAVE_PYTHON
+#check_SCRIPTS = \
+# test_gnunet_arm.py
+#endif
+
+if ENABLE_TEST_RUN
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
+endif
+
+#SUFFIXES = .py.in .py
+#.py.in.py:
+#      $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/$< > $@
+#      chmod +x $@
+#
+#test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
+#      $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_gnunet_arm.py.in > test_gnunet_arm.py
+#      chmod +x test_gnunet_arm.py
+#
+#EXTRA_DIST = \
+#  test_arm_api_data.conf \
+#  test_gnunet_arm.py.in
diff --git a/src/arm/gnunet-arm.c b/src/cli/arm/gnunet-arm.c
similarity index 100%
rename from src/arm/gnunet-arm.c
rename to src/cli/arm/gnunet-arm.c
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 4a8ee9b31..b1d932ace 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -45,7 +45,7 @@ libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
@@ -55,7 +55,7 @@ libgnunetcoretesting_la_SOURCES = \
   core_api_cmd_connecting_peers.c 
 libgnunetcoretesting_la_LIBADD = \
   $(top_builddir)/src/lib/testing/libgnunettesting.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/transport/libgnunettransportcore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/lib/testing/Makefile.am b/src/lib/testing/Makefile.am
index fe7de2399..9ad48c619 100644
--- a/src/lib/testing/Makefile.am
+++ b/src/lib/testing/Makefile.am
@@ -50,7 +50,7 @@ libgnunettesting_la_SOURCES = \
   testing_api_loop.c \
   testing_api_traits.c
 libgnunettesting_la_LIBADD = \
- $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/service/arm/libgnunetarm.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunettesting_la_LDFLAGS = \
diff --git a/src/plugin/dhtu/Makefile.am b/src/plugin/dhtu/Makefile.am
index cfe2a014f..872e8f41f 100644
--- a/src/plugin/dhtu/Makefile.am
+++ b/src/plugin/dhtu/Makefile.am
@@ -52,7 +52,7 @@ libgnunettestingdhtu_la_SOURCES = \
   testing_dhtu_cmd_send.c
 libgnunettestingdhtu_la_LIBADD = \
  $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/service/arm/libgnunetarm.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(LTLIBINTL)
 libgnunettestingdhtu_la_LDFLAGS = \
@@ -65,7 +65,7 @@ test_dhtu_ip_SOURCES = \
  test_dhtu_ip.c
 test_dhtu_ip_LDADD = \
  $(top_builddir)/src/lib/testing/libgnunettesting.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/service/arm/libgnunetarm.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 check_PROGRAMS = \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index d94046cde..88a8507b7 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = \
-       util
+       util \
+       arm
diff --git a/src/arm/.gitignore b/src/service/arm/.gitignore
similarity index 91%
rename from src/arm/.gitignore
rename to src/service/arm/.gitignore
index 859c6e393..b1d66852b 100644
--- a/src/arm/.gitignore
+++ b/src/service/arm/.gitignore
@@ -1,5 +1,5 @@
+arm.conf
 mockup-service
-gnunet-arm
 gnunet-service-arm
 test_arm_api
 test_exponential_backoff
diff --git a/src/arm/Makefile.am b/src/service/arm/Makefile.am
similarity index 65%
rename from src/arm/Makefile.am
rename to src/service/arm/Makefile.am
index 6ecc7ca7a..32addeef1 100644
--- a/src/arm/Makefile.am
+++ b/src/service/arm/Makefile.am
@@ -25,22 +25,12 @@ libgnunetarm_la_LDFLAGS = \
   -version-info 2:0:0
 
 
-bin_PROGRAMS = \
- gnunet-arm
-
 noinst_PROGRAMS = \
  mockup-service
 
 libexec_PROGRAMS = \
  gnunet-service-arm
 
-gnunet_arm_SOURCES = \
- gnunet-arm.c
-gnunet_arm_LDADD = \
-  libgnunetarm.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 gnunet_service_arm_SOURCES = \
  gnunet-service-arm.c
 gnunet_service_arm_LDADD = \
@@ -60,11 +50,6 @@ check_PROGRAMS = \
  test_exponential_backoff \
  test_gnunet_service_arm
 
-if HAVE_PYTHON
-check_SCRIPTS = \
- test_gnunet_arm.py
-endif
-
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
@@ -88,15 +73,5 @@ test_gnunet_service_arm_SOURCES = \
   libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
-SUFFIXES = .py.in .py
-.py.in.py:
-       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/$< > $@
-       chmod +x $@
-
-test_gnunet_arm.py: test_gnunet_arm.py.in Makefile
-       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_gnunet_arm.py.in > test_gnunet_arm.py
-       chmod +x test_gnunet_arm.py
-
 EXTRA_DIST = \
-  test_arm_api_data.conf \
-  test_gnunet_arm.py.in
+  test_arm_api_data.conf
diff --git a/src/arm/arm.conf.in b/src/service/arm/arm.conf.in
similarity index 100%
rename from src/arm/arm.conf.in
rename to src/service/arm/arm.conf.in
diff --git a/src/arm/arm.h b/src/service/arm/arm.h
similarity index 100%
rename from src/arm/arm.h
rename to src/service/arm/arm.h
diff --git a/src/arm/arm_api.c b/src/service/arm/arm_api.c
similarity index 100%
rename from src/arm/arm_api.c
rename to src/service/arm/arm_api.c
diff --git a/src/arm/arm_monitor_api.c b/src/service/arm/arm_monitor_api.c
similarity index 100%
rename from src/arm/arm_monitor_api.c
rename to src/service/arm/arm_monitor_api.c
diff --git a/src/arm/gnunet-service-arm.c b/src/service/arm/gnunet-service-arm.c
similarity index 100%
rename from src/arm/gnunet-service-arm.c
rename to src/service/arm/gnunet-service-arm.c
diff --git a/src/arm/meson.build b/src/service/arm/meson.build
similarity index 100%
rename from src/arm/meson.build
rename to src/service/arm/meson.build
diff --git a/src/arm/mockup-service.c b/src/service/arm/mockup-service.c
similarity index 100%
rename from src/arm/mockup-service.c
rename to src/service/arm/mockup-service.c
diff --git a/src/arm/mockup_service b/src/service/arm/mockup_service
similarity index 100%
rename from src/arm/mockup_service
rename to src/service/arm/mockup_service
diff --git a/src/arm/test_arm_api.c b/src/service/arm/test_arm_api.c
similarity index 100%
rename from src/arm/test_arm_api.c
rename to src/service/arm/test_arm_api.c
diff --git a/src/arm/test_arm_api_data.conf 
b/src/service/arm/test_arm_api_data.conf
similarity index 100%
rename from src/arm/test_arm_api_data.conf
rename to src/service/arm/test_arm_api_data.conf
diff --git a/src/arm/test_exponential_backoff.c 
b/src/service/arm/test_exponential_backoff.c
similarity index 100%
rename from src/arm/test_exponential_backoff.c
rename to src/service/arm/test_exponential_backoff.c
diff --git a/src/arm/test_gnunet_arm.py.in 
b/src/service/arm/test_gnunet_arm.py.in
similarity index 100%
rename from src/arm/test_gnunet_arm.py.in
rename to src/service/arm/test_gnunet_arm.py.in
diff --git a/src/arm/test_gnunet_service_arm.c 
b/src/service/arm/test_gnunet_service_arm.c
similarity index 100%
rename from src/arm/test_gnunet_service_arm.c
rename to src/service/arm/test_gnunet_service_arm.c
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 65326d99d..7f71b0967 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -46,7 +46,7 @@ libgnunettransporttesting2_la_SOURCES = \
 libgnunettransporttesting2_la_LIBADD = \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
@@ -204,7 +204,7 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_transport_plugin_cmd_nat_upnp_la_LDFLAGS = \
@@ -220,7 +220,7 @@ 
libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LDFLAGS = \
@@ -236,7 +236,7 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = 
\
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \
@@ -252,7 +252,7 @@ 
libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LDFLAGS = \
@@ -268,7 +268,7 @@ 
libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LDFLAGS = \
@@ -284,7 +284,7 @@ 
libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
   $(top_builddir)/src/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/arm/libgnunetarm.la \
+  $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
 libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LDFLAGS = \

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