[GNUnet-SVN] [gnunet] branch master updated (5378a0bf6 -> 811d311f4)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 5378a0bf6 RPS service: Write push frequency and pull delays to disk
     new 0c2092a61 installation.texi: some texinfo versions reported this as 
bad syntax.
     new 4718e7b56 fnindex is wrong texinfo.
     new 811d311f4 documentation: Remove usage of version and version2.texi, 
replace with portable sed.

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:
 doc/documentation/Makefile.am                | 32 ++++++++++++----------------
 doc/documentation/chapters/developer.texi    |  2 +-
 doc/documentation/chapters/installation.texi | 11 +++++-----
 doc/documentation/gnunet-c-tutorial.texi     |  5 ++---
 doc/documentation/gnunet.texi                |  6 ++----
 doc/documentation/run-gendocs.sh             |  4 ++--
 6 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am
index 7eed6efb6..cd3fca854 100644
--- a/doc/documentation/Makefile.am
+++ b/doc/documentation/Makefile.am
@@ -126,6 +126,7 @@ EXTRA_DIST =                                                
        \
        $(gnunet_TEXINFOS)                                      \
        $(gnunet_tutorial_examples)                             \
        htmlxref.cnf                                            \
+       gversion.texi
        run-gendocs.sh                                          \
        docstyle.css
 
@@ -160,27 +161,20 @@ lego_stack.png: images/lego_stack.svg
        convert images/lego_stack.svg images/lego_stack.png &&
        pngcrush images/lego_stack.png images/lego_stack.png
 
-# FIXME: The usage of 'date' strings causes a warning.
-# version.texi:
-#      echo "@set UPDATED $(date +'%d %B %Y')" > $@
-#      echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@
-#      echo "@set EDITION $(PACKAGE_VERSION)" >> $@
-#      echo "@set VERSION $(PACKAGE_VERSION)" >> $@
-
-# Workaround for makeinfo error. Which in turn introduces more
-# date-related 'warnings' for GNUism. Well.
-version2.texi:
-       echo "@set UPDATED $(date +'%d %B %Y')" > $@
-       echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@
-       echo "@set EDITION $(PACKAGE_VERSION)" >> $@
-       echo "@set VERSION $(PACKAGE_VERSION)" >> $@
+# XXX: is this sed invocation portable enough? otherwise try tr(1).
+version.texi/replacement: version.texi/replacement/revert
+       @sed -i "s/GPACKAGE_VERSION/$(PACKAGE_VERSION)/g" gversion.texi
+
+version.texi/replacement/revert:
+       @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi
+       @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi
 
 if SECTION7
-gnunet-c-tutorial.7: version2.texi
+gnunet-c-tutorial.7: version.texi/replacement
        @echo Attempting to output an mdoc formatted section 7 document
        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > 
../man/gnunet-c-tutorial.7
 
-gnunet-documentation.7: version2.texi
+gnunet-documentation.7: version.texi/replacement
        @echo Attempting to output an mdoc formatted section 7 document
        @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > 
../man/gnunet-documentation.7
 
@@ -191,6 +185,8 @@ endif
 #doc-clean:
 #      @rm *.aux *.log *.toc *.cp *.cps
 
+all: version.texi/replacement
+
 doc-all-install:
        @mkdir -p $(DESTDIR)/$(docdir)
        @mkdir -p $(DESTDIR)/$(infoimagedir)
@@ -208,7 +204,7 @@ doc-gendoc-install:
 
 #      @cp -r images $(DESTDIR)/$(infoimagedir)
 
-dev-build: version.texi version2.texi
+dev-build: version.texi/replacement
        @makeinfo --pdf gnunet.texi
        @makeinfo --pdf gnunet-c-tutorial.texi
        @makeinfo --html gnunet.texi
@@ -217,7 +213,7 @@ dev-build: version.texi version2.texi
        @makeinfo --no-split gnunet-c-tutorial.texi
 
 # TODO: Add more to clean.
-clean:
+clean: version.texi/replacement/revert
        @rm -f gnunet.pdf
        @rm -f gnunet.html
        @rm -f gnunet.info
