BUILD: Meson add testbed option (dysfunct)

12 files changed, 126 insertions, 6 deletions

diff --git a/meson.options b/meson.options
index 0d5b7e325..9959aaedc 100644
--- a/meson.options
+++ b/meson.options
@@ -1,5 +1,6 @@
 # Build options
 option('monolith', type : 'boolean', value : false, description: 'Build a single, monolithic libgnunet shlib')
+option('testbed', type : 'boolean', value : false, description: 'Build the testbed')
 option('experimental', type : 'boolean', value : false, description: 'Build experimental components')
 option('logging', type : 'string', value: 'yes', description: 'Log setting. Can be set to "yes" (logging, default), "no" (no logging), "verbose" (extra loggin"), veryverbose (even more logging)')
 
diff --git a/src/consensus/meson.build b/src/consensus/meson.build
index b23b8cdff..b67017ab3 100644
--- a/src/consensus/meson.build
+++ b/src/consensus/meson.build
@@ -27,6 +27,15 @@ pkg.generate(libgnunetconsensus, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the consensus service')
 libgnunetarm_dep = declare_dependency(link_with : libgnunetarm)
 libgnunetconsensus_dep = declare_dependency(link_with : libgnunetconsensus)
+
+shared_module('gnunet_plugin_block_consensus',
+              ['plugin_block_consensus.c'],
+              dependencies: [libgnunetutil_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
 executable ('gnunet-service-consensus',
             gnunetserviceconsensus_src,
             dependencies: [libgnunetconsensus_dep,
diff --git a/src/dht/meson.build b/src/dht/meson.build
index 83ce8ad9e..f42ae354c 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -35,7 +35,9 @@ shared_module('gnunet_plugin_block_dht',
                        libgnunethello_dep,
                        libgnunetblock_dep,
                        libgnunetblockgroup_dep],
-        include_directories: [incdir, configuration_inc])
+        include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
 
 executable ('gnunet-dht',
             gnunetservicedht_src,
diff --git a/src/fs/meson.build b/src/fs/meson.build
index ca0b7ef95..63a5d9a39 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -55,6 +55,13 @@ libgnunetfs_dep = declare_dependency(link_with : libgnunetfs)
 pkg.generate(libgnunetfs, url: 'https://www.gnunet.org',
              description : 'Provides API for GNUnet File-Sharing service')
 
+shared_module('gnunet_plugin_block_fs',
+              ['plugin_block_fs.c'],
+              dependencies: [libgnunetutil_dep,
+                             libgnunetblockgroup_dep],
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
 
 executable ('gnunet-search',
             'gnunet-search.c',
diff --git a/src/gns/meson.build b/src/gns/meson.build
index bb9fac065..bce7dccb5 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -55,6 +55,14 @@ shared_module('gnunet_plugin_gnsrecord_gns',
         include_directories: [incdir, configuration_inc],
         install: true,
         install_dir: get_option('libdir')/'gnunet')
+shared_module('gnunet_plugin_block_gns',
+              ['plugin_block_gns.c'],
+              dependencies: [libgnunetutil_dep,
+                             libgnunetgnsrecord_dep,
+                             libgnunetblockgroup_dep],
+              include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
 
 
 executable ('gnunet-gns',
diff --git a/src/meson.build b/src/meson.build
index 3da201f9b..732e3a62a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,7 +31,10 @@ subdir('fragmentation')
 subdir('transport')
 #subdir('ats-tool')
 subdir('core')
-##subdir('$(TESTBED)')
+if get_option('testbed')
+  #subdir('testbed-logger')
+  subdir('testbed')
+endif
 subdir('nse')
 subdir('dhtu')
 subdir('dht')
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index e57bf46e7..133c98d6c 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -106,4 +106,18 @@ executable ('gnunet-service-namestore',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-namestore-fcfsd',
+            ['gnunet-namestore-fcfsd.c'],
+            dependencies: [libgnunetnamestore_dep,
+                           libgnunetutil_dep,
+                           libgnunetnamecache_dep,
+                           libgnunetgnsrecord_dep,
+                           libgnunetidentity_dep,
+                           mhd_dep,
+                           json_dep,
+                           libgnunetjson_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
 
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index 9c6f5a0d0..a7d31d005 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -1,7 +1,8 @@
 libgnunetnatauto_src = ['nat_auto_api.c',
                         'nat_auto_api_test.c']
 
-gnunetservicenatauto_src = ['gnunet-nat-server.c']
+gnunetservernat_src = ['gnunet-nat-server.c']
+gnunetservicenatauto_src = ['gnunet-service-nat-auto.c']
 
 configure_file(input : 'nat-auto.conf.in',
                output : 'nat-auto.conf',
@@ -10,7 +11,7 @@ configure_file(input : 'nat-auto.conf.in',
                install_dir: pkgcfgdir)
 
 if get_option('monolith')
-  foreach p : libgnunetnatauto_src + gnunetservicenatauto_src
+  foreach p : libgnunetnatauto_src + gnunetservernatauto_src + gnunetservicenatauto_src
     gnunet_src += 'nat-auto/' + p
   endforeach
   subdir_done()
@@ -32,9 +33,17 @@ executable ('gnunet-nat-auto',
             install: true,
             install_dir: get_option('bindir'))
 executable ('gnunet-nat-server',
-            gnunetservicenatauto_src,
+            gnunetservernat_src,
             dependencies: [libgnunetnatauto_dep, libgnunetutil_dep, libgnunetnat_dep],
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-service-nat-auto',
+            gnunetservicenatauto_src,
+            dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
+                           libgnunetnat_dep,
+                           libgnunetstatistics_dep],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
 
diff --git a/src/nat/meson.build b/src/nat/meson.build
index 415d6cbb3..e629f6411 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -33,6 +33,16 @@ libgnunetnat = library('gnunetnat',
 libgnunetnat_dep = declare_dependency(link_with : libgnunetnat)
 pkg.generate(libgnunetnat, url: 'https://www.gnunet.org',
              description : 'Provides API for accessing the NAT service')
+libgnunetnat = library('gnunetnatnew',
+        ['nat_api.c',
+          'nat_api_stun.c'],
+        soversion: '2',
+        version: '2.0.0',
+        dependencies: libgnunetutil_dep,
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunetnat_dep = declare_dependency(link_with : libgnunetnat)
 
 executable ('gnunet-nat',
             ['gnunet-nat.c'],
diff --git a/src/regex/meson.build b/src/regex/meson.build
index f1bbfa1b8..c8c3fd506 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -41,6 +41,17 @@ libgnunetregexblock = library('gnunetregexblock',
         install_dir: get_option('libdir'))
 libgnunetregexblock_dep = declare_dependency(link_with : libgnunetregexblock)
 
+shared_module('gnunet_plugin_block_regex',
+        ['plugin_block_regex.c'],
+        dependencies: [libgnunetutil_dep,
+                       libgnunetregexblock_dep,
+                       libgnunetblock_dep,
+                       libgnunetblockgroup_dep],
+        include_directories: [incdir, configuration_inc],
+              install:true,
+              install_dir: get_option('libdir')/'gnunet')
+
+
 executable ('gnunet-service-regex',
             gnunetserviceregex_src,
             dependencies: [libgnunetregex_dep, libgnunetutil_dep,
diff --git a/src/testbed/meson.build b/src/testbed/meson.build
new file mode 100644
index 000000000..927d1248c
--- /dev/null
+++ b/src/testbed/meson.build
@@ -0,0 +1,46 @@
+configure_file(input : 'testbed.conf',
+               output : 'testbed.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
+if get_option('monolith')
+  subdir_done()
+endif
+executable ('gnunet-helper-testbed',
+            ['gnunet-helper-testbed.c'],
+            dependencies: [libgnunetutil_dep,
+                           libgnunetcore_dep,
+                           libgnunethello_dep,
+                           libgnunetpeerinfo_dep,
+                           libgnunetstatistics_dep,
+                           libgnunettransport_dep,
+                           zlib_dep],
+            include_directories: [incdir, configuration_inc],
+            install:true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-daemon-testbed-blacklist',
+            ['gnunet-daemon-testbed-blacklist.c'],
+            dependencies: [libgnunetutil_dep,
+                           libgnunetcore_dep,
+                           libgnunethello_dep,
+                           libgnunetpeerinfo_dep,
+                           libgnunetstatistics_dep,
+                           libgnunettransport_dep],
+            include_directories: [incdir, configuration_inc],
+            install:true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+
+executable ('gnunet-daemon-underlay',
+            ['gnunet-daemon-testbed-underlay.c'],
+            dependencies: [libgnunetutil_dep,
+                           libgnunetcore_dep,
+                           libgnunethello_dep,
+                           libgnunetpeerinfo_dep,
+                           libgnunetstatistics_dep,
+                           libgnunettransport_dep,
+                           sqlite_dep],
+            include_directories: [incdir, configuration_inc],
+            install:true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/util/meson.build b/src/util/meson.build
index a9d1178b1..aa9fd8e3a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -152,7 +152,7 @@ executable ('gnunet-config-diff',
             include_directories: [incdir, configuration_inc],
             install: false)
 
-executable ('gnunet-service-resolver-arm',
+executable ('gnunet-service-resolver',
             gnunetserviceresolver_src,
             dependencies: [libgnunetutil_dep],
             include_directories: [incdir, configuration_inc],