[gnunet] branch master updated (c41ad6b9e -> f61216c66)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from c41ad6b9e BUILD: Fix monolithic build
     new 6fabc12aa BUILD: Add more subsystems to meson build
     new f61216c66 BUILD: Add some doc installation

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/man/meson.build           | 59 +++++++++++++++++++++++++++++++++++++++++++
 doc/meson.build               |  7 +++++
 meson.build                   |  4 ++-
 src/consensus/meson.build     | 23 +++++++++++++++++
 src/dns/meson.build           |  2 +-
 src/gns/meson.build           | 36 ++++++++++++++++++++++++++
 src/meson.build               | 12 ++++-----
 src/revocation/meson.build    | 25 ++++++++++++++++++
 src/scalarproduct/meson.build | 29 +++++++++++++++++++++
 src/vpn/meson.build           | 27 ++++++++++++++++++++
 src/zonemaster/meson.build    | 20 +++++++++++++++
 11 files changed, 236 insertions(+), 8 deletions(-)
 create mode 100644 doc/man/meson.build
 create mode 100644 doc/meson.build
 create mode 100644 src/consensus/meson.build
 create mode 100644 src/gns/meson.build
 create mode 100644 src/revocation/meson.build
 create mode 100644 src/scalarproduct/meson.build
 create mode 100644 src/vpn/meson.build
 create mode 100644 src/zonemaster/meson.build

diff --git a/doc/man/meson.build b/doc/man/meson.build
new file mode 100644
index 000000000..b8dfcb098
--- /dev/null
+++ b/doc/man/meson.build
@@ -0,0 +1,59 @@
+install_man(
+  [# 'gnunet.conf.5', FIXME generated from in file
+  'gnunet-arm.1',
+  'gnunet-ats.1',
+  'gnunet-auto-share.1',
+  'gnunet-base32.1',
+  'gnunet-bcd.1',
+  'gnunet-bugreport.1',
+  'gnunet-config.1',
+  'gnunet-core.1',
+  'gnunet-conversation.1',
+  'gnunet-conversation-test.1',
+  'gnunet-dht-get.1',
+  'gnunet-dht-put.1',
+  'gnunet-dht-monitor.1',
+  'gnunet-dht-hello.1',
+  'gnunet-directory.1',
+  'gnunet-dns2gns.1',
+  'gnunet-datastore.1',
+  'gnunet-download.1',
+  'gnunet-did.1',
+  'gnunet-ecc.1',
+  'gnunet-fs.1',
+  'gnunet-gns.1',
+  'gnunet-gns-proxy.1',
+  'gnunet-gns-proxy-setup-ca.1',
+  'gnunet-identity.1',
+  'gnunet-cadet.1',
+  'gnunet-messenger.1',
+  'gnunet-namecache.1',
+  'gnunet-namestore.1',
+  'gnunet-namestore-fcfsd.1',
+  'gnunet-namestore-dbtool.1',
+  'gnunet-namestore-zonefile.1',
+  'gnunet-nat.1',
+  'gnunet-nat-auto.1',
+  'gnunet-nat-server.1',
+  'gnunet-nse.1',
+  'gnunet-peerinfo.1',
+  'gnunet-publish.1',
+  'gnunet-qr.1',
+  'gnunet-reclaim.1',
+  'gnunet-resolver.1',
+  'gnunet-revocation.1',
+  'gnunet-scalarproduct.1',
+  'gnunet-scrypt.1',
+  'gnunet-search.1',
+  'gnunet-statistics.1',
+  'gnunet-testbed-profiler.1',
+  'gnunet-testing.1',
+  'gnunet-testing-run-service.1',
+  'gnunet-timeout.1',
+  'gnunet-transport.1',
+  'gnunet-transport-certificate-creation.1',
+  'gnunet-unindex.1',
+  'gnunet-uri.1',
+  'gnunet-vpn.1',
+  'gnunet-zoneimport.1'])
+
diff --git a/doc/meson.build b/doc/meson.build
new file mode 100644
index 000000000..1fe8884d4
--- /dev/null
+++ b/doc/meson.build
@@ -0,0 +1,7 @@
+
+install_subdir('handbook/html',
+               install_dir: get_option('datadir')+'/doc',
+               strip_directory: false)
+install_data('handbook/texinfo/gnunet.texi',
+             install_dir: get_option('infodir'))
+subdir('man')
diff --git a/meson.build b/meson.build
index 7ae72fc5f..e8f44ffa6 100644
--- a/meson.build
+++ b/meson.build
@@ -87,6 +87,7 @@ gcrypt_dep = dependency('libgcrypt')
 sodium_dep = dependency('libsodium')
 cc = meson.get_compiler('c')
 m_dep = cc.find_library('m', required : false)