diff --git a/doc/documentation/chapters/developer.texi 
b/doc/documentation/chapters/developer.texi
index 4038190a1..d9c92247b 100644
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -3364,7 +3364,7 @@ using @code{GNUNET_SERVER_add_handlers}.
 The service will already have registered a handler for the
 "TEST" message.
 
address@hidden GNUNET_SERVICE_Options
address@hidden GNUNET_SERVICE_Options
 The option bitfield (@code{enum GNUNET_SERVICE_Options})
 determines how a service should behave during shutdown.
 There are three key strategies:
diff --git a/doc/documentation/chapters/installation.texi 
b/doc/documentation/chapters/installation.texi
index 6bf67ee97..6b68ac498 100644
--- a/doc/documentation/chapters/installation.texi
+++ b/doc/documentation/chapters/installation.texi
@@ -1362,12 +1362,13 @@ blacklisted and if not, it asks the blacklisting 
clients. Clients are
 asked if it is OK to connect to a peer ID, the plugin is omitted.
 
 On blacklist check for (peer, plugin)
+
 @itemize @bullet
address@hidden Do we have a local blacklist entry for this peer and this 
plugin?@
address@hidden YES: disallow connection@
address@hidden Do we have a local blacklist entry for this peer and all 
plugins?@
address@hidden YES: disallow connection@
address@hidden Does one of the clients disallow?@
address@hidden Do we have a local blacklist entry for this peer and this plugin?
address@hidden YES: disallow connection
address@hidden Do we have a local blacklist entry for this peer and all plugins?
address@hidden YES: disallow connection
address@hidden Does one of the clients disallow?
 @item YES: disallow connection
 @end itemize
 
diff --git a/doc/documentation/gnunet-c-tutorial.texi 
b/doc/documentation/gnunet-c-tutorial.texi
index a41075a17..cf42d8e8b 100644
--- a/doc/documentation/gnunet-c-tutorial.texi
+++ b/doc/documentation/gnunet-c-tutorial.texi
@@ -3,11 +3,10 @@
 @setfilename gnunet-c-tutorial.info
 @documentencoding UTF-8
 @settitle GNUnet C Tutorial
address@hidden 2
address@hidden @exampleindent 2
 @c %**end of header
 
address@hidden including 'version.texi' makes makeinfo throw errors.
address@hidden version2.texi
address@hidden gversion.texi
 
 @copying
 Copyright @copyright{} 2001-2018 GNUnet e.V.
diff --git a/doc/documentation/gnunet.texi b/doc/documentation/gnunet.texi
index 3781b866b..003ad8143 100644
--- a/doc/documentation/gnunet.texi
+++ b/doc/documentation/gnunet.texi
@@ -3,15 +3,14 @@
 @setfilename gnunet.info
 @documentencoding UTF-8
 @settitle GNUnet Reference Manual
address@hidden 2
-
address@hidden version.texi
address@hidden @exampleindent 2
 
 @c Set Versions which might be used in more than one place:
 @set GNUFTP-URL https://ftp.gnu.org/gnu/gnunet
 @set PYPI-URL https://pypi.python.org/packages/source
 @set GNURL-VERSION-CURRENT 7.55.1
 @set GNUNET-DIST-URL https://gnunet.org/sites/default/files/
address@hidden gversion.texi
 @c @set OPENPGP-SIGNING-KEY-ID
 
 @copying
@@ -59,7 +58,6 @@ Foundation Web site at 
@url{http://www.gnu.org/licenses/gpl.html}.
 @page
 @vskip 0pt plus 1filll
 Edition @value{EDITION} @*
address@hidden @*
 
 @insertcopying
 @end titlepage
diff --git a/doc/documentation/run-gendocs.sh b/doc/documentation/run-gendocs.sh
index d02570177..5e60a2d0f 100755
--- a/doc/documentation/run-gendocs.sh
+++ b/doc/documentation/run-gendocs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-make version.texi
-make version2.texi
+make version.texi/replacement
+
 ./gendocs.sh --email address@hidden gnunet-c-tutorial "GNUnet C Tutorial" -o 
"manual/gnunet-c-tutorial"
 #cd manual
 #mkdir gnunet-c-tutorial

-- 
To stop receiving notification emails like this one, please contact
address@hidden