commit 61527ff1d9dbb8980e91fbe06597dec89af04f73
parent 6f68c34aa3deed8e1b5df30d3de1342386523920
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 4 Oct 2023 10:32:46 +0200
BUILD: Make meson build without ats, tesbed, peerinfo
Diffstat:
11 files changed, 111 insertions(+), 104 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -72,6 +72,7 @@ src/conversation/microphone.c
src/conversation/plugin_gnsrecord_conversation.c
src/conversation/speaker.c
src/core/core_api.c
+src/core/core_api_cmd_connecting_peers.c
src/core/core_api_monitor_peers.c
src/core/gnunet-core.c
src/core/gnunet-service-core.c
@@ -428,6 +429,7 @@ src/testing/testing_api_cmd_barrier.c
src/testing/testing_api_cmd_barrier_reached.c
src/testing/testing_api_cmd_batch.c
src/testing/testing_api_cmd_block_until_external_trigger.c
+src/testing/testing_api_cmd_exec_bash_script.c
src/testing/testing_api_cmd_finish.c
src/testing/testing_api_cmd_local_test_prepared.c
src/testing/testing_api_cmd_netjail_start.c
@@ -435,6 +437,8 @@ src/testing/testing_api_cmd_netjail_start_cmds_helper.c
src/testing/testing_api_cmd_netjail_stop.c
src/testing/testing_api_cmd_netjail_stop_cmds_helper.c
src/testing/testing_api_cmd_send_peer_ready.c
+src/testing/testing_api_cmd_start_peer.c
+src/testing/testing_api_cmd_stop_peer.c
src/testing/testing_api_cmd_system_create.c
src/testing/testing_api_cmd_system_destroy.c
src/testing/testing_api_loop.c
@@ -589,8 +593,13 @@ src/vpn/gnunet-vpn.c
src/vpn/vpn_api.c
src/zonemaster/gnunet-service-zonemaster.c
src/fs/fs_api.h
+src/include/gnunet_ats_application_service.h
+src/include/gnunet_ats_service.h
+src/include/gnunet_ats_transport_service.h
src/include/gnunet_json_lib.h
src/include/gnunet_pq_lib.h
+src/include/gnunet_transport_hello_service.h
+src/include/gnunet_transport_service.h
src/pq/pq.h
src/testbed/testbed_api.h
src/testbed/testbed_api_operations.h
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
@@ -49,9 +49,8 @@ executable ('gnunet-cadet',
libgnunetdht_dep,
m_dep,
libgnunetstatistics_dep,
- libgnunetpeerinfo_dep,
- libgnunetats_dep,
- libgnunettransport_dep,
+ libgnunetpeerstore_dep,
+ libgnunettransportapplication_dep,
libgnunethello_dep],
include_directories: [incdir, configuration_inc],
install: true,
@@ -60,13 +59,12 @@ executable ('gnunet-service-cadet',
gnunetservicecadet_src,
dependencies: [libgnunetcadet_dep,
libgnunetutil_dep,
- libgnunetats_dep,
m_dep,
libgnunetcore_dep,
libgnunetdht_dep,
libgnunetstatistics_dep,
- libgnunettransport_dep,
- libgnunetpeerinfo_dep,
+ libgnunettransportapplication_dep,
+ libgnunetpeerstore_dep,
libgnunethello_dep,
libgnunetblock_dep],
include_directories: [incdir, configuration_inc],
diff --git a/src/core/meson.build b/src/core/meson.build
@@ -42,7 +42,7 @@ executable ('gnunet-service-core',
gnunetservicecore_src,
dependencies: [libgnunetcore_dep, libgnunetutil_dep,
libgnunetstatistics_dep,
- libgnunettransport_dep,
+ libgnunettransportcore_dep,
zlib_dep],
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
@@ -37,13 +37,12 @@ shared_module('gnunet_plugin_dhtu_ip',
shared_module('gnunet_plugin_dhtu_gnunet',
libgnunetplugindhtugnunet_src,
dependencies: [libgnunetutil_dep,
- libgnunetats_dep,
m_dep,
libgnunetcore_dep,
libgnunethello_dep,
- libgnunetpeerinfo_dep,
+ libgnunetpeerstore_dep,
libgnunetnse_dep,
- libgnunettransport_dep],
+ ],
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir')/'gnunet')
diff --git a/src/fs/meson.build b/src/fs/meson.build
@@ -122,7 +122,6 @@ executable ('gnunet-service-fs',
libgnunetdht_dep,
libgnunetidentity_dep,
m_dep,
- libgnunetats_dep,
libgnunetcadet_dep,
libgnunetpeerstore_dep,
libgnunetdatastore_dep,
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
@@ -17,9 +17,8 @@ executable ('gnunet-daemon-hostlist',
dependencies: [libgnunetutil_dep,
libgnunetcore_dep,
libgnunethello_dep,
- libgnunetpeerinfo_dep,
+ libgnunetpeerstore_dep,
libgnunetstatistics_dep,
- libgnunettransport_dep,
mhd_dep,
curl_dep],
include_directories: [incdir, configuration_inc],
diff --git a/src/meson.build b/src/meson.build
@@ -17,22 +17,23 @@ subdir('curl', if_found : [curl_dep])
if get_option('monolith') == false
subdir('rest')
endif
-subdir('peerinfo')
+#subdir('peerinfo')
subdir('sq', if_found : [sqlite_dep])
subdir('pq', if_found : [pq_dep])
subdir('datacache')
subdir('datastore')
#subdir('template')
subdir('peerstore')
-subdir('ats')
+#subdir('ats')
subdir('nat')
subdir('nat-auto')
subdir('fragmentation')
subdir('transport')
-subdir('ats-tool')
+#subdir('ats-tool')
subdir('core')
-subdir('testbed-logger')
-subdir('testbed')
+# Testbed needs old transport
+#subdir('testbed-logger')
+#subdir('testbed')
subdir('nse')
subdir('dhtu')
subdir('dht')
@@ -44,7 +45,7 @@ subdir('identity')
subdir('gnsrecord')
subdir('namecache')
subdir('namestore')
-subdir('peerinfo-tool')
+#subdir('peerinfo-tool')
subdir('cadet')
subdir('set')
subdir('seti')
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
@@ -21,7 +21,7 @@ libgnunetpeerstore = library('gnunetpeerstore',
libgnunetpeerstore_src,
soversion: '0',
version: '0.0.0',
- dependencies: libgnunetutil_dep,
+ dependencies: [libgnunetutil_dep, libgnunethello_dep],
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir'))
@@ -41,7 +41,9 @@ shared_module('gnunet_plugin_peerstore_sqlite',
executable ('gnunet-service-peerstore',
gnunetservicepeerstore_src,
- dependencies: [libgnunetpeerstore_dep, libgnunetutil_dep],
+ dependencies: [libgnunetpeerstore_dep,
+ libgnunetutil_dep,
+ libgnunethello_dep],
include_directories: [incdir, configuration_inc],
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
diff --git a/src/testbed/meson.build b/src/testbed/meson.build
@@ -37,7 +37,7 @@ libgnunettestbed = library('gnunettestbed',
libgnunetstatistics_dep,
libgnunethello_dep,
libgnunettesting_dep,
- libgnunettransport_dep,
+ #libgnunettransport_dep,
libgnunetarm_dep],
include_directories: [incdir, configuration_inc],
install: true,
@@ -52,11 +52,11 @@ executable ('gnunet-helper-testbed',
dependencies: [libgnunetutil_dep,
libgnunetcore_dep,
libgnunethello_dep,
- libgnunetpeerinfo_dep,
+ libgnunetpeerstore_dep,
libgnunetstatistics_dep,
libgnunettestbed_dep,
libgnunettesting_dep,
- libgnunettransport_dep,
+ #libgnunettransport_dep,
zlib_dep],
include_directories: [incdir, configuration_inc],
install:true,
@@ -66,9 +66,10 @@ executable ('gnunet-daemon-testbed-blacklist',
dependencies: [libgnunetutil_dep,
libgnunetcore_dep,
libgnunethello_dep,
- libgnunetpeerinfo_dep,
+ libgnunetpeerstore_dep,
libgnunetstatistics_dep,
- libgnunettransport_dep],
+ #libgnunettransport_dep
+ ],
include_directories: [incdir, configuration_inc],
install:true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
@@ -78,9 +79,9 @@ executable ('gnunet-daemon-testbed-underlay',
dependencies: [libgnunetutil_dep,
libgnunetcore_dep,
libgnunethello_dep,
- libgnunetpeerinfo_dep,
+ libgnunetpeerstore_dep,
libgnunetstatistics_dep,
- libgnunettransport_dep,
+ #libgnunettransport_dep,
sqlite_dep],
include_directories: [incdir, configuration_inc],
install:true,
@@ -89,7 +90,7 @@ executable ('gnunet-daemon-testbed-underlay',
executable ('gnunet-testbed-profiler',
['gnunet-testbed-profiler.c'],
dependencies: [libgnunetutil_dep,
- libgnunetats_dep,
+ #libgnunetats_dep,
libgnunettestbed_dep],
include_directories: [incdir, configuration_inc],
install:true,
@@ -106,22 +107,23 @@ executable ('gnunet-service-testbed',
'gnunet-service-testbed_connectionpool.c'],
dependencies: [libgnunetutil_dep,
libgnunetcore_dep,
- libgnunetats_dep,
+ # libgnunetats_dep,
libgnunetarm_dep,
libgnunethello_dep,
libgnunettestbed_dep,
libgnunettesting_dep,
- libgnunettransport_dep,
+ #libgnunettransport_dep,
zlib_dep],
include_directories: [incdir, configuration_inc],
install:true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
-executable ('gnunet-daemon-latency-logger',
- ['gnunet-daemon-latency-logger.c'],
- dependencies: [libgnunetutil_dep,
- libgnunetats_dep,
- sqlite_dep],
- include_directories: [incdir, configuration_inc],
- install:true,
- install_dir: get_option('libdir')/'gnunet'/'libexec')
+# Needs ATS
+#executable ('gnunet-daemon-latency-logger',
+# ['gnunet-daemon-latency-logger.c'],
+# dependencies: [libgnunetutil_dep,
+# #libgnunetats_dep,
+# sqlite_dep],
+# include_directories: [incdir, configuration_inc],
+# install:true,
+# install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/topology/meson.build b/src/topology/meson.build
@@ -33,10 +33,9 @@ executable ('gnunet-daemon-topology',
dependencies: [libgnunetfriends_dep,
libgnunetutil_dep,
libgnunetcore_dep,
- libgnunetpeerinfo_dep,
+ libgnunetpeerstore_dep,
libgnunetstatistics_dep,
- libgnunettransport_dep,
- libgnunetats_dep,
+ libgnunettransportapplication_dep,
libgnunethello_dep],
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/transport/meson.build b/src/transport/meson.build
@@ -40,36 +40,36 @@ if get_option('monolith')
endforeach
endif
-libgnunettransport = library('gnunettransport',
- libgnunettransport_src,
- soversion: '2',
- version: '2.2.0',
- dependencies: [libgnunetutil_dep, libgnunetats_dep, libgnunethello_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir'))
-pkg.generate(libgnunettransport, url: 'https://www.gnunet.org',
- description : 'Provides API for accessing the transport service')
-libgnunettransport_dep = declare_dependency(link_with : libgnunettransport)
+#libgnunettransport = library('gnunettransport',
+# libgnunettransport_src,
+# soversion: '2',
+# version: '2.2.0',
+# dependencies: [libgnunetutil_dep, libgnunetats_dep, libgnunethello_dep],
+# include_directories: [incdir, configuration_inc],
+# install: true,
+# install_dir: get_option('libdir'))
+#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: '0',
- version: '0.0.0',
- dependencies: [libgnunetutil_dep,
- libgnunettesting_dep,
- libgnunettransport_dep,
- libgnunetats_dep,
- libgnunethello_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir'))
+#libgnunettransporttesting = library('gnunettransporttesting',
+# [
+# 'transport-testing.c',
+# 'transport-testing-filenames.c',
+# 'transport-testing-loggers.c',
+# 'transport-testing-main.c',
+# 'transport-testing-send.c'
+# ],
+# soversion: '0',
+# version: '0.0.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',
@@ -129,20 +129,19 @@ libgnunettransporttesting2 = library('gnunettransporttesting2',
'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-testing2.c',
+ #'transport-testing-filenames2.c',
+ #'transport-testing-loggers2.c',
+ #'transport-testing-main2.c',
+ #'transport-testing-send2.c',
'transport-testing-communicator.c',
],
soversion: '0',
version: '0.0.0',
dependencies: [libgnunetutil_dep,
+ libgnunettransportcore_dep,
libgnunettransportapplication_dep,
- libgnunettransport_dep,
libgnunetpeerstore_dep,
- libgnunetats_dep,
libgnunettesting_dep,
libgnunethello_dep],
include_directories: [incdir, configuration_inc],
@@ -150,17 +149,17 @@ libgnunettransporttesting2 = library('gnunettransporttesting2',
install_dir: get_option('libdir'))
libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)
-executable ('gnunet-service-transport',
- gnunetservicetransport_src,
- dependencies: [libgnunettransport_dep, libgnunetutil_dep,
- libgnunethello_dep,
- libgnunetpeerstore_dep,
- m_dep,
- libgnunetstatistics_dep,
- gcrypt_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+#executable ('gnunet-service-transport',
+# gnunetservicetransport_src,
+# dependencies: [libgnunettransport_dep, libgnunetutil_dep,
+# libgnunethello_dep,
+# libgnunetpeerstore_dep,
+# m_dep,
+# libgnunetstatistics_dep,
+# gcrypt_dep],
+# include_directories: [incdir, configuration_inc],
+# install: true,
+# install_dir: get_option('libdir') / 'gnunet' / 'libexec')
executable ('gnunet-communicator-unix',
gnunetcommunicatorunix_src,
@@ -200,23 +199,23 @@ executable ('gnunet-communicator-tcp',
install: true,
install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-executable ('gnunet-transport',
- ['gnunet-transport.c'],
- dependencies: [libgnunettransportcommunicator_dep,
- libgnunethello_dep,
- libgnunettransport_dep,
- libgnunetpeerstore_dep,
- libgnunetutil_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('bindir'))
+#executable ('gnunet-transport',
+# ['gnunet-transport.c'],
+# dependencies: [libgnunettransportcommunicator_dep,
+# libgnunethello_dep,
+# libgnunettransport_dep,
+# libgnunetpeerstore_dep,
+# libgnunetutil_dep],
+# include_directories: [incdir, configuration_inc],
+# install: true,
+# install_dir: get_option('bindir'))
libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send',
['test_transport_plugin_cmd_simple_send.c'],
dependencies: [
libgnunetutil_dep,
- libgnunettransporttesting2_dep,
libgnunettransportapplication_dep,
+ libgnunettransporttesting2_dep,
libgnunettransportcore_dep,
libgnunettesting_dep,
libgnunetpeerstore_dep,
@@ -233,8 +232,8 @@ libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_
['test_transport_plugin_cmd_simple_send_broadcast.c'],
dependencies: [
libgnunetutil_dep,
- libgnunettransporttesting2_dep,
libgnunettransportapplication_dep,
+ libgnunettransporttesting2_dep,
libgnunettransportcore_dep,
libgnunettesting_dep,
libgnunetpeerstore_dep,
@@ -251,8 +250,8 @@ libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_
['test_transport_plugin_cmd_simple_send_dv.c'],
dependencies: [
libgnunetutil_dep,
- libgnunettransporttesting2_dep,
libgnunettransportapplication_dep,
+ libgnunettransporttesting2_dep,
libgnunettransportcore_dep,
libgnunettesting_dep,
libgnunetpeerstore_dep,
@@ -269,8 +268,8 @@ libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugi
['test_transport_plugin_cmd_simple_send_performance.c'],
dependencies: [
libgnunetutil_dep,
- libgnunettransporttesting2_dep,
libgnunettransportapplication_dep,
+ libgnunettransporttesting2_dep,
libgnunettransportcore_dep,
libgnunettesting_dep,
libgnunetpeerstore_dep,
@@ -305,8 +304,8 @@ libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_n
['test_transport_plugin_cmd_nat_upnp.c'],
dependencies: [
libgnunetutil_dep,
- libgnunettransporttesting2_dep,
libgnunettransportapplication_dep,
+ libgnunettransporttesting2_dep,
libgnunettransportcore_dep,
libgnunettesting_dep,
libgnunetpeerstore_dep,
