[gnunet] branch master updated: BUILD: Add more subsystems to meson build

[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 5398c1739 BUILD: Add more subsystems to meson build
5398c1739 is described below

commit 5398c17398c79cf168fd42fdb3663334caf5a22a
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Sep 20 18:33:50 2023 +0200

    BUILD: Add more subsystems to meson build
---
 meson.build           |  8 +++++++-
 src/cadet/meson.build | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/meson.build       |  8 ++++----
 src/set/meson.build   | 29 ++++++++++++++++++++++++++
 src/seti/meson.build  | 25 +++++++++++++++++++++++
 src/setu/meson.build  | 27 +++++++++++++++++++++++++
 6 files changed, 148 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index db6611880..7ae72fc5f 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,6 @@
 ## EXPERIMENTAL --- WORK IN PROGRESS --- USE AT YOUR OWN PERIL --- ##
-project('gnunet', 'c', license: 'AGPLv3')
+project('gnunet', 'c', license: 'AGPLv3',
+        version: run_command('sh', 'contrib/get_version.sh', check: 
true).stdout().strip())
 
 compiler = meson.get_compiler('c')
 incdir = include_directories('src/include')
@@ -84,6 +85,8 @@ mhd_dep = dependency('libmicrohttpd')
 json_dep = compiler.find_library('jansson', required : true)
 gcrypt_dep = dependency('libgcrypt')
 sodium_dep = dependency('libsodium')
+cc = meson.get_compiler('c')
+m_dep = cc.find_library('m', required : false)
 gnunetdeps = [mhd_dep,
               sodium_dep,
               gcrypt_dep,
@@ -100,6 +103,9 @@ add_project_arguments('-DNEED_LIBGCRYPT_VERSION="1.6.0"', 
language : 'c')
 if compiler.has_header('sys/time.h')
   add_project_arguments('-DHAVE_SYS_TIME_H', language : 'c')
 endif
+if compiler.has_header('sys/param.h')
+  add_project_arguments('-DHAVE_SYS_PARAM_H', language : 'c')
+endif
 
 if compiler.has_header('idn2.h')
   add_project_arguments('-DHAVE_LIBIDN2', language : 'c')
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
new file mode 100644
index 000000000..9534fc35b
--- /dev/null
+++ b/src/cadet/meson.build
@@ -0,0 +1,56 @@
+libgnunetcadet_src = ['cadet_api.c',
+                      'cadet_api_drop_message.c',
+                      'cadet_api_get_channel.c',
+                      'cadet_api_get_path.c',
+                      'cadet_api_list_peers.c',
+                      'cadet_api_list_tunnels.c',
+                      'cadet_api_helper.c']
+
+gnunetcadet_src = ['gnunet-cadet.c']
+gnunetservicecadet_src = ['gnunet-service-cadet.c',
+                          'gnunet-service-cadet_channel.c',
+                          'gnunet-service-cadet_connection.c',
+                          'gnunet-service-cadet_core.c',
+                          'gnunet-service-cadet_dht.c',
+                          'gnunet-service-cadet_hello.c',
+                          'gnunet-service-cadet_tunnels.c',
+                          'gnunet-service-cadet_paths.c',
+                          'gnunet-service-cadet_peer.c']
+
+
+if gnunet_monolith == false
+  libgnunetcadet = library('gnunetcadet',
+          libgnunetcadet_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetcadet_dep = declare_dependency(link_with : libgnunetcadet)
+  executable ('gnunet-cadet',
+              gnunetservicecadet_src,
+              dependencies: [libgnunetcadet_dep,
+                             libgnunetutil_dep,
+                             libgnunetcore_dep,
+                             libgnunetdht_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetpeerinfo_dep,
+                             libgnunetats_dep,
+                             libgnunettransport_dep,
+                             libgnunethello_dep],
+              include_directories: [incdir, configuration_inc])
+  executable ('gnunet-service-cadet',
+              gnunetservicecadet_src,
+              dependencies: [libgnunetcadet_dep,
+                             libgnunetutil_dep,
+                             libgnunetats_dep,
+                             libgnunetcore_dep,
+                             libgnunetdht_dep,
+                             libgnunetstatistics_dep,
+                             libgnunettransport_dep,
+                             libgnunetpeerinfo_dep,
+                             libgnunethello_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetcadet_src + gnunetservicecadet_src + gnunetcadet_src
+    gnunet_src += 'cadet/' + p
+  endforeach
+endif
diff --git a/src/meson.build b/src/meson.build
index bd8464d11..0598ca828 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -47,10 +47,10 @@ subdir('gnsrecord')
 subdir('namecache')
 subdir('namestore')
 subdir('peerinfo-tool')
-#subdir('cadet')
-#subdir('set')
-#subdir('seti')
-#subdir('setu')
+subdir('cadet')
+subdir('set')
+subdir('seti')
+subdir('setu')
 #subdir('consensus')
 #subdir('scalarproduct')
 #subdir('revocation')
diff --git a/src/set/meson.build b/src/set/meson.build
new file mode 100644
index 000000000..77ff86718
--- /dev/null
+++ b/src/set/meson.build
@@ -0,0 +1,29 @@
+libgnunetset_src = ['set_api.c']
+
+gnunetserviceset_src = ['gnunet-service-set.c',
+                        'gnunet-service-set_union.c',
+                        'gnunet-service-set_intersection.c',
+                        'gnunet-service-set_union_strata_estimator.c',
+                        'ibf.c']
+
+
+if gnunet_monolith == false
+  libgnunetset = library('gnunetset',
+          libgnunetset_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetset_dep = declare_dependency(link_with : libgnunetset)
+  executable ('gnunet-service-set',
+              gnunetserviceset_src,
+              dependencies: [libgnunetset_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetcadet_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetset_src + gnunetserviceset_src
+    gnunet_src += 'set/' + p
+  endforeach
+endif
diff --git a/src/seti/meson.build b/src/seti/meson.build
new file mode 100644
index 000000000..36311da2f
--- /dev/null
+++ b/src/seti/meson.build
@@ -0,0 +1,25 @@
+libgnunetseti_src = ['seti_api.c']
+
+gnunetserviceseti_src = ['gnunet-service-seti.c']
+
+
+if gnunet_monolith == false
+  libgnunetseti = library('gnunetseti',
+          libgnunetseti_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetseti_dep = declare_dependency(link_with : libgnunetseti)
+  executable ('gnunet-service-seti',
+              gnunetserviceseti_src,
+              dependencies: [libgnunetseti_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetcadet_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetseti_src + gnunetserviceseti_src
+    gnunet_src += 'seti/' + p
+  endforeach
+endif
diff --git a/src/setu/meson.build b/src/setu/meson.build
new file mode 100644
index 000000000..f4c3cea4e
--- /dev/null
+++ b/src/setu/meson.build
@@ -0,0 +1,27 @@
+libgnunetsetu_src = ['setu_api.c']
+
+gnunetservicesetu_src = ['gnunet-service-setu.c',
+                         'ibf.c',
+                         'gnunet-service-setu_strata_estimator.c']
+
+
+if gnunet_monolith == false
+  libgnunetsetu = library('gnunetsetu',
+          libgnunetsetu_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetsetu_dep = declare_dependency(link_with : libgnunetsetu)
+  executable ('gnunet-service-setu',
+              gnunetservicesetu_src,
+              dependencies: [libgnunetsetu_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetcadet_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetsetu_src + gnunetservicesetu_src
+    gnunet_src += 'setu/' + p
+  endforeach
+endif

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