[gnunet] branch master updated: BUILD: meson configuration files

[gnunet]

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

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

The following commit(s) were added to refs/heads/master by this push:
     new f7328dd31 BUILD: meson configuration files
f7328dd31 is described below

commit f7328dd314a57c338b70e574a5ff723c16f93e03
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Sep 21 18:41:11 2023 +0200

    BUILD: meson configuration files
---
 meson.build                   | 5 +++++
 src/ats/meson.build           | 6 ++++++
 src/cadet/meson.build         | 5 +++++
 src/consensus/meson.build     | 5 +++++
 src/core/meson.build          | 5 +++++
 src/datacache/meson.build     | 6 ++++++
 src/datastore/meson.build     | 5 +++++
 src/dht/meson.build           | 5 +++++
 src/dhtu/meson.build          | 5 +++++
 src/dns/meson.build           | 5 +++++
 src/fs/meson.build            | 6 ++++++
 src/gns/meson.build           | 7 +++++++
 src/hostlist/meson.build      | 6 ++++++
 src/identity/meson.build      | 6 ++++++
 src/namecache/meson.build     | 6 ++++++
 src/namestore/meson.build     | 6 ++++++
 src/nat/meson.build           | 7 +++++++
 src/nse/meson.build           | 7 +++++++
 src/peerinfo/meson.build      | 6 ++++++
 src/peerstore/meson.build     | 6 ++++++
 src/reclaim/meson.build       | 6 ++++++
 src/regex/meson.build         | 6 ++++++
 src/rest/meson.build          | 6 ++++++
 src/revocation/meson.build    | 6 ++++++
 src/scalarproduct/meson.build | 6 ++++++
 src/set/meson.build           | 6 ++++++
 src/seti/meson.build          | 6 ++++++
 src/setu/meson.build          | 6 ++++++
 src/statistics/meson.build    | 6 ++++++
 src/topology/meson.build      | 6 ++++++
 src/transport/meson.build     | 6 ++++++
 src/util/meson.build          | 7 +++++++
 src/vpn/meson.build           | 7 +++++++
 src/zonemaster/meson.build    | 6 ++++++
 34 files changed, 201 insertions(+)

diff --git a/meson.build b/meson.build
index 2654a0443..7f00df203 100644
--- a/meson.build
+++ b/meson.build
@@ -68,7 +68,12 @@ if 
compiler.has_argument('-Wno-tautological-constant-out-of-range-compare')
   add_project_arguments('-Wno-tautological-constant-out-of-range-compare', 
language : 'c')
 endif
 
+# FIXME static here, were dynamic in configure.ac
 cdata.set('UNIXONLY', '#')
+cdata.set('JAVAPORT', '#')
+cdata.set('START_ON_DEMAND', 'YES')
+
+
 cdata.set_quoted('build_target', host_machine.system())
 if host_machine.system() == 'linux'
   add_project_link_arguments(['-Wl,--unresolved-symbols=report-all'], language 
: 'c')
diff --git a/src/ats/meson.build b/src/ats/meson.build
index 4804e95a2..4da79b8bb 100644
--- a/src/ats/meson.build
+++ b/src/ats/meson.build
@@ -13,6 +13,12 @@ gnunetserviceats_src = ['gnunet-service-ats.c',
                         'gnunet-service-ats_scheduling.c',
                         'gnunet-service-ats_reservations.c']
 