+idn_dep = dependency('libidn2') # FIXME detect libidn as well
 gnunetdeps = [mhd_dep,
               sodium_dep,
               gcrypt_dep,
@@ -96,7 +97,7 @@ gnunetdeps = [mhd_dep,
               sqlite_dep,
               unistr_dep, #dependency('libunistring'),
               ltdl_dep, #dependency('ltdl'),
-              dependency('libidn2')]
+              idn_dep]
 
 add_project_arguments('-DNEED_LIBGCRYPT_VERSION="1.6.0"', language : 'c')
 
@@ -147,3 +148,4 @@ configure_file(#input: 'gnunet_private_config.h.in',
 configuration_inc = include_directories('.')
 
 subdir('src')
+subdir('doc')
diff --git a/src/consensus/meson.build b/src/consensus/meson.build
new file mode 100644
index 000000000..b5fbe6971
--- /dev/null
+++ b/src/consensus/meson.build
@@ -0,0 +1,23 @@
+libgnunetconsensus_src = ['consensus_api.c']
+
+gnunetserviceconsensus_src = ['gnunet-service-consensus.c']
+
+
+if gnunet_monolith == false
+  libgnunetconsensus = library('gnunetconsensus',
+          libgnunetconsensus_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetconsensus_dep = declare_dependency(link_with : libgnunetconsensus)
+  executable ('gnunet-service-consensus',
+              gnunetserviceconsensus_src,
+              dependencies: [libgnunetconsensus_dep,
+                             libgnunetutil_dep,
+                             libgnunetset_dep,
+                             libgnunetstatistics_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetconsensus_src + gnunetserviceconsensus_src
+    gnunet_src += 'consensus/' + p
+  endforeach
+endif
diff --git a/src/dns/meson.build b/src/dns/meson.build
index d5e30e55e..2d59dbac3 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -14,7 +14,7 @@ if gnunet_monolith == false
   libgnunetdns_dep = declare_dependency(link_with : libgnunetdns)
   libgnunetpluginblockdns = library('gnunet_plugin_block_dns',
           libgnunetpluginblockdns_src,
-          dependencies: libgnunetutil_dep,
+          dependencies: [libgnunetutil_dep, libgnunetblockgroup_dep],
           include_directories: [incdir, configuration_inc])
   libgnunetpluginblockdns_dep = declare_dependency(link_with : 
libgnunetpluginblockdns)
   executable ('gnunet-service-dns',
diff --git a/src/gns/meson.build b/src/gns/meson.build
new file mode 100644
index 000000000..1ee79c4c2
--- /dev/null
+++ b/src/gns/meson.build
@@ -0,0 +1,36 @@
+libgnunetgns_src = ['gns_api.c', 'gns_tld_api.c']
+
+gnunetservicegns_src = ['gnunet-service-gns.c',
+                        'gnunet-service-gns_resolver.c',
+                        'gnunet-service-gns_interceptor.c']
+
+
+if gnunet_monolith == false
+  libgnunetgns = library('gnunetgns',
+          libgnunetgns_src,
+          dependencies: [libgnunetutil_dep,
+                         libgnunetgnsrecord_dep,
+                         libgnunetidentity_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetgns_dep = declare_dependency(link_with : libgnunetgns)
+  executable ('gnunet-service-gns',
+              gnunetservicegns_src,
+              dependencies: [libgnunetgns_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetdht_dep,
+                             libgnunetdns_dep,
+                             idn_dep,
+                             libgnunetidentity_dep,
+                             libgnunetnamecache_dep,
+                             libgnunetrevocation_dep,
+                             libgnunetgnsrecord_dep,
+                             libgnunetcadet_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetgns_src + gnunetservicegns_src
+    gnunet_src += 'gns/' + p
+  endforeach
+endif
diff --git a/src/meson.build b/src/meson.build
index 0598ca828..e66ce696b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -51,12 +51,12 @@ subdir('cadet')
 subdir('set')
 subdir('seti')
 subdir('setu')
-#subdir('consensus')
+subdir('consensus')
 #subdir('scalarproduct')
-#subdir('revocation')
-#subdir('vpn')
-#subdir('gns')
-#subdir('zonemaster')
+subdir('revocation')
+subdir('vpn')
+subdir('gns')
+subdir('zonemaster')
 ##subdir('$(CONVERSATION_DIR)')
 #subdir('fs')
 #subdir('exit')
@@ -71,5 +71,5 @@ if gnunet_monolith == true
   libgnunet = library('gnunet',
                       gnunet_src,
                       dependencies: gnunetdeps,
-                      include_directories: [incdir, configuration_inc])
+                      include_directories: [incdir, configuration_inc, 
exitdir])
 endif
diff --git a/src/revocation/meson.build b/src/revocation/meson.build
new file mode 100644
index 000000000..33dcab90b
--- /dev/null
+++ b/src/revocation/meson.build
@@ -0,0 +1,25 @@
+libgnunetrevocation_src = ['revocation_api.c']
+
+gnunetservicerevocation_src = ['gnunet-service-revocation.c']
+
+
+if gnunet_monolith == false
+  libgnunetrevocation = library('gnunetrevocation',
+          libgnunetrevocation_src,
+          dependencies: [libgnunetutil_dep, libgnunetidentity_dep],
+          include_directories: [incdir, configuration_inc])
+  libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation)
+  executable ('gnunet-service-revocation',
+              gnunetservicerevocation_src,
+              dependencies: [libgnunetrevocation_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetsetu_dep,
+                             libgnunetidentity_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetrevocation_src + gnunetservicerevocation_src
+    gnunet_src += 'revocation/' + p
+  endforeach
+endif
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
new file mode 100644
index 000000000..7dc8bd89b
--- /dev/null
+++ b/src/scalarproduct/meson.build
@@ -0,0 +1,29 @@
+libgnunetscalarproduct_src = ['scalarproduct_api.c']
+
+gnunetservicescalarproduct_src = ['gnunet-service-scalarproduct.c',
+                        'gnunet-service-scalarproduct_union.c',
+                        'gnunet-service-scalarproduct_intersection.c',
+                        
'gnunet-service-scalarproduct_union_strata_estimator.c',
+                        'ibf.c']
+
+
+if gnunet_monolith == false
+  libgnunetscalarproduct = library('gnunetscalarproduct',
+          libgnunetscalarproduct_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetscalarproduct_dep = declare_dependency(link_with : 
libgnunetscalarproduct)
+  executable ('gnunet-service-scalarproduct',
+              gnunetservicescalarproduct_src,
+              dependencies: [libgnunetscalarproduct_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetcore_dep,
+                             libgnunetcadet_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : libgnunetscalarproduct_src + gnunetservicescalarproduct_src
+    gnunet_src += 'scalarproduct/' + p
+  endforeach
+endif
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
new file mode 100644
index 000000000..62054224b
--- /dev/null
+++ b/src/vpn/meson.build
@@ -0,0 +1,27 @@
+libgnunetvpn_src = ['vpn_api.c']
+
+gnunetservicevpn_src = ['gnunet-service-vpn.c']
+
+exitdir = include_directories('../exit')
+
+if gnunet_monolith == false
+  libgnunetvpn = library('gnunetvpn',
+          libgnunetvpn_src,
+          dependencies: libgnunetutil_dep,
+          include_directories: [incdir, configuration_inc])
+  libgnunetvpn_dep = declare_dependency(link_with : libgnunetvpn)
+  executable ('gnunet-service-vpn',
+              gnunetservicevpn_src,
+              dependencies: [libgnunetvpn_dep,
+                             libgnunetutil_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetregex_dep,
+                             libgnunetcore_dep,
+                             libgnunetcadet_dep,
+                             libgnunetblock_dep],
+              include_directories: [incdir, configuration_inc, exitdir])
+else
+  foreach p : libgnunetvpn_src + gnunetservicevpn_src
+    gnunet_src += 'vpn/' + p
+  endforeach
+endif
diff --git a/src/zonemaster/meson.build b/src/zonemaster/meson.build
new file mode 100644
index 000000000..35208f221
--- /dev/null
+++ b/src/zonemaster/meson.build
@@ -0,0 +1,20 @@
+gnunetservicezonemaster_src = ['gnunet-service-zonemaster.c']
+
+
+if gnunet_monolith == false
+  executable ('gnunet-service-zonemaster',
+              gnunetservicezonemaster_src,
+              dependencies: [
+                             libgnunetutil_dep,
+                             libgnunetdht_dep,
+                             libgnunetidentity_dep,
+                             libgnunetstatistics_dep,
+                             libgnunetnamecache_dep,
+                             libgnunetnamestore_dep,
+                             libgnunetgnsrecord_dep],
+              include_directories: [incdir, configuration_inc])
+else
+  foreach p : gnunetservicezonemaster_src
+    gnunet_src += 'zonemaster/' + p
+  endforeach
+endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.