[gnunet] branch master updated (cf1b66251 -> 9862fc36d)

[gnunet]

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

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

    from cf1b66251 DNS/REGEX: Move block plugin to plugin dir
     new 9629f0ed2 SET: Move block plugin to plugin dir
     new 9862fc36d MESSENGER: Move block plugin to plugin dir

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac                                       |  3 +++
 po/POTFILES.in                                     |  6 ++---
 src/plugin/Makefile.am                             |  3 ++-
 src/plugin/meson.build                             |  3 +++
 src/plugin/{dht => messenger}/Makefile.am          | 29 +++++++++++-----------
 src/plugin/{gnsrecord => messenger}/meson.build    |  7 +++---
 .../messenger/plugin_gnsrecord_messenger.c         |  0
 src/plugin/{dht => seti}/Makefile.am               | 18 ++++++--------
 src/plugin/seti/meson.build                        |  7 ++++++
 .../seti/plugin_block_seti_test.c                  |  0
 src/plugin/{dht => setu}/Makefile.am               | 18 +++++---------
 src/plugin/setu/meson.build                        |  7 ++++++
 .../setu/plugin_block_setu_test.c                  |  0
 src/service/messenger/Makefile.am                  | 13 ----------
 src/service/messenger/meson.build                  |  8 ------
 src/service/seti/Makefile.am                       | 14 -----------
 src/service/seti/meson.build                       |  6 -----
 src/service/setu/Makefile.am                       | 14 -----------
 src/service/setu/meson.build                       |  6 -----
 19 files changed, 57 insertions(+), 105 deletions(-)
 copy src/plugin/{dht => messenger}/Makefile.am (51%)
 copy src/plugin/{gnsrecord => messenger}/meson.build (60%)
 rename src/{service => plugin}/messenger/plugin_gnsrecord_messenger.c (100%)
 copy src/plugin/{dht => seti}/Makefile.am (60%)
 create mode 100644 src/plugin/seti/meson.build
 rename src/{service => plugin}/seti/plugin_block_seti_test.c (100%)
 copy src/plugin/{dht => setu}/Makefile.am (57%)
 create mode 100644 src/plugin/setu/meson.build
 rename src/{service => plugin}/setu/plugin_block_setu_test.c (100%)

diff --git a/configure.ac b/configure.ac
index ebb37bb2b..8ebcbd4a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1251,6 +1251,9 @@ src/plugin/peerstore/Makefile
 src/plugin/reclaim/Makefile
 src/plugin/regex/Makefile
 src/plugin/revocation/Makefile
+src/plugin/seti/Makefile
+src/plugin/setu/Makefile
+src/plugin/messenger/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cb4748f10..a1471f455 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -222,6 +222,7 @@ src/plugin/fs/plugin_block_fs.c
 src/plugin/gns/plugin_block_gns.c
 src/plugin/gns/plugin_gnsrecord_gns.c
 src/plugin/gnsrecord/plugin_gnsrecord_dns.c
+src/plugin/messenger/plugin_gnsrecord_messenger.c
 src/plugin/namecache/plugin_namecache_flat.c
 src/plugin/namecache/plugin_namecache_postgres.c
 src/plugin/namecache/plugin_namecache_sqlite.c
@@ -238,6 +239,8 @@ src/plugin/reclaim/plugin_reclaim_credential_pabc.c
 src/plugin/regex/plugin_block_regex.c
 src/plugin/regex/regex_block_lib.c
 src/plugin/revocation/plugin_block_revocation.c
+src/plugin/seti/plugin_block_seti_test.c
+src/plugin/setu/plugin_block_setu_test.c
 src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
@@ -367,7 +370,6 @@ src/service/messenger/messenger_api_list_tunnels.c
 src/service/messenger/messenger_api_message.c
 src/service/messenger/messenger_api_room.c
 src/service/messenger/messenger_api_util.c
