update make commands

mksupport-common/mk_bash.sh

@@ -9,22 +9,23 @@ DOCUMENT=$1
 shift
 EXTRA=$*
 export XML_CATALOG_FILES=$DOCTOOLS/CATALOG.XML
+export XML_DEBUG_CATALOG=1
 export PATH=$DOCTOOLS/fop:$DOCTOOLS/asciidoc:$PATH
 
 mkdir -p output
 rm -rf output/*
 
 # a2x commands are similar for all output
-cmdrest="--conf-file=$DOCTOOLS/mksupport-common/a2x.bash.conf --no-xmllint --safe $EXTRA $DOCUMENT"
+cmdrest="--conf-file=$DOCTOOLS/mksupport-common/a2x.bash.conf --icons-dir=$DOCTOOLS/mksupport-common/icons --resource=$DOCTOOLS/mksupport-common/images --no-xmllint --safe $EXTRA $DOCUMENT"
 
 echo "Transforming to Draft PDF"
-a2x.py -k -v -v -f pdf --fop --icons --xsl-file=mksupport/xsl/fo.xsl --destination-dir=output $cmdrest
+a2x.py -k -v -v -f pdf --fop --xsl-file=mksupport/xsl/fo.xsl --destination-dir=output $cmdrest
 
 echo "Transforming to EPub"
 a2x.py -k -f epub --xsl-file=mksupport/xsl/epub.xsl --destination-dir=output $cmdrest
 
 echo "Transforming to Chunked HTML"
-a2x.py -k -f chunked --xsl-file=mksupport/xsl/chunked.xsl --destination-dir=output  $cmdrest
+a2x.py -k -f chunked --xsl-file=mksupport/xsl/chunked.xsl --destination-dir=output $cmdrest
 
 echo "Transforming to XHTML"
 mkdir -p output/html

mksupport-common/mk_diff.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+export DOCTOOLS=$PWD/../tools
+export PATH=$DOCTOOLS/asciidoc:$DOCTOOLS/fop:$PATH
+export XML_CATALOG_FILES=$DOCTOOLS/CATALOG.XML
+
+
+
+java -cp $DOCTOOLS/diffmk/bin/diffmk.jar net.sf.diffmk.DiffMk --ignorewhitespace "$1" "$2" "output/DIFF.xml"
+
+xsltproc --novalid --stringparam DOCTOOLS "$DOCTOOLS" --output output/DIFF.fo mksupport/xsl/fo.xsl output/DIFF.xml
+
+fop -c $DOCTOOLS/mksupport-common/fop.bash.conf -fo output/DIFF.fo -pdf output/DIFF.pdf

mksupport-common/mk_win.bat

@@ -3,20 +3,19 @@ REM DOCUMENT=_ReleaseNotes.txt
 REM set DOCTOOLS=%CD%\..\tools
 
 REM The values above are set in the source directory's mk_win.bat stub
-
-set XML_DEBUG_CATALOG=1
+REM Configure values above; do not modify below this line
 
 set DOCUMENT=%1
-set EXTRA=%~2
+set EXTRA=%2 %3 %4 %5 %6 %7 %8 %9
 set XML_CATALOG_FILES=%DOCTOOLS%\CATALOG.XML
 IF NOT _%TOOLPATHREST%==_1 set PATH=%DOCTOOLS%\fop;%DOCTOOLS%\asciidoc;%DOCTOOLS%\xsltproc;%PATH%
 set TOOLPATHREST=1
 
-rd /q /s output
-md output
+rd /q /s %CD%\output
+md %CD%\output
 
 REM a2x commands are similar for all output
-set cmdrest=--conf-file=%DOCTOOLS%\mksupport-common\a2x.win.conf --no-xmllint %EXTRA% --safe %DOCUMENT%
+set cmdrest=--conf-file=%DOCTOOLS%\mksupport-common\a2x.win.conf  --icons-dir=%DOCTOOLS%\mksupport-common\icons --resource=%DOCTOOLS%\mksupport-common\images --no-xmllint --safe %EXTRA% %DOCUMENT%
 
 echo Transforming to Draft PDF
 a2x.py -k -v -v -f pdf --fop --xsl-file=%CD%\mksupport\xsl\fo.xsl --destination-dir=output %cmdrest%
@@ -28,8 +27,8 @@ echo Transforming to Chunked HTML
 a2x.py -k -f chunked --xsl-file=mksupport\xsl\chunked.xsl --destination-dir=output %cmdrest%
 
 echo Transforming to XHTML
-md output\xhtml
-a2x.py -f xhtml --xsl-file=mksupport\xsl\xhtml.xsl --destination-dir=output\xhtml %cmdrest%
+md output\html
+a2x.py -f xhtml --xsl-file=mksupport\xsl\xhtml.xsl --destination-dir=output\html %cmdrest%
 
 REM echo Transforming to HTMLHelp/CHM
 REM md output\chm