diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-08-24 19:06:56 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-08-25 22:00:29 +0000 |
| commit | d3728738ddbb24daf248aa4d2f9ad94702a1ed0f (patch) | |
| tree | ad6ebff78337b75b610f5ecf8777afa0d4fad945 /docbook/Makefile.nmake | |
| parent | 1aead575b08179689237c7e920113f4def90239b (diff) | |
Updates for docbook builds on Windows
In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1
In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows)
and not the Cygwin python used in asciidoc
In Readme.txt update some Cygwin package info
Change-Id: I117ec6bbdabc34829b421fd514508383b925090f
Reviewed-on: https://code.wireshark.org/review/3816
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'docbook/Makefile.nmake')
| -rw-r--r-- | docbook/Makefile.nmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index a4ec094f3b..7d2c76c70e 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -38,6 +38,7 @@ A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx .asciidoc.xml: $(SH) << PATH=/usr/bin + PYTHONHOME=/ $(A2X) --verbose \ --asciidoc-opts="--conf-file=asciidoc.conf --conf-file=asciidoctor-asciidoc.conf" \ --no-xmllint \ @@ -166,8 +167,10 @@ 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) + @ echo --- WSDG - XML --- $(SH) << PATH=/usr/bin + PYTHONHOME=/ $(A2X) --verbose \ --attribute=docinfo \ --asciidoc-opts="--conf-file=asciidoc.conf --conf-file=asciidoctor-asciidoc.conf" \ @@ -253,6 +256,7 @@ release-notes.html: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - HTML --- $(SH) << PATH=/usr/bin + PYTHONHOME=/ $(A2X) -v --format=xhtml $(A2X_HTML_OPTS) release-notes.asciidoc << @@ -261,6 +265,7 @@ release-notes.txt: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - TXT --- $(SH) << PATH=/usr/bin + PYTHONHOME=/ $(A2X) -v --format=text $(A2X_TEXT_OPTS) \ --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ release-notes.asciidoc @@ -275,6 +280,7 @@ release-notes-us.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl @ echo --- RELEASE NOTES - PDF US LETTER PAPER --- $(SH) << PATH=/usr/bin + PYTHONHOME=/ $(A2X) --format=pdf $(A2X_HTML_OPTS) \ --xsltproc-opts "--stringparam paper.type letter --nonet" \ --xsl-file=custom_layer_pdf.xsl \ @@ -287,6 +293,7 @@ release-notes-a4.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl @ echo --- RELEASE NOTES - PDF A4 PAPER --- $(SH) << PATH=/usr/bin + PYTHONHOME=/ $(A2X) --format=pdf $(A2X_HTML_OPTS) \ --xsltproc-opts "--stringparam paper.type A4 --nonet" \ --xsl-file=custom_layer_pdf.xsl \ |