BUILD: Meson add more build targets

7 files changed, 126 insertions, 5 deletions

diff --git a/contrib/gana b/contrib/gana
-Subproject c9bda21875ea1775f88b71de735d527132e4592
+Subproject c1dc2dc975742c929a523c22d91f7d4f8278723
diff --git a/contrib/sphinx b/contrib/sphinx
-Subproject 0cccef450b037a48170402117f7d3b6c0a4272a
+Subproject 9c5b9d9040d21542eff792e26624cf9669b127a
diff --git a/src/meson.build b/src/meson.build
index ee7e53fc2..fa993e220 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,10 +31,8 @@ subdir('fragmentation')
 subdir('transport')
 #subdir('ats-tool')
 subdir('core')
-if get_option('testbed')
-  #subdir('testbed-logger')
-  subdir('testbed')
-endif
+subdir('testbed-logger')
+subdir('testbed')
 subdir('nse')
 subdir('dhtu')
 subdir('dht')
diff --git a/src/testbed-logger/meson.build b/src/testbed-logger/meson.build
new file mode 100644
index 000000000..4af126abe
--- /dev/null
+++ b/src/testbed-logger/meson.build
@@ -0,0 +1,30 @@
+libgnunettestbedlogger_src = ['testbed_logger_api.c']
+
+configure_file(input : 'testbed-logger.conf',
+               output : 'testbed-logger.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
+if get_option('monolith')
+  subdir_done()
+endif
+
+libgnunettestbedlogger = library('gnunettestbed',
+        libgnunettestbedlogger_src,
+        soversion: '0',
+        version: '0.0.0',
+        dependencies: [libgnunetutil_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunettestbedlogger_dep = declare_dependency(link_with : libgnunettestbedlogger)
+
+
+executable ('gnunet-service-testbed-logger',
+            ['gnunet-service-testbed-logger.c'],
+            dependencies: [libgnunetutil_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
index 927d1248c..0662ba614 100644
--- a/src/testbed/meson.build
+++ b/src/testbed/meson.build
@@ -1,3 +1,17 @@
+libgnunettestbed_src = [
+  'testbed_api.c',
+  'testbed_api_hosts.c',
+  'testbed_api_operations.c',
+  'testbed_api_peers.c',
+  'testbed_api_services.c',
+  'testbed_api_statistics.c',
+  'testbed_api_testbed.c',
+  'testbed_api_test.c',
+  'testbed_api_topology.c',
+  'testbed_api_sd.c',
+  'testbed_api_barriers.c'
+  ]
+
 configure_file(input : 'testbed.conf',
                output : 'testbed.conf',
                configuration : cdata,
@@ -8,6 +22,26 @@ configure_file(input : 'testbed.conf',
 if get_option('monolith')
   subdir_done()
 endif
+
+libgnunettestbed = library('gnunettestbed',
+        libgnunettestbed_src,
+        soversion: '0',
+        version: '0.1.0',
+        dependencies: [libgnunetutil_dep,
+                       zlib_dep,
+                       libgnunetstatistics_dep,
+                       libgnunethello_dep,
+                       libgnunettesting_dep,
+                       libgnunettransport_dep,
+                       libgnunetarm_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunettestbed_dep = declare_dependency(link_with : libgnunettestbed)
+pkg.generate(libgnunettestbed, url: 'https://www.gnunet.org',
+             description : 'Provides API for testbed')
+
+
 executable ('gnunet-helper-testbed',
             ['gnunet-helper-testbed.c'],
             dependencies: [libgnunetutil_dep,
@@ -15,6 +49,8 @@ executable ('gnunet-helper-testbed',
                            libgnunethello_dep,
                            libgnunetpeerinfo_dep,
                            libgnunetstatistics_dep,
+                           libgnunettestbed_dep,
+                           libgnunettesting_dep,
                            libgnunettransport_dep,
                            zlib_dep],
             include_directories: [incdir, configuration_inc],
@@ -44,3 +80,35 @@ executable ('gnunet-daemon-underlay',
             include_directories: [incdir, configuration_inc],
             install:true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
+
+executable ('gnunet-service-testbed',
+            ['gnunet-service-testbed.c',
+             'gnunet-service-testbed_links.c',
+             'gnunet-service-testbed_peers.c',
+             'gnunet-service-testbed_cache.c',
+             'gnunet-service-testbed_oc.c',
+             'gnunet-service-testbed_cpustatus.c',
+             'gnunet-service-testbed_meminfo.c',
+             'gnunet-service-testbed_barriers.c',
+             'gnunet-service-testbed_connectionpool.c'],
+            dependencies: [libgnunetutil_dep,
+                           libgnunetcore_dep,
+                           libgnunetats_dep,
+                           libgnunetarm_dep,
+                           libgnunethello_dep,
+                           libgnunettestbed_dep,
+                           libgnunettesting_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')
diff --git a/src/testing/meson.build b/src/testing/meson.build
index d4bcd346d..74adaa738 100644
--- a/src/testing/meson.build
+++ b/src/testing/meson.build
@@ -46,7 +46,7 @@ libgnunettesting = library('gnunettesting',
         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')
+             description : 'Provides API for gnunet testing')
 
 executable ('gnunet-testing',
           gnunettesting_src,
@@ -57,3 +57,12 @@ executable ('gnunet-testing',
         install: true,
         install_dir: get_option('bindir'))
 
+executable ('gnunet-cmds-helper',
+            ['gnunet-cmds-helper.c'],
+            dependencies: [libgnunettesting_dep,
+                           libgnunetutil_dep,
+                           ],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 9a3a2ebd0..a57dc968a 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -22,6 +22,11 @@ configure_file(input : 'transport.conf.in',
                install: true,
                install_dir: pkgcfgdir)
 
+configure_file(input : 'gnunet-transport-certificate-creation',
+               output : 'gnuent-transport-certificate-creation.in',
+               configuration : cdata,
+               install: true,
+               install_dir: get_option('bindir'))
 
 if get_option('monolith')
   foreach p : libgnunettransport_src #+ libgnunettransportapplication_src + libgnunettransportcore_src + libgnunettransportcommunicator_src + libgnunettransportmonitor_src + gnunetservicetransport_src
@@ -189,3 +194,14 @@ 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'))
+