-src/service/messenger/plugin_gnsrecord_messenger.c
 src/service/messenger/testing_messenger_barrier.c
 src/service/messenger/testing_messenger_setup.c
 src/service/namecache/gnunet-service-namecache.c
@@ -434,7 +436,6 @@ src/service/revocation/gnunet-service-revocation.c
 src/service/revocation/revocation_api.c
 src/service/seti/gnunet-service-seti.c
 src/service/seti/gnunet-seti-profiler.c
-src/service/seti/plugin_block_seti_test.c
 src/service/seti/seti_api.c
 src/service/setu/gnunet-service-setu.c
 src/service/setu/gnunet-service-setu_strata_estimator.c
@@ -442,7 +443,6 @@ src/service/setu/gnunet-setu-ibf-profiler.c
 src/service/setu/gnunet-setu-profiler.c
 src/service/setu/ibf.c
 src/service/setu/ibf_sim.c
-src/service/setu/plugin_block_setu_test.c
 src/service/setu/setu_api.c
 src/service/statistics/gnunet-service-statistics.c
 src/service/statistics/statistics_api.c
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index f3ca55ff0..78e06fd63 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -12,4 +12,5 @@ SUBDIRS = \
        regex \
        gns \
        fs \
-       reclaim
+       reclaim \
+       messenger
diff --git a/src/plugin/meson.build b/src/plugin/meson.build
index 867e53f93..d4f797c54 100644
--- a/src/plugin/meson.build
+++ b/src/plugin/meson.build
@@ -7,8 +7,11 @@ subdir('peerstore')
 subdir('namecache')
 subdir('namestore')
 subdir('dht')
+subdir('seti')
+subdir('setu')
 subdir('regex')
 subdir('revocation')
 subdir('gns')
 subdir('fs')
 subdir('reclaim')
+subdir('messenger')
diff --git a/src/plugin/dht/Makefile.am b/src/plugin/messenger/Makefile.am
similarity index 51%
copy from src/plugin/dht/Makefile.am
copy to src/plugin/messenger/Makefile.am
index 4df810066..e3c69ea33 100644
--- a/src/plugin/dht/Makefile.am
+++ b/src/plugin/messenger/Makefile.am
@@ -1,27 +1,26 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-plugindir = $(libdir)/gnunet
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-libexecdir= $(pkglibdir)/libexec/
-
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
   XLIB = -lgcov
 endif
 
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la
-
-libgnunet_plugin_block_dht_la_SOURCES = \
-  plugin_block_dht.c
-libgnunet_plugin_block_dht_la_LIBADD = \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  libgnunet_plugin_gnsrecord_messenger.la
+
+
+libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
+  plugin_gnsrecord_messenger.c
+libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
-libgnunet_plugin_block_dht_la_LDFLAGS = \
+libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
+
+
+plugindir = $(libdir)/gnunet
diff --git a/src/plugin/gnsrecord/meson.build b/src/plugin/messenger/meson.build
similarity index 60%
copy from src/plugin/gnsrecord/meson.build
copy to src/plugin/messenger/meson.build
index 0778fb233..17dd9bd32 100644
--- a/src/plugin/gnsrecord/meson.build
+++ b/src/plugin/messenger/meson.build
@@ -1,6 +1,7 @@
-shared_module('gnunet_plugin_gnsrecord_dns',
-              ['plugin_gnsrecord_dns.c'],
-              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep],
+shared_module('gnunet_plugin_gnsrecord_messenger',
+              ['plugin_gnsrecord_messenger.c'],
+              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
+                            ],
               include_directories: [incdir, configuration_inc],
               install: true,
               install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/messenger/plugin_gnsrecord_messenger.c 
