[gnunet] branch master updated: PEERSTORE: Move DB plugins to plugin dir

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new 7c150fd47 PEERSTORE: Move DB plugins to plugin dir
7c150fd47 is described below

commit 7c150fd478b93a0b579a5290028783455acf0aea
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Oct 20 10:17:24 2023 +0200

    PEERSTORE: Move DB plugins to plugin dir
---
 src/plugin/peerstore/Makefile.am                   | 67 ++++++++++++++++++++++
 src/plugin/peerstore/meson.build                   |  9 +++
 .../peerstore/plugin_peerstore_flat.c              |  0
 .../peerstore/plugin_peerstore_sqlite.c            |  0
 .../peerstore/test_plugin_peerstore.c              |  0
 .../peerstore/test_plugin_peerstore_flat.conf      |  0
 .../peerstore/test_plugin_peerstore_sqlite.conf    |  0
 7 files changed, 76 insertions(+)

diff --git a/src/plugin/peerstore/Makefile.am b/src/plugin/peerstore/Makefile.am
new file mode 100644
index 000000000..225e9a71e
--- /dev/null
+++ b/src/plugin/peerstore/Makefile.am
@@ -0,0 +1,67 @@
+# 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 = -fprofile-arcs -ftest-coverage
+endif
+
+if HAVE_EXPERIMENTAL
+FLAT_PLUGIN = libgnunet_plugin_peerstore_flat.la
+FLAT_TESTS = test_plugin_peerstore_flat
+libgnunet_plugin_peerstore_flat_la_SOURCES = \
+  plugin_peerstore_flat.c
+libgnunet_plugin_peerstore_flat_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la $(XLIBS) \
+  $(LTLIBINTL)
+libgnunet_plugin_peerstore_flat_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
+
+if HAVE_SQLITE
+SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la
+SQLITE_TESTS = test_plugin_peerstore_sqlite
+libgnunet_plugin_peerstore_sqlite_la_SOURCES = \
+  plugin_peerstore_sqlite.c
+libgnunet_plugin_peerstore_sqlite_la_LIBADD = \
+  $(top_builddir)/src/lib/sq/libgnunetsq.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(XLIBS) -lsqlite3 \
+  $(LTLIBINTL)
+libgnunet_plugin_peerstore_sqlite_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
+endif
+
+plugin_LTLIBRARIES = \
+  $(SQLITE_PLUGIN) \
+       $(FLAT_PLUGIN)
+
+test_plugin_peerstore_sqlite_SOURCES = \
+  test_plugin_peerstore.c
+test_plugin_peerstore_sqlite_LDADD = \
+       $(top_builddir)/src/service/testing/libgnunettesting.la \
+       $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_plugin_peerstore_flat_SOURCES = \
+  test_plugin_peerstore.c
+test_plugin_peerstore_flat_LDADD = \
+       $(top_builddir)/src/service/testing/libgnunettesting.la \
+       $(top_builddir)/src/lib/util/libgnunetutil.la
+
+check_PROGRAMS = \
+ $(SQLITE_TESTS) \
+ $(FLAT_TESTS)
+
+EXTRA_DIST = \
+ test_plugin_peerstore_flat.conf \
+ test_plugin_peerstore_sqlite.conf
+
+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)
+endif
diff --git a/src/plugin/peerstore/meson.build b/src/plugin/peerstore/meson.build
new file mode 100644
index 000000000..1d22ca798
--- /dev/null
+++ b/src/plugin/peerstore/meson.build
@@ -0,0 +1,9 @@
+shared_module('gnunet_plugin_peerstore_sqlite',
+        ['plugin_peerstore_sqlite.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetsq_dep,
+                       sqlite_dep],
+        include_directories: [incdir,
+                              configuration_inc],
+        install: true,
+        install_dir: get_option('libdir')/'gnunet')
diff --git a/src/service/peerstore/plugin_peerstore_flat.c 
b/src/plugin/peerstore/plugin_peerstore_flat.c
similarity index 100%
rename from src/service/peerstore/plugin_peerstore_flat.c
rename to src/plugin/peerstore/plugin_peerstore_flat.c
diff --git a/src/service/peerstore/plugin_peerstore_sqlite.c 
b/src/plugin/peerstore/plugin_peerstore_sqlite.c
similarity index 100%
rename from src/service/peerstore/plugin_peerstore_sqlite.c
rename to src/plugin/peerstore/plugin_peerstore_sqlite.c
diff --git a/src/service/peerstore/test_plugin_peerstore.c 
b/src/plugin/peerstore/test_plugin_peerstore.c
similarity index 100%
rename from src/service/peerstore/test_plugin_peerstore.c
rename to src/plugin/peerstore/test_plugin_peerstore.c
diff --git a/src/service/peerstore/test_plugin_peerstore_flat.conf 
b/src/plugin/peerstore/test_plugin_peerstore_flat.conf
similarity index 100%
rename from src/service/peerstore/test_plugin_peerstore_flat.conf
rename to src/plugin/peerstore/test_plugin_peerstore_flat.conf
diff --git a/src/service/peerstore/test_plugin_peerstore_sqlite.conf 
b/src/plugin/peerstore/test_plugin_peerstore_sqlite.conf
similarity index 100%
rename from src/service/peerstore/test_plugin_peerstore_sqlite.conf
rename to src/plugin/peerstore/test_plugin_peerstore_sqlite.conf

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