[gnunet] branch master updated: BUILD: More meson files

[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 422f4d137 BUILD: More meson files
422f4d137 is described below

commit 422f4d1372529287075010ecabc5c12765515d98
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Wed Sep 20 15:35:44 2023 +0200

    BUILD: More meson files
---
 meson.build                   | 20 +++++++++++++-
 src/ats/meson.build           | 31 ++++++++++++++++++++++
 src/core/meson.build          | 40 +++++++++++++++++++---------
 src/dht/meson.build           | 38 +++++++++++++++++++++++++++
 src/dhtu/meson.build          | 26 ++++++++++++++++++
 src/fragmentation/meson.build | 14 ++++++++++
 src/meson.build               | 20 +++++++-------
 src/nat-auto/meson.build      | 21 +++++++++++++++
 src/nat/meson.build           | 26 ++++++++++++++++++
 src/nse/meson.build           | 21 +++++++++++++++
 src/peerstore/meson.build     | 21 +++++++++++++++
 src/transport/meson.build     | 61 +++++++++++++++++++++++++++++++++++++++++++
 12 files changed, 316 insertions(+), 23 deletions(-)

diff --git a/meson.build b/meson.build
index c77833905..43918b9b7 100644
--- a/meson.build
+++ b/meson.build
@@ -19,6 +19,23 @@ cdata.set_quoted('GNUNET_DEFAULT_INTERFACE', 'en0')
 cdata.set_quoted('VCS_VERSION', 'mesonbuild')
 add_project_arguments('-DHAVE_CONFIG_H', language : 'c')
 
+# Compiler settings
+  add_project_arguments('-fno-strict-aliasing', language : 'c')
+if compiler.has_argument('-Wno-address-of-packed-member')
+  add_project_arguments('-Wno-address-of-packed-member', language : 'c')
+endif
+if compiler.has_argument('-Wno-tautological-constant-out-of-range-compare')
+  add_project_arguments('-Wno-tautological-constant-out-of-range-compare', 
language : 'c')
+endif
+
+
+if host_machine.system() == 'darwin'
+  cdata.set_quoted('GNUNET_DEFAULT_INTERFACE', 'en0')
+  add_project_arguments('-D_APPLE_C_SOURCE', language : 'c')
+  add_project_arguments('-D__APPLE_USE_RFC_3542', language : 'c')
+  add_project_arguments('-fno-common', language : 'c')
+endif
+
 
 # FIXME: Not all dependencies here yet
 ltdl_dep = compiler.find_library('ltdl', required : true)
@@ -28,8 +45,9 @@ curl_dep = dependency('libcurl')
 zlib_dep = dependency('zlib')
 mhd_dep = dependency('libmicrohttpd')
 json_dep = compiler.find_library('jansson', required : true)
+gcrypt_dep = dependency('libgcrypt')
 gnunetdeps = [mhd_dep,
-              dependency('libgcrypt'),
+              gcrypt_dep,
               dependency('libsodium'),
               curl_dep,
               json_dep,
diff --git a/src/ats/meson.build b/src/ats/meson.build
new file mode 100644
index 000000000..f08358e3a
--- /dev/null
+++ b/src/ats/meson.build
@@ -0,0 +1,31 @@
+libgnunetats_src = ['ats_api_connectivity.c',
+                    'ats_api_scheduling.c',
+                    'ats_api_scanner.c',
+                    'ats_api_performance.c']
+
+gnunetserviceats_src = ['gnunet-service-ats.c',
+                        'gnunet-service-ats_addresses.c',
+                        'gnunet-service-ats_connectivity.c',
+                        'gnunet-service-ats_normalization.c',
+                        'gnunet-service-ats_performance.c',
+                        'gnunet-service-ats_plugins.c',
+                        'gnunet-service-ats_preferences.c',
+                        'gnunet-service-ats_scheduling.c',
+                        'gnunet-service-ats_reservations.c']
+
+if gnunet_monolith == false
+  libgnunetats = library('gnunetats',
+          libgnunetats_src,
+          dependencies: [libgnunetutil_dep, libgnunethello_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetats_dep = declare_dependency(link_with : libgnunetats)
+  executable ('gnunet-service-ats',
+              gnunetserviceats_src,
+              dependencies: [libgnunetats_dep, libgnunetutil_dep,
+                             libgnunetnt_dep, libgnunetstatistics_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetats_src + gnunetserviceats_src
+    gnunet_src += 'ats/' + p
+  endforeach
+endif
diff --git a/src/core/meson.build b/src/core/meson.build
index 3644f7f2b..f288294a3 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -1,12 +1,28 @@
-coresrc = ['core_api.c',
-           'core_api_monitor_peers.c',
-           'gnunet-service-core.c',
-           'gnunet-service-core_kx.c',
-           'gnunet-service-core_sessions.c',
-           'gnunet-service-core_typemap.c'
-                ]
-
-library('gnunetcore',
-        coresrc,
-        dependencies: gnunetutil_dep,
-        include_directories: [incdir, configuration_inc])
+libgnunetcore_src = ['core_api.c',
+                    'core_api_monitor_peers.c']
+
+gnunetservicecore_src = ['gnunet-service-core.c',
+                        'gnunet-service-core_kx.c',
+                        'gnunet-service-core_sessions.c',
+                        'gnunet-service-core_typemap.c']
+
+
+
+if gnunet_monolith == false
+  libgnunetcore = library('gnunetcore',
+          libgnunetcore_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetcore_dep = declare_dependency(link_with : libgnunetcore)
+  executable ('gnunet-service-core',
+              gnunetservicecore_src,
+              dependencies: [libgnunetcore_dep, libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunettransport_dep,
+                             zlib_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetcore_src + gnunetservicecore_src
+    gnunet_src += 'core/' + p
+  endforeach
+endif
diff --git a/src/dht/meson.build b/src/dht/meson.build
new file mode 100644
index 000000000..130cef644
--- /dev/null
+++ b/src/dht/meson.build
@@ -0,0 +1,38 @@
+libgnunetdht_src = ['dht_api.c']
+
+libgnunetpluginblockdht_src = ['plugin_block_dht.c']
+
+gnunetservicedht_src = ['gnunet-service-dht.c',
+                        'gnunet-service-dht_datacache.c',
+                        'gnunet-service-dht_neighbours.c',
+                        'gnunet-service-dht_routing.c']
+
+
+if gnunet_monolith == false
+  libgnunetdht = library('gnunetdht',
+          libgnunetdht_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetdht_dep = declare_dependency(link_with : libgnunetdht)
+  libgnunetpluginblockdht = library('gnunet_plugin_block_dht',
+          libgnunetpluginblockdht_src,
+          dependencies: [libgnunetutil_dep,
+                         libgnunethello_dep,
+                         libgnunetblock_dep,
+                         libgnunetblockgroup_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetpluginblockdht_dep = declare_dependency(link_with : 
libgnunetpluginblockdht)
+  executable ('gnunet-service-dht',
+              gnunetservicedht_src,
+              dependencies: [libgnunetdht_dep, libgnunetutil_dep,
+                             libgnunetblock_dep,
+                             libgnunetdatacache_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetblockgroup_dep,
+                             libgnunethello_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetdht_src + gnunetservicedht_src
+    gnunet_src += 'dht/' + p
+  endforeach
+endif
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
new file mode 100644
index 000000000..2383f2524
--- /dev/null
+++ b/src/dhtu/meson.build
@@ -0,0 +1,26 @@
+libgnunetplugindhtuip_src = ['plugin_dhtu_ip.c']
+libgnunetplugindhtugnunet_src = ['plugin_dhtu_gnunet.c']
+
+
+if gnunet_monolith == false
+  libgnunetplugindhtuip = library('gnunet_plugin_dhtu_ip',
+          libgnunetplugindhtuip_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetplugindhtuip_dep = declare_dependency(link_with : 
libgnunetplugindhtuip)
+  libgnunetplugindhtugnunet = library('gnunet_plugin_dhtu_gnunet',
+          libgnunetplugindhtugnunet_src,
+          dependencies: [libgnunetutil_dep,
+                         libgnunetats_dep,
+                         libgnunetcore_dep,
+                         libgnunethello_dep,
+                         libgnunetpeerinfo_dep,
+                         libgnunetnse_dep,
+                         libgnunettransport_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetplugindhtugnunet_dep = declare_dependency(link_with : 
libgnunetplugindhtugnunet)
+else
+  foreach p : libgnunetplugindhtuip_src + libgnunetplugindhtugnunet_src
+    gnunet_src += 'dhtu/' + p
+  endforeach
+endif
diff --git a/src/fragmentation/meson.build b/src/fragmentation/meson.build
new file mode 100644
index 000000000..244902574
--- /dev/null
+++ b/src/fragmentation/meson.build
@@ -0,0 +1,14 @@
+libgnunetfragmentation_src = ['fragmentation.c',
+                              'defragmentation.c']
+
+if gnunet_monolith == false
+  libgnunetfragmentation = library('gnunetfragmentation',
+          libgnunetfragmentation_src,
+          dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetfragmentation_dep = declare_dependency(link_with : 
libgnunetfragmentation)
+else
+  foreach p : libgnunetfragmentation_src
+    gnunet_src += 'fragmentation/' + p
+  endforeach
+endif
diff --git a/src/meson.build b/src/meson.build
index 09dc00f4d..0e7d1aa8a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -25,18 +25,18 @@ endif
 subdir('datacache')
 subdir('datastore')
 #subdir('template')
-#subdir('peerstore')
-#subdir('ats')
-#subdir('nat')
-#subdir('nat-auto')
-#subdir('fragmentation')
-#subdir('transport')
+subdir('peerstore')
+subdir('ats')
+subdir('nat')
+subdir('nat-auto')
+subdir('fragmentation')
+subdir('transport')
 #subdir('ats-tool')
-#subdir('core')
+subdir('core')
 ##subdir('$(TESTBED)')
-#subdir('nse')
-#subdir('dhtu')
-#subdir('dht')
+subdir('nse')
+subdir('dhtu')
+subdir('dht')
 #subdir('hostlist')
 #subdir('topology')
 #subdir('regex')
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
new file mode 100644
index 000000000..ed3ef6907
--- /dev/null
+++ b/src/nat-auto/meson.build
@@ -0,0 +1,21 @@
+libgnunetnatauto_src = ['nat_auto_api.c',
+                        'nat_auto_api_test.c']
+
+gnunetservicenatauto_src = ['gnunet-nat-server.c']
+
+
+if gnunet_monolith == false
+  libgnunetnatauto = library('gnunetnatauto',
+          libgnunetnatauto_src,
+          dependencies: [libgnunetutil_dep, libgnunetnat_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
+  executable ('gnunet-nat-server',
+              gnunetservicenatauto_src,
+              dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, 
libgnunetnat_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetnatauto_src + gnunetservicenatauto_src
+    gnunet_src += 'natauto/' + p
+  endforeach
+endif
diff --git a/src/nat/meson.build b/src/nat/meson.build
new file mode 100644
index 000000000..5a0e7622f
--- /dev/null
+++ b/src/nat/meson.build
@@ -0,0 +1,26 @@
+libgnunetnat_src = ['nat_api.c',
+                    'nat_api_stun.c']
+
+gnunetservicenat_src = ['gnunet-service-nat.c',
+                        'gnunet-service-nat.c',
+                        'gnunet-service-nat_externalip.c',
+                        'gnunet-service-nat_stun.c',
+                        'gnunet-service-nat_mini.c',
+                        'gnunet-service-nat_helper.c']
+
+if gnunet_monolith == false
+  libgnunetnat = library('gnunetnat',
+          libgnunetnat_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetnat_dep = declare_dependency(link_with : libgnunetnat)
+  executable ('gnunet-service-nat',
+              gnunetservicenat_src,
+              dependencies: [libgnunetnat_dep, libgnunetutil_dep,
+                             libgnunetstatistics_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetnat_src + gnunetservicenat_src
+    gnunet_src += 'nat/' + p
+  endforeach
+endif
diff --git a/src/nse/meson.build b/src/nse/meson.build
new file mode 100644
index 000000000..f0e0dfa2e
--- /dev/null
+++ b/src/nse/meson.build
@@ -0,0 +1,21 @@
+libgnunetnse_src = ['nse_api.c']
+
+gnunetservicense_src = ['gnunet-service-nse.c']
+
+if gnunet_monolith == false
+  libgnunetnse = library('gnunetnse',
+          libgnunetnse_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetnse_dep = declare_dependency(link_with : libgnunetnse)
+  executable ('gnunet-service-nse',
+              gnunetservicense_src,
+              dependencies: [libgnunetnse_dep, libgnunetutil_dep,
+                             libgnunetcore_dep,
+                             libgnunetstatistics_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetnse_src + gnunetservicense_src
+    gnunet_src += 'nse/' + p
+  endforeach
+endif
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
new file mode 100644
index 000000000..fbaf791a2
--- /dev/null
+++ b/src/peerstore/meson.build
@@ -0,0 +1,21 @@
+libgnunetpeerstore_src = ['peerstore_api.c',
+                          'peerstore_common.c']
+
+gnunetservicepeerstore_src = ['gnunet-service-peerstore.c']
+
+
+if gnunet_monolith == false
+  libgnunetpeerstore = library('gnunetpeerstore',
+          libgnunetpeerstore_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetpeerstore_dep = declare_dependency(link_with : libgnunetpeerstore)
+  executable ('gnunet-service-peerstore',
+              gnunetservicepeerstore_src,
+              dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetpeerstore_src + gnunetservicepeerstore_src
+    gnunet_src += 'peerstore/' + p
+  endforeach
+endif
diff --git a/src/transport/meson.build b/src/transport/meson.build
new file mode 100644
index 000000000..09e6c35a3
--- /dev/null
+++ b/src/transport/meson.build
@@ -0,0 +1,61 @@
+libgnunettransport_src = ['transport_api_address_to_string.c',
+                          'transport_api_blacklist.c',
+                          'transport_api_core.c',
+                          'transport_api_hello_get.c',
+                          'transport_api_manipulation.c',
+                          'transport_api_monitor_peers.c',
+                          'transport_api_monitor_plugins.c',
+                          'transport_api_offer_hello.c']
+libgnunettransportapplication_src = ['transport_api2_application.c']
+libgnunettransportcore_src = ['transport_api2_core.c']
+libgnunettransportcommunicator_src = ['transport_api2_communication.c']
+libgnunettransportmonitor_src = ['transport_api2_monitor.c']
+
+gnunetservicetransport_src = ['gnunet-service-tng.c']
+gnunetcommunicatortcp_src = ['gnunet-communicator-tcp.c']
+gnunetcommunicatorudp_src = ['gnunet-communicator-udp.c']
+
+
+if gnunet_monolith == false
+  libgnunettransport = library('gnunettransport',
+          libgnunettransport_src,
+          dependencies: [libgnunetutil_dep, libgnunetats_dep, 
libgnunethello_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunettransport_dep = declare_dependency(link_with : libgnunettransport)
+
+  libgnunettransportapplication = library('gnunettransportapplication',
+          libgnunettransportapplication_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunettransportapplication_dep = declare_dependency(link_with : 
libgnunettransportapplication)
+
+  libgnunettransportcore = library('gnunettransportcore',
+          libgnunettransportcore_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunettransportcore_dep = declare_dependency(link_with : 
libgnunettransportcore)
+
+  libgnunettransportcommunicator = library('gnunettransportcommunicator',
+          libgnunettransportcommunicator_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunettransportcommunicator_dep = declare_dependency(link_with : 
libgnunettransportcommunicator)
+
+  libgnunettransportmonitor = library('gnunettransportmonitor',
+          libgnunettransportmonitor_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunettransportmonitor_dep = declare_dependency(link_with : 
libgnunettransportmonitor)
+  executable ('gnunet-service-transport',
+              gnunetservicetransport_src,
+              dependencies: [libgnunettransport_dep, libgnunetutil_dep,
+                             libgnunethello_dep,
+                             libgnunetpeerstore_dep,
+                             libgnunetstatistics_dep,
+                             gcrypt_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunettransport_src + libgnunettransportapplication_src + 
libgnunettransportcore_src + libgnunettransportcommunicator_src + 
libgnunettransportmonitor_src + gnunetservicetransport_src
+    gnunet_src += 'transport/' + p
+  endforeach
+endif

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