[GNUnet-SVN] [gnunet] branch master updated (893952aa6 -> 9fabad464)

[gnunet]

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

ng0 pushed a change to branch master
in repository gnunet.

    from 893952aa6 README: mention the added mandatory dependency on Texinfo.
     new 290929434 doc: This should add the ability to explicitly only build 
the documentation.
     new 9fabad464 contrib: bump gnunet guix.

The 2 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:
 .../guix/packages/gnunet/packages/gnunet.scm       | 54 ++++++++++++++++++++--
 doc/Makefile.am                                    | 15 ++++++
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm 
b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
index 574714350..ba24ffc51 100644
--- a/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
+++ b/contrib/packages/guix/packages/gnunet/packages/gnunet.scm
@@ -60,8 +60,8 @@
 ;; Explanation for name scheme: UNIXPATH is capped at 108 characters,
 ;; this causes lots of tests to fail.
 (define-public gnunetg
-  (let* ((commit "e834a115d6a4f54722b494fcaaa14d1e5f6f36b6")
-         (revision "23"))
+  (let* ((commit "2909294342ee9c9cdacfbc75ab852c54f34c7bb9")
+         (revision "25"))
     (package
       (inherit gnunet)
       (name "gnunetg")
@@ -76,7 +76,7 @@
          (file-name (string-append name "-" version "-checkout"))
          (sha256
           (base32
-           "0paxbk19jaxbc8vm5w0y5s6lgmc6n0y0c8j1b20qdrlyaq5jxqzr"))))
+           "1nlzwsbj58bgsjnf46zp03f108d7fmcls7qi0l41iyvniyj3hfa5"))))
       (build-system gnu-build-system)
       (inputs
        `(("glpk" ,glpk)
@@ -159,6 +159,54 @@
            ;;       ;; XXX: HOW??? ulimit -c unlimited
            ;;       (zero? (system* "make" "check"))))))))
 
+(define-public gnunet-doc
+  (package
+    (name "gnunet-doc")
+    (version (package-version gnunetg))
+    (source (package-source gnunetg))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gnu-gettext" ,gnu-gettext)
+       ("texinfo" ,texinfo)
+       ("libtool" ,libtool)))
+    (arguments
+     `(#:tests? #f ;Don't run tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-bin-sh
+           (lambda _
+             (substitute* "bootstrap"
+               (("contrib/pogen.sh") "sh contrib/pogen.sh"))
+             (for-each (lambda (f) (chmod f #o755))
+                       (find-files "po" ""))
+             #t))
+         (add-after 'patch-bin-sh 'bootstrap
+           (lambda _
+             (zero? (system* "sh" "bootstrap"))))
+         (replace 'build
+           (lambda _
+             (chdir "doc")
+             (zero? (system* "make" "doc-all"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (string-append out "/share/doc/gnunet")))
+               (mkdir-p doc)
+               (install-file "gnunet.pdf" doc)
+               (install-file "gnunet.info" doc)
+               (copy-file-recursively "gnunet.html"
+                                      (string-append doc
+                                                     "/html")))
+             #t)))))
+    (synopsis "GNUnet documentation")
+    (description
+     "Gnunet-doc builds the documentation of GNUnet.")
+    (home-page "https://gnunet.org";)
+    (license (package-license gnunet))))
+
 (define-public gnunetgpg
   (package
     (inherit gnunetg)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index e130ccc0e..508326781 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -49,3 +49,18 @@ gnunet_TEXINFOS = \
 EXTRA_DIST = \
        $(gnunet_TEXINFOS) \
        $(gnunet_doc_images)
+
+doc-pdf:
+       @makeinfo --pdf --quiet gnunet.texi
+
+doc-html:
+       @makeinfo --html gnunet.texi
+
+doc-info:
+       @makeinfo --no-split gnunet.texi
+
+# FIXME: rm *.html and *.pdf
+doc-clean:
+       @rm *.aux *.log *.toc *.cp *.cps
+
+doc-all: doc-pdf doc-html doc-info

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