aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@infotropique.org>2017-09-26 15:02:16 +0000
committerng0 <ng0@infotropique.org>2017-09-26 15:02:16 +0000
commit708243c5cde30321231576947171bd1458c70780 (patch)
treee489081ce1a9092c29cea5600ba32e220021cbd2
parent504c048c9b1350c7259a54e317c1140ce194edca (diff)
downloadgnunet-708243c5cde30321231576947171bd1458c70780.tar.gz
gnunet-708243c5cde30321231576947171bd1458c70780.zip
some more changes in doc.
Diffstat
-rw-r--r--contrib/packages/guix/gnunet-doc.scm41
-rw-r--r--doc/Makefile.am101
-rw-r--r--doc/images/structure.dot (renamed from doc/structure.dot)0
3 files changed, 88 insertions, 54 deletions
diff --git a/contrib/packages/guix/gnunet-doc.scm b/contrib/packages/guix/gnunet-doc.scm
index d12de10a2..a988e1125 100644
--- a/contrib/packages/guix/gnunet-doc.scm
+++ b/contrib/packages/guix/gnunet-doc.scm
@@ -46,6 +46,7 @@
46 (gnu packages gstreamer) 46 (gnu packages gstreamer)
47 (gnu packages gtk) 47 (gnu packages gtk)
48 (gnu packages guile) 48 (gnu packages guile)
49 (gnu packages graphviz)
49 (gnu packages image) 50 (gnu packages image)
50 (gnu packages image-viewers) 51 (gnu packages image-viewers)
51 (gnu packages libidn) 52 (gnu packages libidn)
@@ -123,6 +124,7 @@
123 ("autoconf" ,autoconf) 124 ("autoconf" ,autoconf)
124 ("automake" ,automake) 125 ("automake" ,automake)
125 ("gnu-gettext" ,gnu-gettext) 126 ("gnu-gettext" ,gnu-gettext)
127 ("graphviz" ,graphviz) ; dot
126 ("texinfo-5" ,texinfo-5) ; Debian stable 128 ("texinfo-5" ,texinfo-5) ; Debian stable
127 ("libtool" ,libtool))) 129 ("libtool" ,libtool)))
128 (arguments 130 (arguments
@@ -141,22 +143,29 @@
141 (chdir "doc") 143 (chdir "doc")
142 (zero? (system* "make" "doc-all-give-me-the-noise")))) 144 (zero? (system* "make" "doc-all-give-me-the-noise"))))
143 (replace 'install 145 (replace 'install
144 (lambda* (#:key outputs #:allow-other-keys) 146 (lambda _
145 (let* ((out (assoc-ref outputs "out")) 147 (zero? (system* "make" "doc-all-install")))))))
146 (doc (string-append out "/share/doc/gnunet"))) 148 ;;(lambda* (#:key outputs #:allow-other-keys)
147 (mkdir-p doc) 149 ;; (let* ((out (assoc-ref outputs "out"))
148 (mkdir-p (string-append doc "/gnunet")) 150 ;; (doc (string-append out "/share/doc/gnunet")))
149 (install-file "gnunet.pdf" doc) 151 ;; (mkdir-p doc)
150 (install-file "gnunet.info" doc) 152 ;; (copy-recursively "images"
151 (copy-recursively "gnunet" 153 ;; (string-append doc
152 (string-append doc 154 ;; "/images"))
153 "/gnunet")) 155 ;; (mkdir-p (string-append doc "/gnunet"))
154 (install-file "gnunet-c-tutorial.pdf" doc) 156 ;; (install-file "gnunet.pdf" doc)
155 (install-file "gnunet-c-tutorial.info" doc) 157 ;; (install-file "gnunet.info" doc)
156 (copy-recursively "gnunet-c-tutorial" 158 ;; (install-file "gnunet.log" doc) ;TODO: Move to 'dev' output?
157 (string-append doc 159 ;; (copy-recursively "gnunet"
158 "/gnunet-c-tutorial"))) 160 ;; (string-append doc
159 #t))))) 161 ;; "/gnunet"))
162 ;; (install-file "gnunet-c-tutorial.pdf" doc)
163 ;; (install-file "gnunet-c-tutorial.info" doc)
164 ;; (install-file "gnunet-c-tutorial.log" doc) ;TODO: Move to 'dev' output?
165 ;; (copy-recursively "gnunet-c-tutorial"
166 ;; (string-append doc
167 ;; "/gnunet-c-tutorial")))
168 ;; #t)))))
160 (synopsis "Documentation of GNUnet") 169 (synopsis "Documentation of GNUnet")
161 (description 170 (description
162 "GNUnet documentation build") 171 "GNUnet documentation build")
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ee735f171..cbb5fb462 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,39 +5,42 @@ docdir = $(datadir)/doc/gnunet/
5 5
6infoimagedir = $(infodir)/images 6infoimagedir = $(infodir)/images
7 7
8dist_infoimage_DATA = \ 8DOT_FILES = images/$(wildcard *.dot)
9 images/gnunet-gtk-0-10-gns-a-done.png \ 9
10 images/gnunet-gtk-0-10-gns-a.png \ 10DOT_VECTOR_GRAPHICS = \
11 images/daemon_lego_block.png \ 11 $(DOT_FILES:%.dot=%.eps) \
12 images/gnunet-gtk-0-10-gns.png \ 12 $(DOT_FILES:%.dot=%.pdf)
13 images/gnunet-0-10-peerinfo.png \ 13
14 images/gnunet-gtk-0-10-identity.png \ 14dist_infoimage_DATA = \
15 images/gnunet-fs-gtk-0-10-star-tab.png \ 15 images/$(wildcard *.png) \
16 images/gnunet-gtk-0-10.png \ 16 images/$(wildcard *.svg) \
17 images/gnunet-gtk-0-10-download-area.png \ 17 $(DOT_FILES:%.dot=%.png)
18 images/gnunet-gtk-0-10-search-selected.png \ 18
19 images/gnunet-gtk-0-10-fs-menu.png \ 19DOT_OPTIONS = \
20 images/gnunet-gtk-0-10-traffic.png \ 20 -Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \
21 images/gnunet-gtk-0-10-fs.png \ 21 -Nfontsite=9 -Nheight=.1 -Nwidth=.1
22 images/gnunet-namestore-gtk-phone.png \ 22
23 images/gnunet-gtk-0-10-fs-publish-editing.png \ 23.dot.png:
24 images/gnunet-namestore-gtk-vpn.png \ 24 $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
25 images/gnunet-gtk-0-10-fs-published.png \ 25 mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
26 images/gnunet-setup-exit.png \ 26
27 images/gnunet-gtk-0-10-fs-publish.png \ 27.dot.pdf:
28 images/iceweasel-preferences.png \ 28 $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
29 images/gnunet-gtk-0-10-fs-publish-select.png \ 29 mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
30 images/iceweasel-proxy.png \ 30
31 images/gnunet-gtk-0-10-fs-publish-with-file_0.png \ 31.dot.eps:
32 images/service_lego_block.png \ 32 $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
33 images/gnunet-gtk-0-10-fs-publish-with-file.png \ 33 mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
34 images/service_stack.png \ 34
35 images/gnunet-gtk-0-10-fs-search.png \ 35.png.eps:
36 images/gnunet-tutorial-service.png \ 36 $(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
37 images/gnunet-tutorial-system.png \ 37 mv "$@-tmp.eps" "$@"
38 images/daemon_lego_block.svg \ 38
39 images/lego_stack.svg \ 39pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
40 images/service_lego_block.svg 40info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
41ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
42 $(top_srcdir)/%D%/images/coreutils-size-map.eps
43dvi-local: ps-local
41 44
42gnunet_tutorial_examples = \ 45gnunet_tutorial_examples = \
43 001.c \ 46 001.c \
@@ -83,11 +86,13 @@ gnunet_TEXINFOS = \
83 fdl-1.3.texi \ 86 fdl-1.3.texi \
84 gpl-3.0.texi 87 gpl-3.0.texi
85 88
86EXTRA_DIST = \ 89EXTRA_DIST = \
87 $(gnunet_TEXINFOS) \ 90 $(gnunet_TEXINFOS) \
88 $(gnunet_tutorial_examples) \ 91 $(gnunet_tutorial_examples) \
89 outdated-and-old-installation-instructions.txt \ 92 $(DOT_FILES) \
90 gnunet-c-tutorial-v1.pdf \ 93 $(DOT_VECTOR_GRAPHICS) \
94 outdated-and-old-installation-instructions.txt \
95 gnunet-c-tutorial-v1.pdf \
91 README.txt 96 README.txt
92 97
93daemon_lego_block.png: images/daemon_lego_block.svg 98daemon_lego_block.png: images/daemon_lego_block.svg
@@ -146,4 +151,24 @@ doc-info-tutorial-noise: version.texi
146 151
147doc-all-give-me-the-noise: doc-pdf-noise doc-html-noise doc-info-noise doc-pdf-tutorial-noise doc-html-tutorial-noise doc-info-tutorial-noise 152doc-all-give-me-the-noise: doc-pdf-noise doc-html-noise doc-info-noise doc-pdf-tutorial-noise doc-html-tutorial-noise doc-info-tutorial-noise
148 153
154doc-all-install: doc-all-give-me-the-noise
155 @mkdir -p $(DESTDIR)/$(docdir)
156 @mkdir -p $(DESTDIR)/$(infoimagedir)
157 @mkdir -p $(DESTDIR)/$(infodir)
158 @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
159 @install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir)
160 @install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir)
161 @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
162 @cp -r gnunet $(DESTDIR)/$(docdir)
163 @cp -r gnunet-c-tutorial $(DESTDIR)/$(docdir)
164 @cp -r images $(DESTDIR)/$(infoimagedir)
165
166CLEANFILES = \
167 gnunet.log \
168 gnunet-c-tutorial.log \
169 $(wildcard *.aux) \
170 $(wildcard *.toc) \
171 $(wildcard *.cp) \
172 $(wildcard *.cps)
173
149.PHONY: version.texi 174.PHONY: version.texi
diff --git a/doc/structure.dot b/doc/images/structure.dot
index a53db90b8..a53db90b8 100644
--- a/doc/structure.dot
+++ b/doc/images/structure.dot
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 01:14:59 +0000