[gnunet] branch master updated: BUILD: Fix 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 bce615c69 BUILD: Fix meson build
     new 398bb9434 Merge branch 'master' of git+ssh://git.gnunet.org/gnunet
bce615c69 is described below

commit bce615c696f9948376a54a6ddf8c253ea39113bf
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Sep 29 16:00:14 2023 +0200

    BUILD: Fix meson build
---
 contrib/meson.build       |  7 +++++-
 src/dhtu/meson.build      | 14 +++++++++++
 src/meson.build           |  2 +-
 src/reclaim/meson.build   |  2 +-
 src/testing/meson.build   | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 src/transport/meson.build | 50 +++++++++++++++++++++++++++++++++++++++
 6 files changed, 131 insertions(+), 3 deletions(-)

diff --git a/contrib/meson.build b/contrib/meson.build
index 63cf60229..29caa54a7 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -23,5 +23,10 @@ install_data(['gns'/'def.tex',
               'netjail'/'netjail_exec.sh',
               'netjail'/'netjail_start.sh',
               'netjail'/'netjail_stop.sh',
-              'netjail'/'topo.sh'],
+              'netjail'/'topo.sh',
+              ],
               install_dir: get_option('datadir')/'gnunet')
+
+install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
+             install_dir: get_option('datadir')/'applications')
+
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
index bec4c2ec2..34919bb55 100644
--- a/src/dhtu/meson.build
+++ b/src/dhtu/meson.build
@@ -13,6 +13,20 @@ if get_option('monolith')
   endforeach
 endif
 
+libgnunettestingdhtu = library('gnunettestingdhtu',
+        ['testing_dhtu_cmd_send.c'],
+        soversion: '0',
+        version: '0.0.0',
+        dependencies: [
+          libgnunetutil_dep,
+          libgnunetarm_dep,
+          libgnunettesting_dep
+          ],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunettestingdhtu_dep = declare_dependency(link_with : libgnunettestingdhtu)
+
 shared_module('gnunet_plugin_dhtu_ip',
           libgnunetplugindhtuip_src,
           dependencies: [libgnunetutil_dep, m_dep],
diff --git a/src/meson.build b/src/meson.build
index 732e3a62a..ee7e53fc2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,7 +11,7 @@ if get_option('monolith') == false
   subdir('arm')
 endif
 subdir('statistics')
-#$(TESTING)')
+subdir('testing')
 subdir('json', if_found : json_dep)
 subdir('curl', if_found : [curl_dep])
 if get_option('monolith') == false
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index 02ea2ed7d..8afd5c525 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -52,7 +52,7 @@ pkg.generate(libgnunetdid, url: 'https://www.gnunet.org',
              description : 'Provides API to manipulate DID')
 
 shared_module('gnunet_plugin_rest_reclaim',
-              ['plugin_rest_reclaim.c'],
+              ['plugin_rest_reclaim.c', 'json_reclaim.c'],
               dependencies: [libgnunetrest_dep,
                              libgnunetidentity_dep,
                              libgnunetreclaim_dep,
diff --git a/src/testing/meson.build b/src/testing/meson.build
new file mode 100644
index 000000000..d4bcd346d
--- /dev/null
+++ b/src/testing/meson.build
@@ -0,0 +1,59 @@
+libgnunettesting_src = [
+                        'testing_api_cmd_barrier.c',
+                        'testing_api_cmd_barrier_reached.c',
+                        'testing_api_cmd_finish.c',
+                        'testing_api_cmd_local_test_prepared.c',
+                        'testing_api_cmd_send_peer_ready.c',
+                        'testing_api_cmd_block_until_external_trigger.c',
+                        'testing_api_cmd_netjail_start.c',
+                        'testing_api_cmd_netjail_start_cmds_helper.c',
+                        'testing_api_cmd_netjail_stop_cmds_helper.c',
+                        'testing_api_cmd_netjail_stop.c',
+                        'testing.c',
+                        'testing_api_cmd_system_create.c',
+                        'testing_api_cmd_system_destroy.c',
+                        'testing_api_cmd_batch.c',
+                        'testing_api_loop.c',
+                        'testing_api_traits.c'
+                        ]
+
+gnunettesting_src = ['gnunet-testing.c']
+gnunetservicetesting_src = ['gnunet-service-testing.c']
+
+configure_file(input : 'testing.conf',
+               output : 'testing.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
+if get_option('monolith')
+  foreach p : libgnunettesting_src
+    gnunet_src += 'testing/' + p
+  endforeach
+  subdir_done()
+endif
+
+libgnunettesting = library('gnunettesting',
+        libgnunettesting_src,
+        soversion: '0',
+        version: '0.1.0',
+        dependencies: [libgnunetutil_dep,
+                       m_dep,
+                       libgnunetarm_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunettesting_dep = declare_dependency(link_with : libgnunettesting)
+pkg.generate(libgnunettesting, url: 'https://www.gnunet.org',
+             description : 'Provides API for storing GNS records to a 
database')
+
+executable ('gnunet-testing',
+          gnunettesting_src,
+          dependencies: [libgnunettesting_dep,
+                         libgnunetutil_dep,
+                         ],
+          include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('bindir'))
+
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 91d41bae8..9a3a2ebd0 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -41,6 +41,26 @@ pkg.generate(libgnunettransport, url: 
'https://www.gnunet.org',
              description : 'Provides API for accessing the transport service')
 libgnunettransport_dep = declare_dependency(link_with : libgnunettransport)
 
+libgnunettransporttesting = library('gnunettransporttesting',
+        [
+          'transport-testing.c',
+          'transport-testing-filenames.c',
+          'transport-testing-loggers.c',
+          'transport-testing-main.c',
+          'transport-testing-send.c'
+          ],
+        soversion: '2',
+        version: '2.2.0',
+        dependencies: [libgnunetutil_dep,
+                       libgnunettesting_dep,
+                       libgnunettransport_dep,
+                       libgnunetats_dep,
+                       libgnunethello_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+
+
 libgnunettransportapplication = library('gnunettransportapplication',
         libgnunettransportapplication_src,
         soversion: '0',
@@ -89,6 +109,36 @@ pkg.generate(libgnunettransportmonitor, url: 
'https://www.gnunet.org',
              description : 'Provides monitor API for accessing the transport 
service')
 libgnunettransportmonitor_dep = declare_dependency(link_with : 
libgnunettransportmonitor)
 
+libgnunettransporttesting2 = library('gnunettransporttesting2',
+        [
+          'transport_api_traits.c',
+          'transport_api_cmd_connecting_peers.c',
+          'transport_api_cmd_backchannel_check.c',
+          'transport_api_cmd_start_peer.c',
+          'transport_api_cmd_stop_peer.c',
+          'transport_api_cmd_send_simple.c',
+          'transport_api_cmd_send_simple_performance.c',
+          'transport-testing2.c',
+          'transport-testing-filenames2.c',
+          'transport-testing-loggers2.c',
+          'transport-testing-main2.c',
+          'transport-testing-send2.c',
+          'transport-testing-communicator.c',
+          ],
+        soversion: '2',
+        version: '2.2.0',
+        dependencies: [libgnunetutil_dep,
+                       libgnunettransportapplication_dep,
+                       libgnunettransport_dep,
+                       libgnunetpeerstore_dep,
+                       libgnunetats_dep, # FIXME WHY ATS here? Isnt this TNG?
+                       libgnunettesting_dep,
+                       libgnunethello_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+
+
 executable ('gnunet-service-transport',
             gnunetservicetransport_src,
             dependencies: [libgnunettransport_dep, libgnunetutil_dep,

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