diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/documentation/Makefile.am | 32 | ||||
-rw-r--r-- | doc/documentation/gnunet-c-tutorial.texi | 5 | ||||
-rw-r--r-- | doc/documentation/gnunet.texi | 6 | ||||
-rwxr-xr-x | doc/documentation/run-gendocs.sh | 4 |
4 files changed, 20 insertions, 27 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 = \ | |||
126 | $(gnunet_TEXINFOS) \ | 126 | $(gnunet_TEXINFOS) \ |
127 | $(gnunet_tutorial_examples) \ | 127 | $(gnunet_tutorial_examples) \ |
128 | htmlxref.cnf \ | 128 | htmlxref.cnf \ |
129 | gversion.texi | ||
129 | run-gendocs.sh \ | 130 | run-gendocs.sh \ |
130 | docstyle.css | 131 | docstyle.css |
131 | 132 | ||
@@ -160,27 +161,20 @@ lego_stack.png: images/lego_stack.svg | |||
160 | convert images/lego_stack.svg images/lego_stack.png && | 161 | convert images/lego_stack.svg images/lego_stack.png && |
161 | pngcrush images/lego_stack.png images/lego_stack.png | 162 | pngcrush images/lego_stack.png images/lego_stack.png |
162 | 163 | ||
163 | # FIXME: The usage of 'date' strings causes a warning. | 164 | # XXX: is this sed invocation portable enough? otherwise try tr(1). |
164 | # version.texi: | 165 | version.texi/replacement: version.texi/replacement/revert |
165 | # echo "@set UPDATED $(date +'%d %B %Y')" > $@ | 166 | @sed -i "s/GPACKAGE_VERSION/$(PACKAGE_VERSION)/g" gversion.texi |
166 | # echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@ | 167 | |
167 | # echo "@set EDITION $(PACKAGE_VERSION)" >> $@ | 168 | version.texi/replacement/revert: |
168 | # echo "@set VERSION $(PACKAGE_VERSION)" >> $@ | 169 | @echo "@set VERSION GPACKAGE_VERSION" > gversion.texi |
169 | 170 | @echo "@set EDITION GPACKAGE_VERSION" >> gversion.texi | |
170 | # Workaround for makeinfo error. Which in turn introduces more | ||
171 | # date-related 'warnings' for GNUism. Well. | ||
172 | version2.texi: | ||
173 | echo "@set UPDATED $(date +'%d %B %Y')" > $@ | ||
174 | echo "@set UPDATED-MONTH $(date +'%B %Y')" >> $@ | ||
175 | echo "@set EDITION $(PACKAGE_VERSION)" >> $@ | ||
176 | echo "@set VERSION $(PACKAGE_VERSION)" >> $@ | ||
177 | 171 | ||
178 | if SECTION7 | 172 | if SECTION7 |
179 | gnunet-c-tutorial.7: version2.texi | 173 | gnunet-c-tutorial.7: version.texi/replacement |
180 | @echo Attempting to output an mdoc formatted section 7 document | 174 | @echo Attempting to output an mdoc formatted section 7 document |
181 | @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > ../man/gnunet-c-tutorial.7 | 175 | @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet-c-tutorial.texi > ../man/gnunet-c-tutorial.7 |
182 | 176 | ||
183 | gnunet-documentation.7: version2.texi | 177 | gnunet-documentation.7: version.texi/replacement |
184 | @echo Attempting to output an mdoc formatted section 7 document | 178 | @echo Attempting to output an mdoc formatted section 7 document |
185 | @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7 | 179 | @texi2mdoc -I$(pwd):$(pwd)/chapters gnunet.texi > ../man/gnunet-documentation.7 |
186 | 180 | ||
@@ -191,6 +185,8 @@ endif | |||
191 | #doc-clean: | 185 | #doc-clean: |
192 | # @rm *.aux *.log *.toc *.cp *.cps | 186 | # @rm *.aux *.log *.toc *.cp *.cps |
193 | 187 | ||
188 | all: version.texi/replacement | ||
189 | |||
194 | doc-all-install: | 190 | doc-all-install: |
195 | @mkdir -p $(DESTDIR)/$(docdir) | 191 | @mkdir -p $(DESTDIR)/$(docdir) |
196 | @mkdir -p $(DESTDIR)/$(infoimagedir) | 192 | @mkdir -p $(DESTDIR)/$(infoimagedir) |
@@ -208,7 +204,7 @@ doc-gendoc-install: | |||
208 | 204 | ||
209 | # @cp -r images $(DESTDIR)/$(infoimagedir) | 205 | # @cp -r images $(DESTDIR)/$(infoimagedir) |
210 | 206 | ||
211 | dev-build: version.texi version2.texi | 207 | dev-build: version.texi/replacement |
212 | @makeinfo --pdf gnunet.texi | 208 | @makeinfo --pdf gnunet.texi |
213 | @makeinfo --pdf gnunet-c-tutorial.texi | 209 | @makeinfo --pdf gnunet-c-tutorial.texi |
214 | @makeinfo --html gnunet.texi | 210 | @makeinfo --html gnunet.texi |
@@ -217,7 +213,7 @@ dev-build: version.texi version2.texi | |||
217 | @makeinfo --no-split gnunet-c-tutorial.texi | 213 | @makeinfo --no-split gnunet-c-tutorial.texi |
218 | 214 | ||
219 | # TODO: Add more to clean. | 215 | # TODO: Add more to clean. |
220 | clean: | 216 | clean: version.texi/replacement/revert |
221 | @rm -f gnunet.pdf | 217 | @rm -f gnunet.pdf |
222 | @rm -f gnunet.html | 218 | @rm -f gnunet.html |
223 | @rm -f gnunet.info | 219 | @rm -f gnunet.info |
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 @@ | |||
3 | @setfilename gnunet-c-tutorial.info | 3 | @setfilename gnunet-c-tutorial.info |
4 | @documentencoding UTF-8 | 4 | @documentencoding UTF-8 |
5 | @settitle GNUnet C Tutorial | 5 | @settitle GNUnet C Tutorial |
6 | @exampleindent 2 | 6 | @c @exampleindent 2 |
7 | @c %**end of header | 7 | @c %**end of header |
8 | 8 | ||
9 | @c including 'version.texi' makes makeinfo throw errors. | 9 | @include gversion.texi |
10 | @include version2.texi | ||
11 | 10 | ||
12 | @copying | 11 | @copying |
13 | Copyright @copyright{} 2001-2018 GNUnet e.V. | 12 | 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 @@ | |||
3 | @setfilename gnunet.info | 3 | @setfilename gnunet.info |
4 | @documentencoding UTF-8 | 4 | @documentencoding UTF-8 |
5 | @settitle GNUnet Reference Manual | 5 | @settitle GNUnet Reference Manual |
6 | @exampleindent 2 | 6 | @c @exampleindent 2 |
7 | |||
8 | @include version.texi | ||
9 | 7 | ||
10 | @c Set Versions which might be used in more than one place: | 8 | @c Set Versions which might be used in more than one place: |
11 | @set GNUFTP-URL https://ftp.gnu.org/gnu/gnunet | 9 | @set GNUFTP-URL https://ftp.gnu.org/gnu/gnunet |
12 | @set PYPI-URL https://pypi.python.org/packages/source | 10 | @set PYPI-URL https://pypi.python.org/packages/source |
13 | @set GNURL-VERSION-CURRENT 7.55.1 | 11 | @set GNURL-VERSION-CURRENT 7.55.1 |
14 | @set GNUNET-DIST-URL https://gnunet.org/sites/default/files/ | 12 | @set GNUNET-DIST-URL https://gnunet.org/sites/default/files/ |
13 | @include gversion.texi | ||
15 | @c @set OPENPGP-SIGNING-KEY-ID | 14 | @c @set OPENPGP-SIGNING-KEY-ID |
16 | 15 | ||
17 | @copying | 16 | @copying |
@@ -59,7 +58,6 @@ Foundation Web site at @url{http://www.gnu.org/licenses/gpl.html}. | |||
59 | @page | 58 | @page |
60 | @vskip 0pt plus 1filll | 59 | @vskip 0pt plus 1filll |
61 | Edition @value{EDITION} @* | 60 | Edition @value{EDITION} @* |
62 | @value{UPDATED} @* | ||
63 | 61 | ||
64 | @insertcopying | 62 | @insertcopying |
65 | @end titlepage | 63 | @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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | make version.texi | 3 | make version.texi/replacement |
4 | make version2.texi | 4 | |
5 | ./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -o "manual/gnunet-c-tutorial" | 5 | ./gendocs.sh --email gnunet-developers@gnu.org gnunet-c-tutorial "GNUnet C Tutorial" -o "manual/gnunet-c-tutorial" |
6 | #cd manual | 6 | #cd manual |
7 | #mkdir gnunet-c-tutorial | 7 | #mkdir gnunet-c-tutorial |