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>

3 files changed, 28 insertions, 9 deletions

diff --git a/config.nmake b/config.nmake
index f9968168e4..cca598874a 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1285,9 +1285,19 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 12.0\VC\redist\$(TARGET_MACHI
 # You may want to install the FOP hyphenation patterns from
 # http://offo.sourceforge.net/hyphenation/
 !IFNDEF FOP
+
+!IF EXIST(docbook\fop-1.1\fop.bat)
+FOP=fop-1.1\fop.bat
+!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\fop-1.1\fop.bat)
+FOP=$(WIRESHARK_LIB_DIR)\fop-1.1\fop.bat
+!ELSE IF EXIST(docbook\fop-1.0\fop.bat)
 FOP=fop-1.0\fop.bat
+!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat)
+FOP=$(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat
 !ENDIF
 
+!ENDIF FOP
+
 # Additional options to fop.
 FOP_OPTS=-Xmx256m
 
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 \
diff --git a/docbook/README.txt b/docbook/README.txt
index 888db50027..2404e72866 100644
--- a/docbook/README.txt
+++ b/docbook/README.txt
@@ -116,23 +116,25 @@ http://www.microsoft.com/en-us/download/details.aspx?id=21138
 
 Packages for Win32
 ------------------
-See ..\config.nmake for Win32 settings. You may need to run
-"build-docbook-catalog" in order to register your catalog properly.
+See ..\config.nmake for Win32 settings.
+Installing the asciidoc package will pull in almost all the other required Cygwin packages.
+You may need to run "build-docbook-catalog" from a Cygwin bash prompt in order to register your catalog properly.
 
 Tool/File           Cygwin Package          Opt./Mand.  Comments
 ---------           --------------          ----------  --------
-xsltproc:           Doc/libxslt             M
-xmllint:            Doc/libxml2             M
-xsl stylesheets:    Doc/docbook-xsl         M           docbook.xsl, chunk.xsl and htmlhelp.xsl
-docbookx.dtd:       Doc/docbook-xml42       M           a later version may be required (e.g. Doc/docbook-xml45), depending on your asciidoc installation
+asciidoc            Doc/asciidoc            M           cygwin python is a dependency and will also be installed (if not installed)
+xsltproc:           Libs/libxslt            M
+xmllint:            Libs/libxml2            M
+xsl stylesheets:    Text/docbook-xsl        M           docbook.xsl, chunk.xsl and htmlhelp.xsl
+docbookx.dtd:       Text/docbook-xml42      M           a later version may be required (e.g. Doc/docbook-xml45), depending on your asciidoc installation
+docbookx.dtd:       Text/docbook-xml45      M           current asciidoc installations require this
 lynx:               Web/lynx                M
-asciidoc            Python/asciidoc         M           cygwin python is a dependency and will also be installed (if not installed)
 dblatex             Text/dblatex            O           A number of dependencies will also be installed
-fop:                -                       O           URL: http://xml.apache.org/fop/ - install it into docbook\fop-1.0 to keep defaults from config.nmake
+fop:                -                       O           URL: http://xml.apache.org/fop/ - install it into docbok\fop-1.x or wireshark_lib_dir\fop-1.x to use defaults from config.nmake
 jimi:               -                       O           URL: http://java.sun.com/products/jimi/ - see above
 hhc:                -                       O           URL: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/htmlhelp/html/hwMicrosoftHTMLHelpDownloads.asp
 zip:                Archive/zip             O
-getopt:             Utils/util-linux        O           Required to run "build-docbook-catalog"
+getopt:             Base/util-linux         O           Required to run "build-docbook-catalog"
 
 
 Packages for Suse 9.3