[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 07/12: BUILD: fix versions and installation paths
|
From: |
gnunet |
|
Subject: |
[gnunet] 07/12: BUILD: fix versions and installation paths |
|
Date: |
Fri, 29 Sep 2023 19:40:04 +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 106af9f64486a76e0064eb8b1153d17c12f9c8df
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Sep 29 17:20:44 2023 +0200
BUILD: fix versions and installation paths
---
src/core/meson.build | 5 +++--
src/dns/meson.build | 2 +-
src/gns/meson.build | 4 ++--
src/gns/nss/meson.build | 3 +++
src/hello/meson.build | 4 ++--
src/identity/meson.build | 2 +-
src/namestore/meson.build | 4 ++--
src/nat-auto/meson.build | 6 ++++--
src/peerinfo-tool/meson.build | 2 +-
src/reclaim/meson.build | 2 +-
src/regex/meson.build | 2 +-
src/rest/meson.build | 4 ++--
src/testbed-logger/meson.build | 2 +-
src/testbed/meson.build | 10 +++++++++-
src/testing/meson.build | 4 ++--
src/transport/meson.build | 12 ++++++------
16 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/src/core/meson.build b/src/core/meson.build
index 4c5bb4d61..cdc5fe99a 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -25,7 +25,7 @@ libgnunetcore = library('gnunetcore',
include_directories: [incdir, configuration_inc],
install: true,
soversion: '0',
- version: '0.1.0',
+ version: '0.0.1',
install_dir: get_option('libdir'))
libgnunetcore_dep = declare_dependency(link_with : libgnunetcore)
pkg.generate(libgnunetcore, url: 'https://www.gnunet.org',
@@ -36,7 +36,8 @@ executable ('gnunet-core',
dependencies: [libgnunetcore_dep, libgnunetutil_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('bindir'))
+
executable ('gnunet-service-core',
gnunetservicecore_src,
dependencies: [libgnunetcore_dep, libgnunetutil_dep,
diff --git a/src/dns/meson.build b/src/dns/meson.build
index e08f081c8..32d33f3f0 100644
--- a/src/dns/meson.build
+++ b/src/dns/meson.build
@@ -43,7 +43,7 @@ executable ('gnunet-service-dns',
libgnunetstatistics_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('bindir'))
+ install_dir: get_option('libdir')/'gnunet'/'libexec')
executable ('gnunet-dns-monitor',
gnunetdnsmonitor_src,
dependencies: [libgnunetdns_dep, libgnunetutil_dep,
libgnunetdns_dep],
diff --git a/src/gns/meson.build b/src/gns/meson.build
index b55a9d883..6e001cf8b 100644
--- a/src/gns/meson.build
+++ b/src/gns/meson.build
@@ -21,7 +21,7 @@ configure_file(input : 'gnunet-gns-proxy-setup-ca.in',
output : 'gnunet-gns-proxy-setup-ca',
configuration : cdata,
install: true,
- install_dir: pkgcfgdir)
+ install_dir: get_option('bindir'))
install_data('gnunet-gns-proxy-ca.template',
install_dir: get_option('datadir')/'gnunet')
@@ -74,7 +74,7 @@ shared_module('gnunet_plugin_rest_gns',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
executable ('gnunet-gns',
diff --git a/src/gns/nss/meson.build b/src/gns/nss/meson.build
index 3e0f6839f..7fd00ceb1 100644
--- a/src/gns/nss/meson.build
+++ b/src/gns/nss/meson.build
@@ -5,6 +5,7 @@
#
shared_library('nss_gns',
['nss_gns_query.c', 'nss_gns.c'],
+ soversion: '2',
dependencies: [libgnunetutil_dep,
libgnunetgnsrecord_dep],
#link_args: ['-fno-version', '-module', '-export-dynamic',
'-shrext', '.so.2', '-W', 'l'],
@@ -13,6 +14,7 @@ shared_library('nss_gns',
install_dir: get_option('libdir'))
shared_library('nss_gns4',
['nss_gns_query.c', 'nss_gns.c'],
+ soversion: '2',
c_args: ['-DNSS_IPV4_ONLY=1'],
dependencies: [libgnunetutil_dep,
libgnunetgnsrecord_dep],
@@ -23,6 +25,7 @@ shared_library('nss_gns4',
shared_library('nss_gns6',
['nss_gns_query.c', 'nss_gns.c'],
c_args: ['-DNSS_IPV6_ONLY=1'],
+ soversion: '2',
dependencies: [libgnunetutil_dep,
libgnunetgnsrecord_dep],
#link_args: ['-fno-version', '-module', '-export-dynamic',
'-shrext', '.so.2', '-W', 'l'],
diff --git a/src/hello/meson.build b/src/hello/meson.build
index 21cef79a4..04d5a6bef 100644
--- a/src/hello/meson.build
+++ b/src/hello/meson.build
@@ -15,8 +15,8 @@ endif
libgnunethello = library('gnunethello',
libgnunethello_src,
- soversion: '1',
- version: '1.0.1',
+ soversion: '0',
+ version: '0.1.0',
dependencies: libgnunetutil_dep,
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/identity/meson.build b/src/identity/meson.build
index 4d2af220c..7987bfcfc 100644
--- a/src/identity/meson.build
+++ b/src/identity/meson.build
@@ -37,7 +37,7 @@ shared_module('gnunet_plugin_rest_identity',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
executable ('gnunet-identity',
diff --git a/src/namestore/meson.build b/src/namestore/meson.build
index ea44779cd..fd7cfe553 100644
--- a/src/namestore/meson.build
+++ b/src/namestore/meson.build
@@ -21,7 +21,7 @@ endif
libgnunetnamestore = library('gnunetnamestore',
libgnunetnamestore_src,
soversion: '0',
- version: '0.1.0',
+ version: '0.0.1',
dependencies: [libgnunetutil_dep,
libgnunetgnsrecord_dep,
libgnunetidentity_dep],
@@ -45,7 +45,7 @@ shared_module('gnunet_plugin_rest_namestore',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
shared_module('gnunet_plugin_namestore_sqlite',
diff --git a/src/nat-auto/meson.build b/src/nat-auto/meson.build
index a7d31d005..eaa64f124 100644
--- a/src/nat-auto/meson.build
+++ b/src/nat-auto/meson.build
@@ -22,7 +22,9 @@ libgnunetnatauto = library('gnunetnatauto',
soversion: '0',
version: '0.0.0',
dependencies: [libgnunetutil_dep, libgnunetnat_dep],
- include_directories: [incdir, configuration_inc])
+ include_directories: [incdir, configuration_inc],
+ install: true,
+ install_dir: get_option('libdir'))
libgnunetnatauto_dep = declare_dependency(link_with : libgnunetnatauto)
executable ('gnunet-nat-auto',
@@ -37,7 +39,7 @@ executable ('gnunet-nat-server',
dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
libgnunetnat_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir')/'gnunet'/'libexec')
+ install_dir: get_option('bindir'))
executable ('gnunet-service-nat-auto',
gnunetservicenatauto_src,
dependencies: [libgnunetnatauto_dep, libgnunetutil_dep,
diff --git a/src/peerinfo-tool/meson.build b/src/peerinfo-tool/meson.build
index 7e63cd2ad..2d5386eba 100644
--- a/src/peerinfo-tool/meson.build
+++ b/src/peerinfo-tool/meson.build
@@ -16,7 +16,7 @@ shared_module('gnunet_plugin_rest_peerinfo',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
executable ('gnunet-peerinfo',
diff --git a/src/reclaim/meson.build b/src/reclaim/meson.build
index b1fdcd6fe..fafc68a92 100644
--- a/src/reclaim/meson.build
+++ b/src/reclaim/meson.build
@@ -107,7 +107,7 @@ shared_module('gnunet_plugin_rest_openid_connect',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
executable ('gnunet-reclaim',
diff --git a/src/regex/meson.build b/src/regex/meson.build
index c8c3fd506..24bc8e31e 100644
--- a/src/regex/meson.build
+++ b/src/regex/meson.build
@@ -23,7 +23,7 @@ endif
libgnunetregex = library('gnunetregex',
libgnunetregex_src,
soversion: '3',
- version: '3.1.0',
+ version: '3.0.1',
dependencies: libgnunetutil_dep,
include_directories: [incdir, configuration_inc],
install: true,
diff --git a/src/rest/meson.build b/src/rest/meson.build
index beb2ee2c3..2dd3d8de4 100644
--- a/src/rest/meson.build
+++ b/src/rest/meson.build
@@ -37,7 +37,7 @@ shared_module('gnunet_plugin_rest_config',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
shared_module('gnunet_plugin_rest_copying',
['plugin_rest_copying.c'],
dependencies: [libgnunetrest_dep,
@@ -46,7 +46,7 @@ shared_module('gnunet_plugin_rest_copying',
mhd_dep],
include_directories: [incdir, configuration_inc],
install: true,
- install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+ install_dir: get_option('libdir') / 'gnunet')
executable ('gnunet-rest-server',
diff --git a/src/testbed-logger/meson.build b/src/testbed-logger/meson.build
index b6250e4bc..5064459c6 100644
--- a/src/testbed-logger/meson.build
+++ b/src/testbed-logger/meson.build
@@ -11,7 +11,7 @@ if get_option('monolith')
subdir_done()
endif
-libgnunettestbedlogger = library('gnunettestbed',
+libgnunettestbedlogger = library('gnunettestbedlogger',
libgnunettestbedlogger_src,
soversion: '0',
version: '0.0.0',
diff --git a/src/testbed/meson.build b/src/testbed/meson.build
index c04dc7259..1de386dab 100644
--- a/src/testbed/meson.build
+++ b/src/testbed/meson.build
@@ -69,7 +69,7 @@ executable ('gnunet-daemon-testbed-blacklist',
install:true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
-executable ('gnunet-daemon-underlay',
+executable ('gnunet-daemon-testbed-underlay',
['gnunet-daemon-testbed-underlay.c'],
dependencies: [libgnunetutil_dep,
libgnunetcore_dep,
@@ -82,6 +82,14 @@ executable ('gnunet-daemon-underlay',
install:true,
install_dir: get_option('libdir')/'gnunet'/'libexec')
+executable ('gnunet-testbed-profiler',
+ ['gnunet-testbed-profiler.c'],
+ dependencies: [libgnunetutil_dep,
+ libgnunetats_dep,
+ libgnunettestbed_dep],
+ include_directories: [incdir, configuration_inc],
+ install:true,
+ install_dir: get_option('bindir'))
executable ('gnunet-service-testbed',
['gnunet-service-testbed.c',
'gnunet-service-testbed_links.c',
diff --git a/src/testing/meson.build b/src/testing/meson.build
index 74adaa738..c591ae849 100644
--- a/src/testing/meson.build
+++ b/src/testing/meson.build
@@ -36,8 +36,8 @@ endif
libgnunettesting = library('gnunettesting',
libgnunettesting_src,
- soversion: '0',
- version: '0.1.0',
+ soversion: '1',
+ version: '1.1.0',
dependencies: [libgnunetutil_dep,
m_dep,
libgnunetarm_dep],
diff --git a/src/transport/meson.build b/src/transport/meson.build
index e0e09e27b..a141ca215 100644
--- a/src/transport/meson.build
+++ b/src/transport/meson.build
@@ -23,7 +23,7 @@ configure_file(input : 'transport.conf.in',
install_dir: pkgcfgdir)
configure_file(input : 'gnunet-transport-certificate-creation.in',
- output : 'gnuent-transport-certificate-creation',
+ output : 'gnunet-transport-certificate-creation',
configuration : cdata,
install: true,
install_dir: get_option('bindir'))
@@ -32,7 +32,7 @@ configure_file(input : 'communicator-unix.conf',
output : 'communicator-unix.conf',
configuration : cdata,
install: true,
- install_dir: get_option('bindir'))
+ install_dir: pkgcfgdir)
if get_option('monolith')
foreach p : libgnunettransport_src #+ libgnunettransportapplication_src +
libgnunettransportcore_src + libgnunettransportcommunicator_src +
libgnunettransportmonitor_src + gnunetservicetransport_src
@@ -60,8 +60,8 @@ libgnunettransporttesting = library('gnunettransporttesting',
'transport-testing-main.c',
'transport-testing-send.c'
],
- soversion: '2',
- version: '2.2.0',
+ soversion: '0',
+ version: '0.0.0',
dependencies: [libgnunetutil_dep,
libgnunettesting_dep,
libgnunettransport_dep,
@@ -136,8 +136,8 @@ libgnunettransporttesting2 =
library('gnunettransporttesting2',
'transport-testing-send2.c',
'transport-testing-communicator.c',
],
- soversion: '2',
- version: '2.2.0',
+ soversion: '0',
+ version: '0.0.0',
dependencies: [libgnunetutil_dep,
libgnunettransportapplication_dep,
libgnunettransport_dep,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] branch master updated (1ae6f7e4c -> eba7744c6), gnunet, 2023/09/29
- [gnunet] 04/12: BUILD: wrong setup for infile, gnunet, 2023/09/29
- [gnunet] 01/12: BUILD: fix math dep, gnunet, 2023/09/29
- [gnunet] 03/12: BUILD: wrong setup for infile, gnunet, 2023/09/29
- [gnunet] 02/12: BUILD: resolver conf from in, gnunet, 2023/09/29
- [gnunet] 08/12: BUILD: fix man installation, gnunet, 2023/09/29
- [gnunet] 07/12: BUILD: fix versions and installation paths,
gnunet <=
- [gnunet] 05/12: BUILD: Fix missing prefix in config data, gnunet, 2023/09/29
- [gnunet] 09/12: BUILD: Add ats tool for now; fix installation of files, gnunet, 2023/09/29
- [gnunet] 11/12: BUILD: Fix doc directory again, actually build statisitics bin, gnunet, 2023/09/29
- [gnunet] 10/12: BUILD: Fix doc directory and doc installation, gnunet, 2023/09/29
- [gnunet] 06/12: BUILD: add tlds to git, gnunet, 2023/09/29
- [gnunet] 12/12: BUILD: towards better handbook integration, gnunet, 2023/09/29