aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2023-09-22 12:46:19 +0200
committerMartin Schanzenbach <schanzen@gnunet.org>2023-09-22 12:46:19 +0200
commitae8072c64e79ab54103e6e5267731b7b238586fd (patch)
tree5d8769e58a40e6de7f58c0a1b72969cdc3fb2a91 /src
parent9c8d9a406f119698aa5a7ba7df8ba396828550f7 (diff)
downloadgnunet-ae8072c64e79ab54103e6e5267731b7b238586fd.tar.gz
gnunet-ae8072c64e79ab54103e6e5267731b7b238586fd.zip
BUILD: Towards mode complete build
Diffstat (limited to 'src')
-rw-r--r--src/arm/meson.build95
-rw-r--r--src/ats/meson.build35
-rw-r--r--src/block/meson.build4
-rw-r--r--src/cadet/meson.build76
-rw-r--r--src/core/meson.build37
-rw-r--r--src/datacache/meson.build34
-rw-r--r--src/datastore/meson.build52
7 files changed, 186 insertions, 147 deletions
diff --git a/src/arm/meson.build b/src/arm/meson.build
index 025ec94b1..79ee84cd0 100644
--- a/src/arm/meson.build
+++ b/src/arm/meson.build
@@ -15,53 +15,56 @@ configure_file(input : 'arm.conf.in',
15 install: true, 15 install: true,
16 install_dir: pkgcfgdir) 16 install_dir: pkgcfgdir)
17 17
18if get_option('monolith') == false 18if get_option('monolith')
19 libgnunetarm = library('gnunetarm',
20 libgnunetarm_src,
21 dependencies: libgnunetutil_dep,
22 soversion: '2.0.0',
23 include_directories: [incdir, configuration_inc],
24 install: true,
25 install_dir: get_option('libdir'))
26 libgnunetarm_dep = declare_dependency(link_with : libgnunetarm)
27 executable ('gnunet-arm',
28 gnunetarm_src,
29 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
30 include_directories: [incdir, configuration_inc],
31 install: true,
32 install_dir: get_option('bindir'))
33 executable ('gnunet-service-arm',
34 gnunetservicearm_src,
35 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
36 include_directories: [incdir, configuration_inc],
37 install: true,
38 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
39 testarmapi = executable ('test_arm_api',
40 testarmapi_src,
41 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
42 include_directories: [incdir, configuration_inc],
43 install: false)
44 testexpbo = executable ('test_exponential_backoff',
45 testexpbo_src,
46 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
47 include_directories: [incdir, configuration_inc],
48 install: false)
49 testgnunetservice = executable ('test_gnunet_service',
50 testgnunetservice_src,
51 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
52 include_directories: [incdir, configuration_inc],
53 install: false)
54 configure_file(copy: true,
55 input: 'test_arm_api_data.conf',
56 output: 'test_arm_api_data.conf')
57 test('test_arm_api', testarmapi, workdir: meson.current_source_dir(),
58 suite: 'arm')
59 # FIXME this test currently times out/fails.
60 #test('test_exponential_backoff', testexpbo, workdir: meson.current_source_dir())
61 test('test_gnunet_service', testgnunetservice, workdir: meson.current_source_dir(),
62 suite: 'arm')
63else
64 foreach p : libgnunetarm_src + gnunetservicearm_src 19 foreach p : libgnunetarm_src + gnunetservicearm_src
65 gnunet_src += 'arm/' + p 20 gnunet_src += 'arm/' + p
66 endforeach 21 endforeach
22 subdir_done()
67endif 23endif
24
25libgnunetarm = library('gnunetarm',
26 libgnunetarm_src,
27 dependencies: libgnunetutil_dep,
28 soversion: '2.0.0',
29 include_directories: [incdir, configuration_inc],
30 install: true,
31 install_dir: get_option('libdir'))
32pkg.generate(libgnunetarm, url: 'https://www.gnunet.org',
33 description : 'Provides API for accessing the Automated Restart Manager service')
34libgnunetarm_dep = declare_dependency(link_with : libgnunetarm)
35executable ('gnunet-arm',
36 gnunetarm_src,
37 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
38 include_directories: [incdir, configuration_inc],
39 install: true,
40 install_dir: get_option('bindir'))
41executable ('gnunet-service-arm',
42 gnunetservicearm_src,
43 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
44 include_directories: [incdir, configuration_inc],
45 install: true,
46 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
47testarmapi = executable ('test_arm_api',
48 testarmapi_src,
49 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
50 include_directories: [incdir, configuration_inc],
51 install: false)
52testexpbo = executable ('test_exponential_backoff',
53 testexpbo_src,
54 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
55 include_directories: [incdir, configuration_inc],
56 install: false)
57testgnunetservice = executable ('test_gnunet_service',
58 testgnunetservice_src,
59 dependencies: [libgnunetarm_dep, libgnunetutil_dep],
60 include_directories: [incdir, configuration_inc],
61 install: false)
62configure_file(copy: true,
63 input: 'test_arm_api_data.conf',
64 output: 'test_arm_api_data.conf')
65test('test_arm_api', testarmapi, workdir: meson.current_source_dir(),
66 suite: 'arm')
67# FIXME this test currently times out/fails.
68#test('test_exponential_backoff', testexpbo, workdir: meson.current_source_dir())
69test('test_gnunet_service', testgnunetservice, workdir: meson.current_source_dir(),
70 suite: 'arm')
diff --git a/src/ats/meson.build b/src/ats/meson.build
index 4da79b8bb..de9289efc 100644
--- a/src/ats/meson.build
+++ b/src/ats/meson.build
@@ -19,23 +19,26 @@ configure_file(input : 'ats.conf.in',
19 install: true, 19 install: true,
20 install_dir: pkgcfgdir) 20 install_dir: pkgcfgdir)
21 21
22if get_option('monolith') == false 22if get_option('monolith')
23 libgnunetats = library('gnunetats',
24 libgnunetats_src,
25 dependencies: [libgnunetutil_dep, libgnunethello_dep],
26 include_directories: [incdir, configuration_inc],
27 install: true,
28 install_dir: get_option('libdir'))
29 libgnunetats_dep = declare_dependency(link_with : libgnunetats)
30 executable ('gnunet-service-ats',
31 gnunetserviceats_src,
32 dependencies: [libgnunetats_dep, libgnunetutil_dep,
33 libgnunetnt_dep, libgnunetstatistics_dep],
34 include_directories: [incdir, configuration_inc],
35 install: true,
36 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
37else
38 foreach p : libgnunetats_src + gnunetserviceats_src 23 foreach p : libgnunetats_src + gnunetserviceats_src
39 gnunet_src += 'ats/' + p 24 gnunet_src += 'ats/' + p
40 endforeach 25 endforeach
26 subdir_done()
41endif 27endif
28
29libgnunetats = library('gnunetats',
30 libgnunetats_src,
31 dependencies: [libgnunetutil_dep, libgnunethello_dep],
32 include_directories: [incdir, configuration_inc],
33 install: true,
34 install_dir: get_option('libdir'))
35pkg.generate(libgnunetats, url : 'https://www.gnunet.org',
36 description : 'Provides API for allocating bandwidth, expressing preferences for certain peers and accessing allocation information')
37libgnunetats_dep = declare_dependency(link_with : libgnunetats)
38executable ('gnunet-service-ats',
39 gnunetserviceats_src,
40 dependencies: [libgnunetats_dep, libgnunetutil_dep,
41 libgnunetnt_dep, libgnunetstatistics_dep],
42 include_directories: [incdir, configuration_inc],
43 install: true,
44 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
diff --git a/src/block/meson.build b/src/block/meson.build
index 9cb66552c..660f6e947 100644
--- a/src/block/meson.build
+++ b/src/block/meson.build
@@ -13,6 +13,7 @@ libgnunetblock = library('gnunetblock',
13 dependencies: libgnunetutil_dep, 13 dependencies: libgnunetutil_dep,
14 include_directories: [incdir, configuration_inc], 14 include_directories: [incdir, configuration_inc],
15 install: true, 15 install: true,
16 soversion: '0.0.0',
16 install_dir: get_option('libdir')) 17 install_dir: get_option('libdir'))
17libgnunetblock_dep = declare_dependency(link_with : libgnunetblock) 18libgnunetblock_dep = declare_dependency(link_with : libgnunetblock)
18libgnunetblockgroup = library('gnunetblockgroup', 19libgnunetblockgroup = library('gnunetblockgroup',
@@ -20,6 +21,7 @@ libgnunetblockgroup = library('gnunetblockgroup',
20 dependencies: [libgnunetutil_dep, libgnunetblock_dep], 21 dependencies: [libgnunetutil_dep, libgnunetblock_dep],
21 include_directories: [incdir, configuration_inc], 22 include_directories: [incdir, configuration_inc],
22 install: true, 23 install: true,
24 soversion: '0.0.0',
23 install_dir: get_option('libdir')) 25 install_dir: get_option('libdir'))
24libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup) 26libgnunetblockgroup_dep = declare_dependency(link_with : libgnunetblockgroup)
25plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep] 27plugin_dep = [libgnunetutil_dep, libgnunetblock_dep, libgnunetblockgroup_dep]
@@ -33,6 +35,6 @@ shared_module('gnunet_plugin_block_template',
33 ['plugin_block_template.c'], 35 ['plugin_block_template.c'],
34 dependencies: plugin_dep, 36 dependencies: plugin_dep,
35 include_directories: [incdir, configuration_inc], 37 include_directories: [incdir, configuration_inc],
36 install: true, 38 install: false,
37 install_dir: get_option('libdir')) 39 install_dir: get_option('libdir'))
38 40
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
index 8caea0839..35200542f 100644
--- a/src/cadet/meson.build
+++ b/src/cadet/meson.build
@@ -23,45 +23,47 @@ configure_file(input : 'cadet.conf.in',
23 install: true, 23 install: true,
24 install_dir: pkgcfgdir) 24 install_dir: pkgcfgdir)
25 25
26if get_option('monolith') == false 26if get_option('monolith')
27 libgnunetcadet = library('gnunetcadet', 27 foreach p : libgnunetcadet_src + gnunetservicecadet_src
28 gnunet_src += 'cadet/' + p
29 endforeach
30endif
31
32libgnunetcadet = library('gnunetcadet',
28 libgnunetcadet_src, 33 libgnunetcadet_src,
29 dependencies: libgnunetutil_dep, 34 dependencies: libgnunetutil_dep,
30 include_directories: [incdir, configuration_inc], 35 include_directories: [incdir, configuration_inc],
31 install: true, 36 install: true,
37 soversion: '7.0.0',
32 install_dir: get_option('libdir')) 38 install_dir: get_option('libdir'))
33 libgnunetcadet_dep = declare_dependency(link_with : libgnunetcadet) 39libgnunetcadet_dep = declare_dependency(link_with : libgnunetcadet)
34 executable ('gnunet-cadet', 40executable ('gnunet-cadet',
35 gnunetservicecadet_src, 41 gnunetservicecadet_src,
36 dependencies: [libgnunetcadet_dep, 42 dependencies: [libgnunetcadet_dep,
37 libgnunetutil_dep, 43 libgnunetutil_dep,
38 libgnunetcore_dep, 44 libgnunetcore_dep,
39 libgnunetdht_dep, 45 libgnunetdht_dep,
40 libgnunetstatistics_dep, 46 libgnunetstatistics_dep,
41 libgnunetpeerinfo_dep, 47 libgnunetpeerinfo_dep,
42 libgnunetats_dep, 48 libgnunetats_dep,
43 libgnunettransport_dep, 49 libgnunettransport_dep,
44 libgnunethello_dep], 50 libgnunethello_dep],
45 include_directories: [incdir, configuration_inc], 51 include_directories: [incdir, configuration_inc],
46 install: true, 52 install: true,
47 install_dir: get_option('bindir')) 53 install_dir: get_option('bindir'))
48 executable ('gnunet-service-cadet', 54executable ('gnunet-service-cadet',
49 gnunetservicecadet_src, 55 gnunetservicecadet_src,
50 dependencies: [libgnunetcadet_dep, 56 dependencies: [libgnunetcadet_dep,
51 libgnunetutil_dep, 57 libgnunetutil_dep,
52 libgnunetats_dep, 58 libgnunetats_dep,
53 libgnunetcore_dep, 59 libgnunetcore_dep,
54 libgnunetdht_dep, 60 libgnunetdht_dep,
55 libgnunetstatistics_dep, 61 libgnunetstatistics_dep,
56 libgnunettransport_dep, 62 libgnunettransport_dep,
57 libgnunetpeerinfo_dep, 63 libgnunetpeerinfo_dep,
58 libgnunethello_dep, 64 libgnunethello_dep,
59 libgnunetblock_dep], 65 libgnunetblock_dep],
60 include_directories: [incdir, configuration_inc], 66 include_directories: [incdir, configuration_inc],
61 install: true, 67 install: true,
62 install_dir: get_option('libdir') / 'gnunet' / 'libexec') 68 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
63else 69
64 foreach p : libgnunetcadet_src + gnunetservicecadet_src
65 gnunet_src += 'cadet/' + p
66 endforeach
67endif
diff --git a/src/core/meson.build b/src/core/meson.build
index 24dcdaf57..5493f9ae9 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -13,25 +13,28 @@ configure_file(input : 'core.conf.in',
13 install_dir: pkgcfgdir) 13 install_dir: pkgcfgdir)
14 14
15 15
16if get_option('monolith') == false 16if get_option('monolith')
17 libgnunetcore = library('gnunetcore', 17 foreach p : libgnunetcore_src + gnunetservicecore_src
18 gnunet_src += 'core/' + p
19 endforeach
20endif
21
22libgnunetcore = library('gnunetcore',
18 libgnunetcore_src, 23 libgnunetcore_src,
19 dependencies: libgnunetutil_dep, 24 dependencies: libgnunetutil_dep,
20 include_directories: [incdir, configuration_inc], 25 include_directories: [incdir, configuration_inc],
21 install: true, 26 install: true,
27 soversion: '0.1.0',
22 install_dir: get_option('libdir')) 28 install_dir: get_option('libdir'))
23 libgnunetcore_dep = declare_dependency(link_with : libgnunetcore) 29libgnunetcore_dep = declare_dependency(link_with : libgnunetcore)
24 executable ('gnunet-service-core', 30pkg.generate(libgnunetcore, url: 'https://www.gnunet.org',
25 gnunetservicecore_src, 31 description : 'Provides API for (encrypted) P2P communication')
26 dependencies: [libgnunetcore_dep, libgnunetutil_dep, 32executable ('gnunet-service-core',
27 libgnunetstatistics_dep, 33 gnunetservicecore_src,
28 libgnunettransport_dep, 34 dependencies: [libgnunetcore_dep, libgnunetutil_dep,
29 zlib_dep], 35 libgnunetstatistics_dep,
30 include_directories: [incdir, configuration_inc], 36 libgnunettransport_dep,
31 install: true, 37 zlib_dep],
32 install_dir: get_option('libdir') / 'gnunet' / 'libexec') 38 include_directories: [incdir, configuration_inc],
33else 39 install: true,
34 foreach p : libgnunetcore_src + gnunetservicecore_src 40 install_dir: get_option('libdir') / 'gnunet' / 'libexec')
35 gnunet_src += 'core/' + p
36 endforeach
37endif
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index 39d58e078..a0a439403 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -7,22 +7,28 @@ configure_file(input : 'datacache.conf',
7 configuration : cdata, 7 configuration : cdata,
8 install: true, 8 install: true,
9 install_dir: pkgcfgdir) 9 install_dir: pkgcfgdir)
10install_data ('datacache-0001.sql',
11 'datacache-drop.sql',
12 install_dir: get_option('datadir')/'gnunet'/'sql')
10 13
11if get_option('monolith') == false 14if get_option('monolith')
12 libgnunetdatacache = library('gnunetdatacache',
13 libgnunetdatacache_src,
14 dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
15 include_directories: [incdir, configuration_inc])
16 libgnunetdatacache_dep = declare_dependency(link_with : libgnunetdatacache)
17 libgnunetplugindatacache_sqlite = library('gnunet_plugin_datacache_sqlite',
18 libgnunetplugindatacache_sqlite_src,
19 dependencies: [libgnunetutil_dep,
20 libgnunetdatacache_dep,
21 sqlite_dep,
22 libgnunetsq_dep],
23 include_directories: [incdir, configuration_inc])
24else
25 foreach p : libgnunetdatacache_src 15 foreach p : libgnunetdatacache_src
26 gnunet_src += 'datacache/' + p 16 gnunet_src += 'datacache/' + p
27 endforeach 17 endforeach
28endif 18endif
19
20libgnunetdatacache = library('gnunetdatacache',
21 libgnunetdatacache_src,
22 soversion: '0.1.0',
23 dependencies: [libgnunetutil_dep, libgnunetstatistics_dep],
24 include_directories: [incdir, configuration_inc])
25libgnunetdatacache_dep = declare_dependency(link_with : libgnunetdatacache)
26pkg.generate(libgnunetdatacache, url: 'https://www.gnunet.org',
27 description : 'Provides datacache API for temporary storage to disk')
28shared_module('gnunet_plugin_datacache_sqlite',
29 libgnunetplugindatacache_sqlite_src,
30 dependencies: [libgnunetutil_dep,
31 libgnunetdatacache_dep,
32 sqlite_dep,
33 libgnunetsq_dep],
34 include_directories: [incdir, configuration_inc])
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
index 286965b14..531d8fbdb 100644
--- a/src/datastore/meson.build
+++ b/src/datastore/meson.build
@@ -8,23 +8,43 @@ configure_file(input : 'datastore.conf.in',
8 install: true, 8 install: true,
9 install_dir: pkgcfgdir) 9 install_dir: pkgcfgdir)
10 10
11if get_option('monolith') == false 11install_data ('datastore-0001.sql',
12 libgnunetdatastore = library('gnunetdatastore', 12 'datastore-drop.sql',
13 libgnunetdatastore_src, 13 install_dir: get_option('datadir')/'gnunet'/'sql')
14 dependencies: [libgnunetutil_dep, 14
15 libgnunetstatistics_dep, 15if get_option('monolith')
16 libgnunetdatacache_dep],
17 include_directories: [incdir, configuration_inc])
18 libgnunetdatastore_dep = declare_dependency(link_with : libgnunetdatastore)
19 executable ('gnunet-service-datastore',
20 gnunetservicedatastore_src,
21 dependencies: [libgnunetdatastore_dep,
22 libgnunetutil_dep,
23 libgnunetstatistics_dep,
24 libgnunetdatacache_dep],
25 include_directories: [incdir, configuration_inc])
26else
27 foreach p : libgnunetdatastore_src + gnunetservicedatastore_src 16 foreach p : libgnunetdatastore_src + gnunetservicedatastore_src
28 gnunet_src += 'datastore/' + p 17 gnunet_src += 'datastore/' + p
29 endforeach 18 endforeach
30endif 19endif
20libgnunetdatastore = library('gnunetdatastore',
21 libgnunetdatastore_src,
22 soversion: '1.0.0',
23 dependencies: [libgnunetutil_dep,
24 libgnunetstatistics_dep,
25 libgnunetdatacache_dep],
26 include_directories: [incdir, configuration_inc])
27libgnunetdatastore_dep = declare_dependency(link_with : libgnunetdatastore)
28pkg.generate(libgnunetdatastore, url: 'https://www.gnunet.org',
29 description : 'Management API for the datastore for persistent storage to disk')
30executable ('gnunet-datastore',
31 ['gnunet-datastore.c'],
32 dependencies: [libgnunetdatastore_dep,
33 libgnunetutil_dep,
34 libgnunetstatistics_dep,
35 libgnunetdatacache_dep],
36 include_directories: [incdir, configuration_inc])
37executable ('gnunet-service-datastore',
38 gnunetservicedatastore_src,
39 dependencies: [libgnunetdatastore_dep,
40 libgnunetutil_dep,
41 libgnunetstatistics_dep,
42 libgnunetdatacache_dep],
43 include_directories: [incdir, configuration_inc])
44shared_module('gnunet_plugin_datastore_sqlite',
45 ['plugin_datastore_sqlite.c'],
46 dependencies: [libgnunetutil_dep,
47 libgnunetdatastore_dep,
48 sqlite_dep,
49 libgnunetsq_dep],
50 include_directories: [incdir, configuration_inc])
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 04:02:33 +0000