[gnunet] branch master updated: BUILD: scalarproduct meson

[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 f02d9a270 BUILD: scalarproduct meson
f02d9a270 is described below

commit f02d9a27000aec7eb424eda767e14b4edbc77efb
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Sep 24 10:26:38 2023 +0200

    BUILD: scalarproduct meson
---
 src/meson.build               |  4 +--
 src/peerinfo-tool/meson.build | 22 +++++++------
 src/pq/meson.build            | 16 ++++++----
 src/scalarproduct/meson.build | 73 ++++++++++++++++++++++++++++++++++++++-----
 src/secretsharing/meson.build | 41 ++++++++++++++++++++++++
 src/util/meson.build          |  2 +-
 6 files changed, 132 insertions(+), 26 deletions(-)

diff --git a/src/meson.build b/src/meson.build
index 64fa54ca0..40cc1ebbb 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,7 +51,7 @@ subdir('set')
 subdir('seti')
 subdir('setu')
 subdir('consensus')
-#subdir('scalarproduct')
+subdir('scalarproduct')
 subdir('revocation')
 subdir('vpn')
 subdir('gns')
@@ -61,7 +61,7 @@ subdir('fs')
 # TODO
 subdir('exit')
 subdir('pt')
-#subdir('secretsharing')
+subdir('secretsharing')
 subdir('reclaim')
 subdir('messenger')
 ##subdir('$(EXP_DIR)')
diff --git a/src/peerinfo-tool/meson.build b/src/peerinfo-tool/meson.build
index a16e9bcf0..f44121c29 100644
--- a/src/peerinfo-tool/meson.build
+++ b/src/peerinfo-tool/meson.build
@@ -1,13 +1,17 @@
 gnunetpeerinfotool_src = ['gnunet-peerinfo.c', 'gnunet-peerinfo_plugins.c']
 
 
-if get_option('monolith') == false
-  executable ('gnunet-peerinfo',
-              gnunetpeerinfotool_src,
-              dependencies: [libgnunetutil_dep,
-                             libgnunetpeerinfo_dep,
-                             libgnunettransport_dep,
-                             libgnunethello_dep,
-                             libgnunetstatistics_dep],
-              include_directories: [incdir, configuration_inc])
+if get_option('monolith')
+  subdir_done()
 endif
+
+executable ('gnunet-peerinfo',
+            gnunetpeerinfotool_src,
+            dependencies: [libgnunetutil_dep,
+                           libgnunetpeerinfo_dep,
+                           libgnunettransport_dep,
+                           libgnunethello_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
diff --git a/src/pq/meson.build b/src/pq/meson.build
index 273a0c0fb..7e9060b41 100644
--- a/src/pq/meson.build
+++ b/src/pq/meson.build
@@ -7,14 +7,18 @@ libgnunetpq_src = ['pq.c',
                    'pq_query_helper.c',
                    'pq_result_helper.c']
 
-if get_option('monolith') == false
-  libgnunetpq = library('gnunetpq',
-          libgnunetpq_src,
-          dependencies: [libgnunetutil_dep, pq_dep],
-          include_directories: [incdir, configuration_inc])
-  libgnunetpq_dep = declare_dependency(link_with : libgnunetpq)
+if get_option('monolith')
 else
   foreach p : libgnunetpq_src
     gnunet_src += 'pq/' + p
   endforeach
+  subdir_done()
 endif
+
+libgnunetpq = library('gnunetpq',
+        libgnunetpq_src,
+        dependencies: [libgnunetutil_dep, pq_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetpq_dep = declare_dependency(link_with : libgnunetpq)
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
index 05e6d44f0..f158f9bc1 100644
--- a/src/scalarproduct/meson.build
+++ b/src/scalarproduct/meson.build
@@ -1,10 +1,9 @@
 libgnunetscalarproduct_src = ['scalarproduct_api.c']
 
-gnunetservicescalarproduct_src = ['gnunet-service-scalarproduct.c',
-                        'gnunet-service-scalarproduct_union.c',
-                        'gnunet-service-scalarproduct_intersection.c',
-                        
'gnunet-service-scalarproduct_union_strata_estimator.c',
-                        'ibf.c']
+gnunetservicescalarproducta_src = ['gnunet-service-scalarproduct_alice.c']
+gnunetservicescalarproductb_src = ['gnunet-service-scalarproduct_bob.c']
+gnunetservicescalarproductecca_src = 
['gnunet-service-scalarproduct-ecc_alice.c']
+gnunetservicescalarproducteccb_src = ['gnunet-service-scalarproduct-ecc_bob.c']
 
 configure_file(input : 'scalarproduct.conf.in',
                output : 'scalarproduct.conf',
@@ -22,19 +21,77 @@ endif
 
 libgnunetscalarproduct = library('gnunetscalarproduct',
         libgnunetscalarproduct_src,
-        dependencies: libgnunetutil_dep,
+        dependencies: [libgnunetutil_dep,
+                       gcrypt_dep],
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir'))
 pkg.generate(libgnunetscalarproduct, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the scalarproduct 
service')
 libgnunetscalarproduct_dep = declare_dependency(link_with : 
libgnunetscalarproduct)
-executable ('gnunet-service-scalarproduct',
-            gnunetservicescalarproduct_src,
+
+executable ('gnunet-scalarproduct',
+            ['gnunet-scalarproduct.c'],
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('bindir'))
+
+executable ('gnunet-service-scalarproduct-alice',
+            gnunetservicescalarproducta_src,
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetseti_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-service-scalarproduct-bob',
+            gnunetservicescalarproductb_src,
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetseti_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-service-scalarproduct-ecc-alice',
+            gnunetservicescalarproductecca_src,
+            dependencies: [libgnunetscalarproduct_dep,
+                           libgnunetutil_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetcore_dep,
+                           gcrypt_dep,
+                           sodium_dep,
+                           libgnunetseti_dep,
+                           libgnunetcadet_dep,
+                           libgnunetblock_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-service-scalarproduct-ecc-bob',
+            gnunetservicescalarproducteccb_src,
             dependencies: [libgnunetscalarproduct_dep,
                            libgnunetutil_dep,
                            libgnunetstatistics_dep,
                            libgnunetcore_dep,
+                           gcrypt_dep,
+                           sodium_dep,
+                           libgnunetseti_dep,
                            libgnunetcadet_dep,
                            libgnunetblock_dep],
             include_directories: [incdir, configuration_inc],
diff --git a/src/secretsharing/meson.build b/src/secretsharing/meson.build
new file mode 100644
index 000000000..07d7611b2
--- /dev/null
+++ b/src/secretsharing/meson.build
@@ -0,0 +1,41 @@
+libgnunetsecretsharing_src = ['secretsharing_api.c', 'secretsharing_common.c']
+
+gnunetservicesecretsharing_src = ['gnunet-service-secretsharing.c', 
'secretsharing_common.c']
+
+configure_file(input : 'secretsharing.conf.in',
+               output : 'secretsharing.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+if get_option('monolith')
+  foreach p : libgnunetsecretsharing_src + gnunetservicesecretsharing_src
+    gnunet_src += 'secretsharing/' + p
+  endforeach
+endif
+
+libgnunetsecretsharing = library('gnunetsecretsharing',
+        libgnunetsecretsharing_src,
+        dependencies: [libgnunetutil_dep,
+                       libgnunetstatistics_dep,
+                       gcrypt_dep,
+                       libgnunetdatacache_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetsecretsharing_dep = declare_dependency(link_with : 
libgnunetsecretsharing)
+pkg.generate(libgnunetsecretsharing, url: 'https://www.gnunet.org',
+             description : 'Provides API for the secretsharing service')
+
+executable ('gnunet-service-secretsharing',
+            gnunetservicesecretsharing_src,
+            dependencies: [libgnunetsecretsharing_dep,
+                           libgnunetutil_dep,
+                           gcrypt_dep,
+                           libgnunetconsensus_dep,
+                           libgnunetstatistics_dep,
+                           libgnunetdatacache_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/util/meson.build b/src/util/meson.build
index f790a403a..c59787a93 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -23,7 +23,7 @@ libgnunetutil_src = ['bandwidth.c',
        'crypto_cs.c',
        'crypto_ecc.c',
        'crypto_ecc_gnsrecord.c',
-       #'$(DLOG)',
+       'crypto_ecc_dlog.c',
        'crypto_ecc_setup.c',
        'crypto_edx25519.c',
        'crypto_hash.c',

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