diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2023-09-29 16:00:14 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2023-09-29 16:00:14 +0200 |
commit | bce615c696f9948376a54a6ddf8c253ea39113bf (patch) | |
tree | 321a155eb132d904681c5701919aa6d036b06a5d | |
parent | d43a6c820edcf173fe4822bdf15a3ecb6ca32cf6 (diff) | |
download | gnunet-bce615c696f9948376a54a6ddf8c253ea39113bf.tar.gz gnunet-bce615c696f9948376a54a6ddf8c253ea39113bf.zip |
BUILD: Fix meson build
-rw-r--r-- | contrib/meson.build | 7 | ||||
-rw-r--r-- | src/dhtu/meson.build | 14 | ||||
-rw-r--r-- | src/meson.build | 2 | ||||
-rw-r--r-- | src/reclaim/meson.build | 2 | ||||
-rw-r--r-- | src/testing/meson.build | 59 | ||||
-rw-r--r-- | 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', | |||
23 | 'netjail'/'netjail_exec.sh', | 23 | 'netjail'/'netjail_exec.sh', |
24 | 'netjail'/'netjail_start.sh', | 24 | 'netjail'/'netjail_start.sh', |
25 | 'netjail'/'netjail_stop.sh', | 25 | 'netjail'/'netjail_stop.sh', |
26 | 'netjail'/'topo.sh'], | 26 | 'netjail'/'topo.sh', |
27 | ], | ||
27 | install_dir: get_option('datadir')/'gnunet') | 28 | install_dir: get_option('datadir')/'gnunet') |
29 | |||
30 | install_data('xdg-scheme-handler'/'gnunet-uri.desktop', | ||
31 | install_dir: get_option('datadir')/'applications') | ||
32 | |||
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') | |||
13 | endforeach | 13 | endforeach |
14 | endif | 14 | endif |
15 | 15 | ||
16 | libgnunettestingdhtu = library('gnunettestingdhtu', | ||
17 | ['testing_dhtu_cmd_send.c'], | ||
18 | soversion: '0', | ||
19 | version: '0.0.0', | ||
20 | dependencies: [ | ||
21 | libgnunetutil_dep, | ||
22 | libgnunetarm_dep, | ||
23 | libgnunettesting_dep | ||
24 | ], | ||
25 | include_directories: [incdir, configuration_inc], | ||
26 | install: true, | ||
27 | install_dir: get_option('libdir')) | ||
28 | libgnunettestingdhtu_dep = declare_dependency(link_with : libgnunettestingdhtu) | ||
29 | |||
16 | shared_module('gnunet_plugin_dhtu_ip', | 30 | shared_module('gnunet_plugin_dhtu_ip', |
17 | libgnunetplugindhtuip_src, | 31 | libgnunetplugindhtuip_src, |
18 | dependencies: [libgnunetutil_dep, m_dep], | 32 | 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 | |||
11 | subdir('arm') | 11 | subdir('arm') |
12 | endif | 12 | endif |
13 | subdir('statistics') | 13 | subdir('statistics') |
14 | #$(TESTING)') | 14 | subdir('testing') |
15 | subdir('json', if_found : json_dep) | 15 | subdir('json', if_found : json_dep) |
16 | subdir('curl', if_found : [curl_dep]) | 16 | subdir('curl', if_found : [curl_dep]) |
17 | if get_option('monolith') == false | 17 | 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', | |||
52 | description : 'Provides API to manipulate DID') | 52 | description : 'Provides API to manipulate DID') |
53 | 53 | ||
54 | shared_module('gnunet_plugin_rest_reclaim', | 54 | shared_module('gnunet_plugin_rest_reclaim', |
55 | ['plugin_rest_reclaim.c'], | 55 | ['plugin_rest_reclaim.c', 'json_reclaim.c'], |
56 | dependencies: [libgnunetrest_dep, | 56 | dependencies: [libgnunetrest_dep, |
57 | libgnunetidentity_dep, | 57 | libgnunetidentity_dep, |
58 | libgnunetreclaim_dep, | 58 | 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 @@ | |||
1 | libgnunettesting_src = [ | ||
2 | 'testing_api_cmd_barrier.c', | ||
3 | 'testing_api_cmd_barrier_reached.c', | ||
4 | 'testing_api_cmd_finish.c', | ||
5 | 'testing_api_cmd_local_test_prepared.c', | ||
6 | 'testing_api_cmd_send_peer_ready.c', | ||
7 | 'testing_api_cmd_block_until_external_trigger.c', | ||
8 | 'testing_api_cmd_netjail_start.c', | ||
9 | 'testing_api_cmd_netjail_start_cmds_helper.c', | ||
10 | 'testing_api_cmd_netjail_stop_cmds_helper.c', | ||
11 | 'testing_api_cmd_netjail_stop.c', | ||
12 | 'testing.c', | ||
13 | 'testing_api_cmd_system_create.c', | ||
14 | 'testing_api_cmd_system_destroy.c', | ||
15 | 'testing_api_cmd_batch.c', | ||
16 | 'testing_api_loop.c', | ||
17 | 'testing_api_traits.c' | ||
18 | ] | ||
19 | |||
20 | gnunettesting_src = ['gnunet-testing.c'] | ||
21 | gnunetservicetesting_src = ['gnunet-service-testing.c'] | ||
22 | |||
23 | configure_file(input : 'testing.conf', | ||
24 | output : 'testing.conf', | ||
25 | configuration : cdata, | ||
26 | install: true, | ||
27 | install_dir: pkgcfgdir) | ||
28 | |||
29 | |||
30 | if get_option('monolith') | ||
31 | foreach p : libgnunettesting_src | ||
32 | gnunet_src += 'testing/' + p | ||
33 | endforeach | ||
34 | subdir_done() | ||
35 | endif | ||
36 | |||
37 | libgnunettesting = library('gnunettesting', | ||
38 | libgnunettesting_src, | ||
39 | soversion: '0', | ||
40 | version: '0.1.0', | ||
41 | dependencies: [libgnunetutil_dep, | ||
42 | m_dep, | ||
43 | libgnunetarm_dep], | ||
44 | include_directories: [incdir, configuration_inc], | ||
45 | install: true, | ||
46 | install_dir: get_option('libdir')) | ||
47 | libgnunettesting_dep = declare_dependency(link_with : libgnunettesting) | ||
48 | pkg.generate(libgnunettesting, url: 'https://www.gnunet.org', | ||
49 | description : 'Provides API for storing GNS records to a database') | ||
50 | |||
51 | executable ('gnunet-testing', | ||
52 | gnunettesting_src, | ||
53 | dependencies: [libgnunettesting_dep, | ||
54 | libgnunetutil_dep, | ||
55 | ], | ||
56 | include_directories: [incdir, configuration_inc], | ||
57 | install: true, | ||
58 | install_dir: get_option('bindir')) | ||
59 | |||
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', | |||
41 | description : 'Provides API for accessing the transport service') | 41 | description : 'Provides API for accessing the transport service') |
42 | libgnunettransport_dep = declare_dependency(link_with : libgnunettransport) | 42 | libgnunettransport_dep = declare_dependency(link_with : libgnunettransport) |
43 | 43 | ||
44 | libgnunettransporttesting = library('gnunettransporttesting', | ||
45 | [ | ||
46 | 'transport-testing.c', | ||
47 | 'transport-testing-filenames.c', | ||
48 | 'transport-testing-loggers.c', | ||
49 | 'transport-testing-main.c', | ||
50 | 'transport-testing-send.c' | ||
51 | ], | ||
52 | soversion: '2', | ||
53 | version: '2.2.0', | ||
54 | dependencies: [libgnunetutil_dep, | ||
55 | libgnunettesting_dep, | ||
56 | libgnunettransport_dep, | ||
57 | libgnunetats_dep, | ||
58 | libgnunethello_dep], | ||
59 | include_directories: [incdir, configuration_inc], | ||
60 | install: true, | ||
61 | install_dir: get_option('libdir')) | ||
62 | |||
63 | |||
44 | libgnunettransportapplication = library('gnunettransportapplication', | 64 | libgnunettransportapplication = library('gnunettransportapplication', |
45 | libgnunettransportapplication_src, | 65 | libgnunettransportapplication_src, |
46 | soversion: '0', | 66 | soversion: '0', |
@@ -89,6 +109,36 @@ pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org', | |||
89 | description : 'Provides monitor API for accessing the transport service') | 109 | description : 'Provides monitor API for accessing the transport service') |
90 | libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor) | 110 | libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor) |
91 | 111 | ||
112 | libgnunettransporttesting2 = library('gnunettransporttesting2', | ||
113 | [ | ||
114 | 'transport_api_traits.c', | ||
115 | 'transport_api_cmd_connecting_peers.c', | ||
116 | 'transport_api_cmd_backchannel_check.c', | ||
117 | 'transport_api_cmd_start_peer.c', | ||
118 | 'transport_api_cmd_stop_peer.c', | ||
119 | 'transport_api_cmd_send_simple.c', | ||
120 | 'transport_api_cmd_send_simple_performance.c', | ||
121 | 'transport-testing2.c', | ||
122 | 'transport-testing-filenames2.c', | ||
123 | 'transport-testing-loggers2.c', | ||
124 | 'transport-testing-main2.c', | ||
125 | 'transport-testing-send2.c', | ||
126 | 'transport-testing-communicator.c', | ||
127 | ], | ||
128 | soversion: '2', | ||
129 | version: '2.2.0', | ||
130 | dependencies: [libgnunetutil_dep, | ||
131 | libgnunettransportapplication_dep, | ||
132 | libgnunettransport_dep, | ||
133 | libgnunetpeerstore_dep, | ||
134 | libgnunetats_dep, # FIXME WHY ATS here? Isnt this TNG? | ||
135 | libgnunettesting_dep, | ||
136 | libgnunethello_dep], | ||
137 | include_directories: [incdir, configuration_inc], | ||
138 | install: true, | ||
139 | install_dir: get_option('libdir')) | ||
140 | |||
141 | |||
92 | executable ('gnunet-service-transport', | 142 | executable ('gnunet-service-transport', |
93 | gnunetservicetransport_src, | 143 | gnunetservicetransport_src, |
94 | dependencies: [libgnunettransport_dep, libgnunetutil_dep, | 144 | dependencies: [libgnunettransport_dep, libgnunetutil_dep, |