[gnunet] 03/03: build: move version script from contrib

[gnunet]

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

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

commit 524d1b43e081064d2fbcedd7b68904c1c9e7ec79
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Mon Oct 16 13:26:23 2023 +0200

    build: move version script from contrib
---
 configure.ac                        |  2 +-
 contrib/Makefile.am                 |  1 -
 meson.build                         | 10 +++++-----
 scripts/Makefile.am                 |  3 +++
 {contrib => scripts}/get_version.sh |  0
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 05e902399..8f67ed651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #
 #
 AC_PREREQ([2.69])
-AC_INIT([gnunet],[m4_esyscmd_s(sh 
contrib/get_version.sh)],[bug-gnunet@gnu.org])
+AC_INIT([gnunet],[m4_esyscmd_s(sh 
scripts/get_version.sh)],[bug-gnunet@gnu.org])
 
 gnunet_version=m4_esyscmd_s(sh contrib/get_version.sh)
 gnunet_major_version=m4_esyscmd_s(sh contrib/get_version.sh --major)
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ce88f6c35..65a8e8da9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -195,7 +195,6 @@ EXTRA_DIST = \
   docker/Dockerfile \
   docker/README.md \
   benchmark/collect.awk \
-  get_version.sh \
   packages/guix/guix.scm \
   indent_pre-commit \
   Makefile.inc \
diff --git a/meson.build b/meson.build
index da377735a..b3bb62fac 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 ## EXPERIMENTAL --- WORK IN PROGRESS --- USE AT YOUR OWN PERIL --- ##
 project('gnunet', 'c', license: 'AGPLv3',
-        version: run_command('sh', 'contrib/get_version.sh', check: 
true).stdout().strip())
+        version: run_command('sh', 'scripts/get_version.sh', check: 
true).stdout().strip())
 
 add_project_arguments('-D_GNU_SOURCE', language : 'c')
 
@@ -9,13 +9,13 @@ incdir = include_directories('src/include')
 cdata = configuration_data()
 
 # Version
-gnunet_version = run_command('sh', 'contrib/get_version.sh', check: 
true).stdout().strip()
+gnunet_version = run_command('sh', 'scripts/get_version.sh', check: 
true).stdout().strip()
 cdata.set('gnunet_version', gnunet_version)
-r = run_command('sh', 'contrib/get_version.sh', '--major', check: true)
+r = run_command('sh', 'scripts/get_version.sh', '--major', check: true)
 cdata.set('gnunet_major_version', r.stdout().strip())
-r = run_command('sh', 'contrib/get_version.sh', '--minor', check: true)
+r = run_command('sh', 'scripts/get_version.sh', '--minor', check: true)
 cdata.set('gnunet_minor_version', r.stdout().strip())
-r = run_command('sh', 'contrib/get_version.sh', '--micro', check: true)
+r = run_command('sh', 'scripts/get_version.sh', '--micro', check: true)
 cdata.set('gnunet_micro_version', r.stdout().strip())
 
 pkgcfgdir = get_option('datadir')/'gnunet'/'config.d'
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 062805895..81e413696 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -9,6 +9,9 @@ dist_pkgdata_DATA = \
   netjail/topo.sh \
   testing-ng/block.sh
 
+EXTRA_DIST = \
+  get_version.sh
+
 install-data-hook:
        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
diff --git a/contrib/get_version.sh b/scripts/get_version.sh
similarity index 100%
rename from contrib/get_version.sh
rename to scripts/get_version.sh

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