diff options
| author | Gerald Combs <gerald@zing.org> | 2014-11-09 18:13:57 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-11-10 05:30:10 +0000 |
| commit | 62289300d6331b0c23100ae152fddfdc20811733 (patch) | |
| tree | 5248ee2cdda7131c4172cfdbbb77cfe03605cf4c /docbook/Makefile.nmake | |
| parent | 055e4768ece1033afaf952e161a1e5d75a62961f (diff) | |
Finish converting the User's Guide to AsciiDoc.
As with the Developer's Guide, add user-guide-docinfo.xml, which lets us
carry over DocBook front matter. Remove the meta_info chapter. Most of
its contents are now in user-guide-docinfo.xml. Add a DocBook revision
history based on hints from the Git/SVN/CVS revision history.
Remove the various makefile targets for converting AsciiDoc files to
DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version.
Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a
Reviewed-on: https://code.wireshark.org/review/5216
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/Makefile.nmake')
| -rw-r--r-- | docbook/Makefile.nmake | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index 64fdf8cd23..327cf67397 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -31,25 +31,6 @@ A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx .SUFFIXES: .fo .pdf -# Convert an AsciiDoc document to a DocBook chapter -# Used for chapter-by-chapter conversion from DocBook to AsciiDoc. -# .asciidoc -> whole book (.dbk) -> chapter (.xml) -# Can be removed after the User's Guide is converted. -.asciidoc.xml: - $(SH) << - PATH=/usr/bin - PYTHONHOME=/ - $(A2X) --verbose \ - --asciidoc-opts="--conf-file=asciidoc.conf --conf-file=asciidoctor-asciidoc.conf" \ - --no-xmllint \ - --format=docbook --doctype=book \ - $< -<< - mv $*.xml $*.dbk - xmllint --xpath "//chapter | //preface | //appendix" $*.dbk > $@ - -.SUFFIXES: .asciidoc .xml - # -- (Public) targets ------------------------------------------------------- # Make all (default) @@ -91,6 +72,19 @@ git_version.xml: git_version_check wsug_x: wsug_html_chunked wsug_html user-guide-a4.pdf user-guide-us.pdf user-guide.chm +user-guide.xml: user-guide.asciidoc $(WSUG_FILES) + @ echo --- WSUG - XML --- + $(SH) << + PATH=/usr/bin + PYTHONHOME=/ + $(A2X) --verbose \ + --attribute=docinfo \ + --asciidoc-opts="--conf-file=asciidoc.conf --conf-file=asciidoctor-asciidoc.conf" \ + --no-xmllint \ + --format=docbook \ + user-guide.asciidoc +<< + # validate the content wsug.validated: $(WSUG_SOURCE) @ echo --- WSUG - VALIDATING XML --- @@ -164,7 +158,7 @@ wsluarm: make-wsluarm.pl $(WSLUA_MODULES) wsdg_x: wsdg_html_chunked wsdg_html developer-guide-a4.pdf developer-guide-us.pdf developer-guide.chm -developer-guide.xml: developer-guide.asciidoc $(WSDG_FILES) wsluarm +developer-guide.xml: developer-guide.asciidoc $(WSDG_FILES) wsluarm @ echo --- WSDG - XML --- $(SH) << PATH=/usr/bin |