[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 01/02: BUILD: More pkgconfig and installation
|
From: |
gnunet |
|
Subject: |
[gnunet] 01/02: BUILD: More pkgconfig and installation |
|
Date: |
Sat, 23 Sep 2023 21:17:32 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit dca0afc851783403b26464bbfa2629fe1bd70a55
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Sep 23 20:51:41 2023 +0200
BUILD: More pkgconfig and installation
---
src/conversation/meson.build | 5 ----
src/gnsrecord/meson.build | 38 +++++++++++++++-----------
src/hello/meson.build | 1 +
src/hostlist/meson.build | 29 +++++++++-----------
src/json/meson.build | 3 ++-
src/messenger/meson.build | 1 +
src/reclaim/meson.build | 64 +++++++++++++++++++++++---------------------
src/revocation/meson.build | 60 ++++++++++++++++++++++++++++++-----------
src/statistics/meson.build | 37 +++++++++++++++++--------
9 files changed, 144 insertions(+), 94 deletions(-)
diff --git a/src/conversation/meson.build b/src/conversation/meson.build
index d4d905e6f..dc76affff 100644
--- a/src/conversation/meson.build
+++ b/src/conversation/meson.build
@@ -68,11 +68,6 @@ shared_module('gnunet_plugin_gnsrecord_conversation',
install: true,
install_dir: get_option('libdir'))
-libgnunetconversation_dep = declare_dependency(link_with :
libgnunetconversation)
-pkg.generate(libgnunetconversation, url: 'https://www.gnunet.org',
- description : 'Provides API to access the GNU Name System')
-
-
executable ('gnunet-conversation',
'gnunet-conversation.c',
dependencies: [libgnunetconversation_dep,
diff --git a/src/gnsrecord/meson.build b/src/gnsrecord/meson.build
index f98415ce5..28e211f16 100644
--- a/src/gnsrecord/meson.build
+++ b/src/gnsrecord/meson.build
@@ -4,22 +4,30 @@ libgnunetgnsrecord_src = ['gnsrecord.c',
'gnsrecord_misc.c']
libgnunetgnsrecordjson_src = ['json_gnsrecord.c']
-if get_option('monolith') == false
- libgnunetgnsrecord = library('gnunetgnsrecord',
- libgnunetgnsrecord_src,
- dependencies: [libgnunetutil_dep,
- sodium_dep,
- libgnunetidentity_dep,
- gcrypt_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord)
- libgnunetgnsrecordjson = library('gnunetgnsrecordjson',
- libgnunetgnsrecordjson_src,
- dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep],
- include_directories: [incdir, configuration_inc])
- libgnunetgnsrecordjson_dep = declare_dependency(link_with :
libgnunetgnsrecord)
-else
+if get_option('monolith')
foreach p : libgnunetgnsrecord_src + libgnunetgnsrecordjson_src
gnunet_src += 'gnsrecord/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetgnsrecord = library('gnunetgnsrecord',
+ libgnunetgnsrecord_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep,
+ sodium_dep,
+ libgnunetidentity_dep,
+ gcrypt_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetgnsrecord_dep = declare_dependency(link_with : libgnunetgnsrecord)
+pkg.generate(libgnunetgnsrecord, url: 'https://www.gnunet.org',
+ description : 'Provides API for manipulating GNS records')
+
+
+libgnunetgnsrecordjson = library('gnunetgnsrecordjson',
+ libgnunetgnsrecordjson_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep, libgnunetgnsrecord_dep, json_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetgnsrecordjson_dep = declare_dependency(link_with : libgnunetgnsrecord)
+
diff --git a/src/hello/meson.build b/src/hello/meson.build
index 23f26db31..f2e4c446c 100644
--- a/src/hello/meson.build
+++ b/src/hello/meson.build
@@ -15,6 +15,7 @@ endif
libgnunethello = library('gnunethello',
libgnunethello_src,
+ soversion: '1.0.1',
dependencies: libgnunetutil_dep,
include_directories: [incdir, configuration_inc])
libgnunethello_dep = declare_dependency(link_with : libgnunethello)
diff --git a/src/hostlist/meson.build b/src/hostlist/meson.build
index 8cdcf3972..99cc089df 100644
--- a/src/hostlist/meson.build
+++ b/src/hostlist/meson.build
@@ -9,20 +9,17 @@ configure_file(input : 'hostlist.conf',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- executable ('gnunet-daemon-hostlist',
- gnunetdaemonhostlist_src,
- dependencies: [libgnunetutil_dep,
- libgnunetcore_dep,
- libgnunethello_dep,
- libgnunetpeerinfo_dep,
- libgnunetstatistics_dep,
- libgnunettransport_dep,
- mhd_dep,
- curl_dep],
- include_directories: [incdir, configuration_inc])
-else
- #foreach p : gnunetdaemonhostlist_src
- # gnunet_src += 'hostlist/' + p
- #endforeach
+if get_option('monolith')
+ subdir_done()
endif
+executable ('gnunet-daemon-hostlist',
+ gnunetdaemonhostlist_src,
+ dependencies: [libgnunetutil_dep,
+ libgnunetcore_dep,
+ libgnunethello_dep,
+ libgnunetpeerinfo_dep,
+ libgnunetstatistics_dep,
+ libgnunettransport_dep,
+ mhd_dep,
+ curl_dep],
+ include_directories: [incdir, configuration_inc])
diff --git a/src/json/meson.build b/src/json/meson.build
index 9c3566335..3ebd10ec1 100644
--- a/src/json/meson.build
+++ b/src/json/meson.build
@@ -13,9 +13,10 @@ endif
libgnunetjson = library('gnunetjson',
libgnunetjson_src,
+ soversion: '0.0.0',
dependencies: [libgnunetutil_dep, json_dep, mhd_dep, zlib_dep],
include_directories: [incdir, configuration_inc])
libgnunetjson_dep = declare_dependency(link_with : libgnunetjson)
-pkg.generate(libgnunetarm, url: 'https://www.gnunet.org',
+pkg.generate(libgnunetjson, url: 'https://www.gnunet.org',
description : 'Library for JSON de/serialization')
diff --git a/src/messenger/meson.build b/src/messenger/meson.build
index e2e74c5e7..097ba5d49 100644
--- a/src/messenger/meson.build
+++ b/src/messenger/meson.build
@@ -37,6 +37,7 @@ endif
libgnunetmessenger = library('gnunetmessenger',
libgnunetmessenger_src,
+ soversion: '0.0.0',
dependencies: [libgnunetutil_dep,
libgnunetcadet_dep,
libgnunetidentity_dep],
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index 26eaa6b31..ee32137a6 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -12,37 +12,41 @@ configure_file(input : 'reclaim.conf',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetreclaim = library('gnunetreclaim',
- libgnunetreclaim_src,
- dependencies: [libgnunetutil_dep,
- libgnunetidentity_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir'))
- libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
- executable ('gnunet-reclaim',
- 'gnunet-reclaim.c',
- dependencies: [libgnunetreclaim_dep,
- libgnunetidentity_dep,
- libgnunetutil_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('bindir'))
- executable ('gnunet-service-reclaim',
- gnunetservicereclaim_src,
- dependencies: [libgnunetreclaim_dep,
- libgnunetutil_dep,
- libgnunetstatistics_dep,
- libgnunetgnsrecord_dep,
- libgnunetgns_dep,
- libgnunetidentity_dep,
- libgnunetnamestore_dep],
- include_directories: [incdir, configuration_inc],
- install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
-else
+if get_option('monolith')
foreach p : libgnunetreclaim_src + gnunetservicereclaim_src
gnunet_src += 'reclaim/' + p
endforeach
+ subdir_done()
endif
+libgnunetreclaim = library('gnunetreclaim',
+ libgnunetreclaim_src,
+ dependencies: [libgnunetutil_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+libgnunetreclaim_dep = declare_dependency(link_with : libgnunetreclaim)
+pkg.generate(libgnunetreclaim, url: 'https://www.gnunet.org',
+ description : 'Provides API to access reclaimID')
+
+executable ('gnunet-reclaim',
+ 'gnunet-reclaim.c',
+ dependencies: [libgnunetreclaim_dep,
+ libgnunetidentity_dep,
+ libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-service-reclaim',
+ gnunetservicereclaim_src,
+ dependencies: [libgnunetreclaim_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetgnsrecord_dep,
+ libgnunetgns_dep,
+ libgnunetidentity_dep,
+ libgnunetnamestore_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
diff --git a/src/revocation/meson.build b/src/revocation/meson.build
index 6a539febb..f1023b00a 100644
--- a/src/revocation/meson.build
+++ b/src/revocation/meson.build
@@ -9,23 +9,51 @@ configure_file(input : 'revocation.conf.in',
install_dir: pkgcfgdir)
-if get_option('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
+if get_option('monolith')
foreach p : libgnunetrevocation_src + gnunetservicerevocation_src
gnunet_src += 'revocation/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetrevocation = library('gnunetrevocation',
+ libgnunetrevocation_src,
+ soversion: '0.0.0',
+ dependencies: [libgnunetutil_dep, libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc])
+libgnunetrevocation_dep = declare_dependency(link_with : libgnunetrevocation)
+pkg.generate(libgnunetrevocation, url: 'https://www.gnunet.org',
+ description : 'Provides API to perform key revocation in GNUnet')
+
+shared_module('gnunet_plugin_block_revocation',
+ ['plugin_block_revocation.c'],
+ dependencies: [libgnunetutil_dep,
+ libgnunetrevocation_dep,
+ libgnunetblock_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
+
+executable ('gnunet-revocation',
+ ['gnunet-revocation.c'],
+ dependencies: [libgnunetrevocation_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetsetu_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+executable ('gnunet-service-revocation',
+ gnunetservicerevocation_src,
+ dependencies: [libgnunetrevocation_dep,
+ libgnunetutil_dep,
+ libgnunetstatistics_dep,
+ libgnunetcore_dep,
+ libgnunetsetu_dep,
+ libgnunetidentity_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
+
diff --git a/src/statistics/meson.build b/src/statistics/meson.build
index 86c3b6eb9..446523416 100644
--- a/src/statistics/meson.build
+++ b/src/statistics/meson.build
@@ -9,18 +9,33 @@ configure_file(input : 'statistics.conf.in',
install_dir: pkgcfgdir)
-if get_option('monolith') == false
- libgnunetstatistics = library('gnunetstatistics',
- libgnunetstatistics_src,
- dependencies: libgnunetutil_dep,
- include_directories: [incdir, configuration_inc])
- libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics)
- executable ('gnunet-service-statistics',
- gnunetservicestatistics_src,
- dependencies: [libgnunetstatistics_dep, libgnunetutil_dep],
- include_directories: [incdir, configuration_inc])
-else
+if get_option('monolith')
foreach p : libgnunetstatistics_src + gnunetservicestatistics_src
gnunet_src += 'statistics/' + p
endforeach
+ subdir_done()
endif
+
+libgnunetstatistics = library('gnunetstatistics',
+ libgnunetstatistics_src,
+ soversion: '2.0.0',
+ dependencies: libgnunetutil_dep,
+ include_directories: [incdir, configuration_inc])
+libgnunetstatistics_dep = declare_dependency(link_with : libgnunetstatistics)
+pkg.generate(libgnunetstatistics, url: 'https://www.gnunet.org',
+ description : 'Provides API of GNUnet statistics service')
+
+executable ('gnunet-service-statistics',
+ gnunetservicestatistics_src,
+ dependencies: [libgnunetstatistics_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+executable ('gnunet-statistics',
+ gnunetservicestatistics_src,
+ dependencies: [libgnunetstatistics_dep, libgnunetutil_dep],
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('bindir'))
+
+
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.