From ee87f542aaebedc406fe3924bfa5f793e5b9d2c3 Mon Sep 17 00:00:00 2001 From: ng0 Date: Wed, 25 Oct 2017 18:01:51 +0000 Subject: [PATCH] gendocs --- contrib/packages/guix/gnunet-doc.scm | 8 +++++--- doc/documentation/Makefile.am | 1 + doc/{ => documentation}/gendocs.sh | 0 doc/{ => documentation}/gendocs_template | 0 doc/{ => documentation}/gendocs_template_min | 0 doc/documentation/gnunet-c-tutorial.texi | 6 +++--- doc/documentation/run-gendocs.sh | 6 ++++++ 7 files changed, 15 insertions(+), 6 deletions(-) rename doc/{ => documentation}/gendocs.sh (100%) mode change 100644 => 100755 rename doc/{ => documentation}/gendocs_template (100%) rename doc/{ => documentation}/gendocs_template_min (100%) create mode 100755 doc/documentation/run-gendocs.sh diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm index b7b0156a0..b1ede6612 100644 --- a/contrib/packages/guix/gnunet-doc.scm +++ b/contrib/packages/guix/gnunet-doc.scm @@ -144,9 +144,11 @@ (replace 'build (lambda _ (chdir "doc/documentation") - (zero? (system* "make" "pdf")) - (zero? (system* "make" "html")) - (zero? (system* "make" "info")))) + ;;(zero? (system* "make" "dev-build")))) + (zero? (system* "sh" "run-gendocs.sh")))) + ;; (zero? (system* "make" "pdf")) + ;; (zero? (system* "make" "html")) + ;; (zero? (system* "make" "info")))) ;;(zero? (system* "make" "doc-all-give-me-the-noise")))) (replace 'install (lambda _ diff --git a/doc/documentation/Makefile.am b/doc/documentation/Makefile.am index bcdeaadb2..5bcf3d2a3 100644 --- a/doc/documentation/Makefile.am +++ b/doc/documentation/Makefile.am @@ -123,6 +123,7 @@ EXTRA_DIST = \ $(gnunet_TEXINFOS) \ $(gnunet_tutorial_examples) \ htmlxref.cnf \ + run-gendocs.sh \ docstyle.css diff --git a/doc/gendocs.sh b/doc/documentation/gendocs.sh old mode 100644 new mode 100755 similarity index 100% rename from doc/gendocs.sh rename to doc/documentation/gendocs.sh diff --git a/doc/gendocs_template b/doc/documentation/gendocs_template similarity index 100% rename from doc/gendocs_template rename to doc/documentation/gendocs_template diff --git a/doc/gendocs_template_min b/doc/documentation/gendocs_template_min similarity index 100% rename from doc/gendocs_template_min rename to doc/documentation/gendocs_template_min diff --git a/doc/documentation/gnunet-c-tutorial.texi b/doc/documentation/gnunet-c-tutorial.texi index 1b216cdaa..aca40d2ef 100644 --- a/doc/documentation/gnunet-c-tutorial.texi +++ b/doc/documentation/gnunet-c-tutorial.texi @@ -341,9 +341,9 @@ a mesh on top of a DHT). @c syntax as described below. @c TODO: Checkout the makedoc script Guile uses. -@image{images/gnunet-tutorial-service,,5in,Service with API and network protocol,.png} - -@image{images/gnunet-tutorial-system,,5in,The layered system architecture of GNUnet,.png} +@c FIXME!!! +@c @image{images/gnunet-tutorial-service,,5in,Service with API and network protocol,.png} +@c @image{images/gnunet-tutorial-system,,5in,The layered system architecture of GNUnet,.png} @c \begin{figure}[!h] @c \begin{center} diff --git a/doc/documentation/run-gendocs.sh b/doc/documentation/run-gendocs.sh new file mode 100755 index 000000000..96b41ea7b --- /dev/null +++ b/doc/documentation/run-gendocs.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +make version.texi +make version2.texi +./gendocs.sh --email gnunet-developers@gnu.org gnunet "GNUnet reference handbook" +./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -- 2.25.1