[gnunet] branch master updated (b99f555e7 -> 524d1b43e)

[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 b99f555e7 build: fix make install of new script location
     new 8e77eaf45 build: delete deprecated buildfiles for docs
     new 4e6de4473 build: delete deprecated buildfiles for docs
     new 524d1b43e build: move version script from contrib

The 3 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:
 configure.ac                                   |  2 +-
 contrib/Makefile.am                            |  2 --
 contrib/gnunet_infrastructure/handbook_pull.sh | 18 ------------------
 meson.build                                    | 10 +++++-----
 scripts/Makefile.am                            |  3 +++
 {contrib => scripts}/get_version.sh            |  0
 6 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100755 contrib/gnunet_infrastructure/handbook_pull.sh
 rename {contrib => scripts}/get_version.sh (100%)

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 ab4c41dc9..65a8e8da9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -195,8 +195,6 @@ EXTRA_DIST = \
   docker/Dockerfile \
   docker/README.md \
   benchmark/collect.awk \
-  get_version.sh \
-  gnunet_infrastructure/handbook_pull.sh \
   packages/guix/guix.scm \
   indent_pre-commit \
   Makefile.inc \
diff --git a/contrib/gnunet_infrastructure/handbook_pull.sh 
b/contrib/gnunet_infrastructure/handbook_pull.sh
deleted file mode 100755
index 16c7430ae..000000000
--- a/contrib/gnunet_infrastructure/handbook_pull.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# This essentially could be solved by:
-# git config pull.rebase true
-# git config rebase.autoStash true
-# but chances are that this is easy to
-# forget.
-# so execute this file on the server
-# instead of setting a git config.
-
-echo "Running git pull with autoStash and rebase"
-echo "If anything breaks in the future, delete"
-echo "and repeat - it was once considered to"
-echo "be responsible for non-trivial conflicts!"
-echo "We apply this because we need to build the"
-echo "handbook and tutorial without manual interventions."
-
-git pull --rebase --autostash
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.