+configure_file(input : 'ats.conf.in',
+               output : 'ats.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 if get_option('monolith') == false
   libgnunetats = library('gnunetats',
           libgnunetats_src,
diff --git a/src/cadet/meson.build b/src/cadet/meson.build
index ca7a5a91b..8caea0839 100644
--- a/src/cadet/meson.build
+++ b/src/cadet/meson.build
@@ -17,6 +17,11 @@ gnunetservicecadet_src = ['gnunet-service-cadet.c',
                           'gnunet-service-cadet_paths.c',
                           'gnunet-service-cadet_peer.c']
 
+configure_file(input : 'cadet.conf.in',
+               output : 'cadet.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 if get_option('monolith') == false
   libgnunetcadet = library('gnunetcadet',
diff --git a/src/consensus/meson.build b/src/consensus/meson.build
index 03384c388..e1685d834 100644
--- a/src/consensus/meson.build
+++ b/src/consensus/meson.build
@@ -2,6 +2,11 @@ libgnunetconsensus_src = ['consensus_api.c']
 
 gnunetserviceconsensus_src = ['gnunet-service-consensus.c']
 
+configure_file(input : 'consensus.conf.in',
+               output : 'consensus.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 if get_option('monolith') == false
   libgnunetconsensus = library('gnunetconsensus',
diff --git a/src/core/meson.build b/src/core/meson.build
index 142b3dac8..24dcdaf57 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -6,6 +6,11 @@ gnunetservicecore_src = ['gnunet-service-core.c',
                         'gnunet-service-core_sessions.c',
                         'gnunet-service-core_typemap.c']
 
+configure_file(input : 'core.conf.in',
+               output : 'core.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 
 if get_option('monolith') == false
diff --git a/src/datacache/meson.build b/src/datacache/meson.build
index 045335a33..39d58e078 100644
--- a/src/datacache/meson.build
+++ b/src/datacache/meson.build
@@ -2,6 +2,12 @@ libgnunetdatacache_src = ['datacache.c']
 
 libgnunetplugindatacache_sqlite_src = ['plugin_datacache_sqlite.c']
 
+configure_file(input : 'datacache.conf',
+               output : 'datacache.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 if get_option('monolith') == false
   libgnunetdatacache = library('gnunetdatacache',
           libgnunetdatacache_src,
diff --git a/src/datastore/meson.build b/src/datastore/meson.build
index 9f9824530..286965b14 100644
--- a/src/datastore/meson.build
+++ b/src/datastore/meson.build
@@ -2,6 +2,11 @@ libgnunetdatastore_src = ['datastore_api.c']
 
 gnunetservicedatastore_src = ['gnunet-service-datastore.c']
 
+configure_file(input : 'datastore.conf.in',
+               output : 'datastore.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 if get_option('monolith') == false
   libgnunetdatastore = library('gnunetdatastore',
diff --git a/src/dht/meson.build b/src/dht/meson.build
index 86087f48d..72029c48d 100644
--- a/src/dht/meson.build
+++ b/src/dht/meson.build
@@ -7,6 +7,11 @@ gnunetservicedht_src = ['gnunet-service-dht.c',
                         'gnunet-service-dht_neighbours.c',
                         'gnunet-service-dht_routing.c']
 
+configure_file(input : 'dht.conf.in',
+               output : 'dht.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 if get_option('monolith') == false
   libgnunetdht = library('gnunetdht',
diff --git a/src/dhtu/meson.build b/src/dhtu/meson.build
index 24a5e01a1..d596959eb 100644
--- a/src/dhtu/meson.build
+++ b/src/dhtu/meson.build
@@ -1,6 +1,11 @@
 libgnunetplugindhtuip_src = ['plugin_dhtu_ip.c']
 libgnunetplugindhtugnunet_src = ['plugin_dhtu_gnunet.c']
 
+configure_file(input : 'dhtu.conf',
+               output : 'dhtu.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 if get_option('monolith') == false
   libgnunetplugindhtuip = library('gnunet_plugin_dhtu_ip',
diff --git a/src/dns/meson.build b/src/dns/meson.build
index 8b68fd73a..9eb26aeee 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -5,6 +5,11 @@ gnunetservicedns_src = ['gnunet-service-dns.c']
 gnunetdnsredirector_src = ['gnunet-dns-monitor.c']
 gnunetdnsmonitor_src = ['gnunet-dns-redirector.c']
 
+configure_file(input : 'dns.conf.in',
+               output : 'dns.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
 
 if get_option('monolith') == false
   libgnunetdns = library('gnunetdns',
diff --git a/src/fs/meson.build b/src/fs/meson.build
index 9bf7b3142..0460a2f5f 100644
--- a/src/fs/meson.build
+++ b/src/fs/meson.build
@@ -27,6 +27,12 @@ gnunetservicefs_src = ['gnunet-service-fs.c',
                        'gnunet-service-fs_cadet_client.c',
                        'gnunet-service-fs_cadet_server.c']
 
+configure_file(input : 'fs.conf.in',
+               output : 'fs.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetfs = library('gnunetfs',
diff --git a/src/gns/meson.build b/src/gns/meson.build
index de7f64cd4..eef8224ef 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -6,6 +6,13 @@ gnunetservicegns_src = ['gnunet-service-gns.c',
 
 gnunetgnsproxy_src = ['gnunet-gns-proxy.c']
 
+configure_file(input : 'gns.conf.in',
+               output : 'gns.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
 if get_option('monolith') == false
   libgnunetgns = library('gnunetgns',
           libgnunetgns_src,
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
index 605282fd5..8cdcf3972 100644
--- a/src/hostlist/meson.build
+++ b/src/hostlist/meson.build
@@ -2,6 +2,12 @@ gnunetdaemonhostlist_src = ['gnunet-daemon-hostlist.c',
                             'gnunet-daemon-hostlist_server.c',
                             'gnunet-daemon-hostlist_client.c']
 
+configure_file(input : 'hostlist.conf',
+               output : 'hostlist.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   executable ('gnunet-daemon-hostlist',
diff --git a/src/identity/meson.build b/src/identity/meson.build
index 38adf6da5..9c1199d5f 100644
--- a/src/identity/meson.build
+++ b/src/identity/meson.build
@@ -4,6 +4,12 @@ libgnunetidentity_src = ['identity_api.c',
 
 gnunetserviceidentity_src = ['gnunet-service-identity.c']
 
+configure_file(input : 'identity.conf.in',
+               output : 'identity.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetidentity = library('gnunetidentity',
diff --git a/src/namecache/meson.build b/src/namecache/meson.build
index f5bb63204..f50d7e5d1 100644
--- a/src/namecache/meson.build
+++ b/src/namecache/meson.build
@@ -4,6 +4,12 @@ libgnunetpluginnamecache_sqlite_src = 
['plugin_namecache_sqlite.c']
 gnunetnamecache_src = ['gnunet-namecache.c']
 gnunetservicenamecache_src = ['gnunet-service-namecache.c']
 
+configure_file(input : 'namecache.conf.in',
+               output : 'namecache.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetnamecache = library('gnunetnamecache',
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index c3df2a621..010316df3 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -4,6 +4,12 @@ libgnunetpluginnamestore_sqlite_src = 
['plugin_namestore_sqlite.c']
 gnunetnamestore_src = ['gnunet-namestore.c']
 gnunetservicenamestore_src = ['gnunet-service-namestore.c']
 
+configure_file(input : 'namestore.conf.in',
+               output : 'namestore.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetnamestore = library('gnunetnamestore',
diff --git a/src/nat/meson.build b/src/nat/meson.build
index 48916af9f..5427a5cf6 100644
--- a/src/nat/meson.build
+++ b/src/nat/meson.build
@@ -8,6 +8,13 @@ gnunetservicenat_src = ['gnunet-service-nat.c',
                         'gnunet-service-nat_mini.c',
                         'gnunet-service-nat_helper.c']
 
+configure_file(input : 'nat.conf',
+               output : 'nat.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
 if get_option('monolith') == false
   libgnunetnat = library('gnunetnat',
           libgnunetnat_src,
diff --git a/src/nse/meson.build b/src/nse/meson.build
index 9f1111af6..cf82698cf 100644
--- a/src/nse/meson.build
+++ b/src/nse/meson.build
@@ -2,6 +2,13 @@ libgnunetnse_src = ['nse_api.c']
 
 gnunetservicense_src = ['gnunet-service-nse.c']
 
+configure_file(input : 'nse.conf.in',
+               output : 'nse.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
 if get_option('monolith') == false
   libgnunetnse = library('gnunetnse',
           libgnunetnse_src,
diff --git a/src/peerinfo/meson.build b/src/peerinfo/meson.build
index fdcd38a61..3fdc3801b 100644
--- a/src/peerinfo/meson.build
+++ b/src/peerinfo/meson.build
@@ -3,6 +3,12 @@ libgnunetpeerinfo_src = ['peerinfo_api.c',
 
 gnunetservicepeerinfo_src = ['gnunet-service-peerinfo.c']
 
+configure_file(input : 'peerinfo.conf.in',
+               output : 'peerinfo.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetpeerinfo = library('gnunetpeerinfo',
diff --git a/src/peerstore/meson.build b/src/peerstore/meson.build
index 0286a148c..f5727411c 100644
--- a/src/peerstore/meson.build
+++ b/src/peerstore/meson.build
@@ -3,6 +3,12 @@ libgnunetpeerstore_src = ['peerstore_api.c',
 
 gnunetservicepeerstore_src = ['gnunet-service-peerstore.c']
 
+configure_file(input : 'peerstore.conf.in',
+               output : 'peerstore.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetpeerstore = library('gnunetpeerstore',
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index 226e8ec7f..26eaa6b31 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -5,6 +5,12 @@ libgnunetreclaim_src = ['reclaim_api.c',
 gnunetservicereclaim_src = ['gnunet-service-reclaim.c',
                         'gnunet-service-reclaim_tickets.c']
 
+configure_file(input : 'reclaim.conf',
+               output : 'reclaim.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetreclaim = library('gnunetreclaim',
diff --git a/src/regex/meson.build b/src/regex/meson.build
index 64c284558..f9e8c0ee1 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -6,6 +6,12 @@ gnunetserviceregex_src = ['gnunet-service-regex.c',
                           'regex_internal_dht.c',
                           'regex_internal.c']
 
+configure_file(input : 'regex.conf.in',
+               output : 'regex.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetregex = library('gnunetregex',
diff --git a/src/rest/meson.build b/src/rest/meson.build
index 19575233a..9b4314040 100644
--- a/src/rest/meson.build
+++ b/src/rest/meson.build
@@ -2,6 +2,12 @@ libgnunetrest_src = ['rest.c']
 
 gnunetservicerest_src = ['gnunet-rest-server.c']
 
+configure_file(input : 'rest.conf',
+               output : 'rest.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetrest = library('gnunetrest',
diff --git a/src/revocation/meson.build b/src/revocation/meson.build
index 843633289..6a539febb 100644
--- a/src/revocation/meson.build
+++ b/src/revocation/meson.build
@@ -2,6 +2,12 @@ libgnunetrevocation_src = ['revocation_api.c']
 
 gnunetservicerevocation_src = ['gnunet-service-revocation.c']
 
+configure_file(input : 'revocation.conf.in',
+               output : 'revocation.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetrevocation = library('gnunetrevocation',
diff --git a/src/scalarproduct/meson.build b/src/scalarproduct/meson.build
index 80b85ae80..de23f558c 100644
--- a/src/scalarproduct/meson.build
+++ b/src/scalarproduct/meson.build
@@ -6,6 +6,12 @@ gnunetservicescalarproduct_src = 
['gnunet-service-scalarproduct.c',
                         
'gnunet-service-scalarproduct_union_strata_estimator.c',
                         'ibf.c']
 
+configure_file(input : 'scalarproduct.conf.in',
+               output : 'scalarproduct.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetscalarproduct = library('gnunetscalarproduct',
diff --git a/src/set/meson.build b/src/set/meson.build
index da97ef7b4..9931fbff9 100644
--- a/src/set/meson.build
+++ b/src/set/meson.build
@@ -6,6 +6,12 @@ gnunetserviceset_src = ['gnunet-service-set.c',
                         'gnunet-service-set_union_strata_estimator.c',
                         'ibf.c']
 
+configure_file(input : 'set.conf.in',
+               output : 'set.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetset = library('gnunetset',
diff --git a/src/seti/meson.build b/src/seti/meson.build
index d913e26de..b96135c5f 100644
--- a/src/seti/meson.build
+++ b/src/seti/meson.build
@@ -2,6 +2,12 @@ libgnunetseti_src = ['seti_api.c']
 
 gnunetserviceseti_src = ['gnunet-service-seti.c']
 
+configure_file(input : 'seti.conf.in',
+               output : 'seti.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetseti = library('gnunetseti',
diff --git a/src/setu/meson.build b/src/setu/meson.build
index 2d867c32e..99d44d612 100644
--- a/src/setu/meson.build
+++ b/src/setu/meson.build
@@ -4,6 +4,12 @@ gnunetservicesetu_src = ['gnunet-service-setu.c',
                          'ibf.c',
                          'gnunet-service-setu_strata_estimator.c']
 
+configure_file(input : 'setu.conf.in',
+               output : 'setu.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetsetu = library('gnunetsetu',
diff --git a/src/statistics/meson.build b/src/statistics/meson.build
index f0bed324e..86c3b6eb9 100644
--- a/src/statistics/meson.build
+++ b/src/statistics/meson.build
@@ -2,6 +2,12 @@ libgnunetstatistics_src = ['statistics_api.c']
 
 gnunetservicestatistics_src = ['gnunet-service-statistics.c']
 
+configure_file(input : 'statistics.conf.in',
+               output : 'statistics.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetstatistics = library('gnunetstatistics',
diff --git a/src/topology/meson.build b/src/topology/meson.build
index 2f1db3641..335369835 100644
--- a/src/topology/meson.build
+++ b/src/topology/meson.build
@@ -2,6 +2,12 @@ libgnunetfriends_src = ['friends.c']
 
 gnunetdaemontopology_src = ['gnunet-daemon-topology.c']
 
+configure_file(input : 'topology.conf',
+               output : 'topology.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunetfriends = library('gnunetfriends',
diff --git a/src/transport/meson.build b/src/transport/meson.build
index 625fc273c..4e0c719d4 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -15,6 +15,12 @@ gnunetservicetransport_src = ['gnunet-service-tng.c']
 gnunetcommunicatortcp_src = ['gnunet-communicator-tcp.c']
 gnunetcommunicatorudp_src = ['gnunet-communicator-udp.c']
 
+configure_file(input : 'transport.conf.in',
+               output : 'transport.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   libgnunettransport = library('gnunettransport',
diff --git a/src/util/meson.build b/src/util/meson.build
index 525c43324..d4b03479a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -69,6 +69,13 @@ libgnunetutil_src = ['bandwidth.c',
        'proc_compat.c',
             'gnunet_error_codes.c']
 
+configure_file(input : 'util.conf',
+               output : 'util.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
 if get_option('monolith') == false
   libgnunetutil = library('gnunetutil',
           libgnunetutil_src,
diff --git a/src/vpn/meson.build b/src/vpn/meson.build
index c827b7e91..3807b21cf 100644
--- a/src/vpn/meson.build
+++ b/src/vpn/meson.build
@@ -4,6 +4,13 @@ gnunetservicevpn_src = ['gnunet-service-vpn.c']
 
 exitdir = include_directories('../exit')
 
+configure_file(input : 'vpn.conf.in',
+               output : 'vpn.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
+
 if get_option('monolith') == false
   libgnunetvpn = library('gnunetvpn',
           libgnunetvpn_src,
diff --git a/src/zonemaster/meson.build b/src/zonemaster/meson.build
index 885bd2cd4..c6a8c2baf 100644
--- a/src/zonemaster/meson.build
+++ b/src/zonemaster/meson.build
@@ -1,5 +1,11 @@
 gnunetservicezonemaster_src = ['gnunet-service-zonemaster.c']
 
+configure_file(input : 'zonemaster.conf.in',
+               output : 'zonemaster.conf',
+               configuration : cdata,
+               install: true,
+               install_dir: pkgcfgdir)
+
 
 if get_option('monolith') == false
   executable ('gnunet-service-zonemaster',

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