b/src/plugin/messenger/plugin_gnsrecord_messenger.c
similarity index 100%
rename from src/service/messenger/plugin_gnsrecord_messenger.c
rename to src/plugin/messenger/plugin_gnsrecord_messenger.c
diff --git a/src/plugin/dht/Makefile.am b/src/plugin/seti/Makefile.am
similarity index 60%
copy from src/plugin/dht/Makefile.am
copy to src/plugin/seti/Makefile.am
index 4df810066..e6f579a65 100644
--- a/src/plugin/dht/Makefile.am
+++ b/src/plugin/seti/Makefile.am
@@ -1,27 +1,25 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-plugindir = $(libdir)/gnunet
-
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
+plugindir = $(libdir)/gnunet
+
 if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la
+  libgnunet_plugin_block_seti_test.la
 
-libgnunet_plugin_block_dht_la_SOURCES = \
-  plugin_block_dht.c
-libgnunet_plugin_block_dht_la_LIBADD = \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
+libgnunet_plugin_block_seti_test_la_SOURCES = \
+  plugin_block_seti_test.c
+libgnunet_plugin_block_seti_test_la_LIBADD = \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
-libgnunet_plugin_block_dht_la_LDFLAGS = \
+libgnunet_plugin_block_seti_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/seti/meson.build b/src/plugin/seti/meson.build
new file mode 100644
index 000000000..880936164
--- /dev/null
+++ b/src/plugin/seti/meson.build
@@ -0,0 +1,7 @@
+shared_module('gnunet_plugin_block_seti_test',
+              ['plugin_block_seti_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/service/seti/plugin_block_seti_test.c 
b/src/plugin/seti/plugin_block_seti_test.c
similarity index 100%
rename from src/service/seti/plugin_block_seti_test.c
rename to src/plugin/seti/plugin_block_seti_test.c
diff --git a/src/plugin/dht/Makefile.am b/src/plugin/setu/Makefile.am
similarity index 57%
copy from src/plugin/dht/Makefile.am
copy to src/plugin/setu/Makefile.am
index 4df810066..90a14cce0 100644
--- a/src/plugin/dht/Makefile.am
+++ b/src/plugin/setu/Makefile.am
@@ -1,27 +1,21 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-plugindir = $(libdir)/gnunet
-
 pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
+plugindir = $(libdir)/gnunet
 
 plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_dht.la
+  libgnunet_plugin_block_setu_test.la
 
-libgnunet_plugin_block_dht_la_SOURCES = \
-  plugin_block_dht.c
-libgnunet_plugin_block_dht_la_LIBADD = \
-  $(top_builddir)/src/lib/hello/libgnunethello.la \
+libgnunet_plugin_block_setu_test_la_SOURCES = \
+  plugin_block_setu_test.c
+libgnunet_plugin_block_setu_test_la_LIBADD = \
   $(top_builddir)/src/lib/block/libgnunetblock.la \
   $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(LTLIBINTL)
-libgnunet_plugin_block_dht_la_LDFLAGS = \
+libgnunet_plugin_block_setu_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
diff --git a/src/plugin/setu/meson.build b/src/plugin/setu/meson.build
new file mode 100644
index 000000000..e22738ab6
--- /dev/null
+++ b/src/plugin/setu/meson.build
@@ -0,0 +1,7 @@
+shared_module('gnunet_plugin_block_setu_test',
+              ['plugin_block_setu_test.c'],
+              dependencies: libgnunetutil_dep,
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
diff --git a/src/service/setu/plugin_block_setu_test.c 
b/src/plugin/setu/plugin_block_setu_test.c
similarity index 100%
rename from src/service/setu/plugin_block_setu_test.c
rename to src/plugin/setu/plugin_block_setu_test.c
diff --git a/src/service/messenger/Makefile.am 
b/src/service/messenger/Makefile.am
index d778d6e0c..c2ae65a08 100644
--- a/src/service/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -10,19 +10,6 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 
 libexecdir= $(pkglibdir)/libexec/
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_gnsrecord_messenger.la
-
-
-libgnunet_plugin_gnsrecord_messenger_la_SOURCES = \
-  plugin_gnsrecord_messenger.c
-libgnunet_plugin_gnsrecord_messenger_la_LIBADD = \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_gnsrecord_messenger_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 pkgcfg_DATA = \
   messenger.conf
 
diff --git a/src/service/messenger/meson.build 
b/src/service/messenger/meson.build
index a6de2f516..3c05d7760 100644
--- a/src/service/messenger/meson.build
+++ b/src/service/messenger/meson.build
@@ -55,14 +55,6 @@ libgnunetmessenger_dep = declare_dependency(link_with : 
libgnunetmessenger)
 pkg.generate(libgnunetmessenger, url: 'https://www.gnunet.org',
              description : 'Provides API to access the GNUnet Messenger 
subsystem')
 
-shared_module('gnunet_plugin_gnsrecord_messenger',
-              ['plugin_gnsrecord_messenger.c'],
-              dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep,
-                             libgnunetmessenger_dep],
-              include_directories: [incdir, configuration_inc],
-              install: true,
-              install_dir: get_option('libdir')/'gnunet')
-
 executable ('gnunet-service-messenger',
             gnunetservicemessenger_src,
             dependencies: [libgnunetmessenger_dep,
diff --git a/src/service/seti/Makefile.am b/src/service/seti/Makefile.am
index c2d31df9c..00923d56d 100644
--- a/src/service/seti/Makefile.am
+++ b/src/service/seti/Makefile.am
@@ -68,19 +68,5 @@ test_seti_api_LDADD = \
   $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetseti.la
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_seti_test.la
-
-libgnunet_plugin_block_seti_test_la_SOURCES = \
-  plugin_block_seti_test.c
-libgnunet_plugin_block_seti_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_seti_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 EXTRA_DIST = \
   test_seti.conf
diff --git a/src/service/seti/meson.build b/src/service/seti/meson.build
index 8538917d8..1743e327d 100644
--- a/src/service/seti/meson.build
+++ b/src/service/seti/meson.build
@@ -26,12 +26,6 @@ libgnunetseti = library('gnunetseti',
 pkg.generate(libgnunetseti, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set intersection 
service')
 libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
-shared_module('gnunet_plugin_block_seti_test',
-              ['plugin_block_seti_test.c'],
-              dependencies: libgnunetutil_dep,
-              include_directories: [incdir, configuration_inc],
-              install:true,
-              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-seti',
             gnunetserviceseti_src,
             dependencies: [libgnunetseti_dep,
diff --git a/src/service/setu/Makefile.am b/src/service/setu/Makefile.am
index f7f8ed394..f0cf9fdbc 100644
--- a/src/service/setu/Makefile.am
+++ b/src/service/setu/Makefile.am
@@ -88,19 +88,5 @@ perf_setu_api_LDADD = \
   libgnunetsetu.la
 
 
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_setu_test.la
-
-libgnunet_plugin_block_setu_test_la_SOURCES = \
-  plugin_block_setu_test.c
-libgnunet_plugin_block_setu_test_la_LIBADD = \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(LTLIBINTL)
-libgnunet_plugin_block_setu_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
 EXTRA_DIST = \
   test_setu.conf
diff --git a/src/service/setu/meson.build b/src/service/setu/meson.build
index 974f16274..ccfa5762b 100644
--- a/src/service/setu/meson.build
+++ b/src/service/setu/meson.build
@@ -28,12 +28,6 @@ libgnunetsetu = library('gnunetsetu',
 pkg.generate(libgnunetsetu, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the set union service')
 libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
-shared_module('gnunet_plugin_block_setu_test',
-              ['plugin_block_setu_test.c'],
-              dependencies: libgnunetutil_dep,
-              include_directories: [incdir, configuration_inc],
-              install:true,
-              install_dir: get_option('libdir')/'gnunet')
 executable ('gnunet-service-setu',
             gnunetservicesetu_src,
             dependencies: [libgnunetsetu_dep,

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