From f1d93f0beeec9d88f8a225aa35a9ccc163dcdb15 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 13 Oct 2000 18:02:44 +0000 Subject: [PATCH] Doc/distribution script mods git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/docs/latex/mmedia/tex2rtf.ini | 3 +- contrib/docs/latex/ogl/tex2rtf.ini | 2 +- contrib/src/gizmos/makefile.vc | 4 +- contrib/src/mmedia/makefile.vc | 17 +++- contrib/src/ogl/makefile.vc | 7 +- contrib/src/xml/makefile.vc | 4 +- distrib/msw/makedist.sh | 116 +++++++++++++++++++++++--- distrib/msw/tmake/vc.t | 60 +++---------- docs/latex/book/makefile.vc | 4 +- docs/latex/wx/wx.hpj | 2 +- src/msw/makefile.vc | 60 +++---------- utils/dialoged/src/makefile.vc | 4 +- utils/tex2rtf/docs/tex2rtf.hpj | 2 +- utils/tex2rtf/src/makefile.vc | 4 +- 14 files changed, 158 insertions(+), 131 deletions(-) diff --git a/contrib/docs/latex/mmedia/tex2rtf.ini b/contrib/docs/latex/mmedia/tex2rtf.ini index d261135eed..75c1e1d5b5 100644 --- a/contrib/docs/latex/mmedia/tex2rtf.ini +++ b/contrib/docs/latex/mmedia/tex2rtf.ini @@ -1,3 +1,4 @@ +; Last change: JAC 13 Oct 100 5:16 pm runTwice = yes titleFontSize = 12 authorFontSize = 10 @@ -13,7 +14,7 @@ htmlBrowseButtons = bitmap winHelpVersion = 3 winHelpContents = yes winHelpTitle = "MMedia Manual" -truncateFilenames = yes +truncateFilenames = no combineSubSections = yes \overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}} \htmlonly{\image{}{books.gif}}\helpref{#1}{#2} diff --git a/contrib/docs/latex/ogl/tex2rtf.ini b/contrib/docs/latex/ogl/tex2rtf.ini index 41dd2cffa3..eee50eed8b 100644 --- a/contrib/docs/latex/ogl/tex2rtf.ini +++ b/contrib/docs/latex/ogl/tex2rtf.ini @@ -1,4 +1,4 @@ -; Last change: JS 8 Sep 98 2:54 pm +; Last change: JAC 13 Oct 100 5:11 pm runTwice = yes titleFontSize = 12 authorFontSize = 10 diff --git a/contrib/src/gizmos/makefile.vc b/contrib/src/gizmos/makefile.vc index 2bcb5886fa..bcfd23804e 100644 --- a/contrib/src/gizmos/makefile.vc +++ b/contrib/src/gizmos/makefile.vc @@ -126,8 +126,8 @@ $(DOCDIR)\htmlhelp\gizmos.chm: $(DOCDIR)\html\gizmos\gizmos.htm $(DOCDIR)\html\g # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\gizmos.htb: $(DOCDIR)\html\gizmos\gizmos.htm cd $(DOCDIR)\html\gizmos - -erase /Y gizmos.zip gizmos.htb - zip32 gizmos.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase gizmos.zip gizmos.htb + zip gizmos.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move gizmos.zip $(DOCDIR)\htb\gizmos.htb cd $(THISDIR) diff --git a/contrib/src/mmedia/makefile.vc b/contrib/src/mmedia/makefile.vc index 90e894d2ff..e70955a597 100644 --- a/contrib/src/mmedia/makefile.vc +++ b/contrib/src/mmedia/makefile.vc @@ -162,6 +162,7 @@ DOCSOURCES=$(LOCALDOCDIR)\mmedia.tex \ html: $(DOCDIR)\html\mmedia\mmedia.htm htmlhelp: $(DOCDIR)\html\mmedia\mmedia.chm +htb: $(DOCDIR)\htb\mmedia.htb hlp: $(DOCDIR)\winhelp\mmedia.hlp pdfrtf: $(DOCDIR)\pdf\mmedia.rtf ps: $(DOCDIR)\ps\mmedia.ps @@ -199,13 +200,26 @@ $(DOCDIR)\html\mmedia\mmedia.htm: $(DOCSOURCES) -erase $(DOCDIR)\html\mmedia\*.ref cd $(THISDIR) +# An htb file is a zip file containing the .htm, .gif, .hhp, .hhc and .hhk +# files, renamed to htb. +# This can then be used with e.g. helpview. +# Optionally, a cached version of the .hhp file can be generated with hhp2cached. +$(DOCDIR)\htb\mmedia.htb: $(DOCDIR)\html\mmedia\mmedia.htm + cd $(DOCDIR)\html\mmedia + -erase mmedia.zip mmedia.htb + zip mmedia.zip *.htm *.gif *.hhp *.hhc *.hhk + -mkdir $(DOCDIR)\htb + -erase $(DOCDIR)\htb\mmedia.htb + move mmedia.zip $(DOCDIR)\htb\mmedia.htb + cd $(THISDIR) $(DOCDIR)\html\mmedia\mmedia.chm: $(DOCDIR)\html\mmedia\mmedia.htm $(DOCDIR)\html\mmedia\mmedia.hhp cd $(DOCDIR)\html\mmedia -hhc mmedia.hhp + -erase $(DOCDIR)\htmlhelp\mmedia.chm + move mmedia.chm $(DOCDIR)\htmlhelp\mmedia.chm cd $(THISDIR) - $(LOCALDOCDIR)\mmedia.dvi: $(DOCSOURCES) cd $(LOCALDOCDIR) -latex mmedia @@ -222,4 +236,3 @@ $(WXDIR)\docs\ps\mmedia.ps: $(LOCALDOCDIR)\mmedia.dvi move mmedia.ps $(WXDIR)\docs\ps\mmedia.ps cd $(THISDIR) - diff --git a/contrib/src/ogl/makefile.vc b/contrib/src/ogl/makefile.vc index f4d62a3a74..0256bf119f 100644 --- a/contrib/src/ogl/makefile.vc +++ b/contrib/src/ogl/makefile.vc @@ -174,6 +174,7 @@ $(DOCDIR)\html\ogl\ogl.htm: $(DOCSOURCES) $(DOCDIR)\htmlhelp\ogl.chm: $(DOCDIR)\html\ogl\ogl.htm $(DOCDIR)\html\ogl\ogl.hhp cd $(DOCDIR)\html\ogl -hhc ogl.hhp + -erase $(DOCDIR)\htmlhelp\ogl.chm move ogl.chm $(DOCDIR)\htmlhelp\ogl.chm cd $(THISDIR) @@ -183,9 +184,11 @@ $(DOCDIR)\htmlhelp\ogl.chm: $(DOCDIR)\html\ogl\ogl.htm $(DOCDIR)\html\ogl\ogl.hh # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\ogl.htb: $(DOCDIR)\html\ogl\ogl.htm cd $(DOCDIR)\html\ogl - -erase /Y ogl.zip ogl.htb - zip32 ogl.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase ogl.zip ogl.htb + zip ogl.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb + -erase $(DOCDIR)\htb\ogl.htb + -erase $(DOCDIR)\htb\ogl.htb move ogl.zip $(DOCDIR)\htb\ogl.htb cd $(THISDIR) diff --git a/contrib/src/xml/makefile.vc b/contrib/src/xml/makefile.vc index f29130e2ce..f08bc4c9da 100644 --- a/contrib/src/xml/makefile.vc +++ b/contrib/src/xml/makefile.vc @@ -101,8 +101,8 @@ $(DOCDIR)\htmlhelp\xml.chm: $(DOCDIR)\html\xml\xml.htm $(DOCDIR)\html\xml\xml.hh # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\xml.htb: $(DOCDIR)\html\xml\xml.htm cd $(DOCDIR)\html\xml - -erase /Y xml.zip xml.htb - zip32 xml.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase xml.zip xml.htb + zip xml.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move xml.zip $(DOCDIR)\htb\xml.htb cd $(THISDIR) diff --git a/distrib/msw/makedist.sh b/distrib/msw/makedist.sh index ca5327510e..92a4e56fe1 100644 --- a/distrib/msw/makedist.sh +++ b/distrib/msw/makedist.sh @@ -11,6 +11,22 @@ # - VC++ 6 or higher, to compile the binaries # - WinHelp compiler, HTML Help compiler, Tex2RTF on your path # - WISE Install 5 +# - Word 97 (not tested with higher versions) +# - Adobe Acrobat & Distiller +# +# Before running this script, you will need to: +# +# - update the readmes, change log, manual version etc. +# - update version.h +# - update distrib/msw/wisetop.txt, wisebott.txt with the correct version +# number, plus any hard-wired wxWindows paths +# - test on a variety of compilers +# +# TODO: +# +# - generation of PDF (only PDF RTF generated so far) +# - perhaps prompt the user to read the important release docs, +# version.h, setup.h # # Julian Smart, October 2000 @@ -19,6 +35,14 @@ DEST=$SRC/deliver TMPDIR=`cygpath -u $TEMP` OK=1 DOWISE=0 +DOPDF=0 +DOALL=1 +DOCSONLY=0 +WXWINONLY=0 +WISEONLY=0 +BINONLY=0 +PDFONLY=0 + # For some reason, if we pipe output to egrep, we see output, but not otherwise. WARNINGS=": decorated name|: see reference|: see declaration|C4786|VC98\\\\INCLUDE|template<>" @@ -29,6 +53,8 @@ setup_vars() { TCLHOME=C:/PROGRA~1/Tcl export TCLHOME PATH="$PATH:$VCPATH" export PATH export INCLUDE LIB + + WORDEXE="/c/Program Files/Microsoft Office/Office/WINWORD.EXE" } check_compile() { @@ -60,7 +86,7 @@ check_files() { if [ ! -d "$SRC/bin" ]; then mkdir "$SRC/bin" fi - if [ ! -e "$SRC/bin/DBVIEW.EXE" ]; then + if [ ! -e "$SRC/bin/DBGVIEW.EXE" ]; then echo Please put DBGVIEW.EXE, DBGVIEW.CNT, DBGVIEW.HLP into $SRC/bin echo and run the script again. OK=0 @@ -83,8 +109,23 @@ build_docs() { nmake -f makefile.vc html htmlhelp htb hlp pdfrtf cd "$SRC/contrib/src/mmedia" - # NB: add htb target - nmake -f makefile.vc html htmlhelp hlp pdfrtf + nmake -f makefile.vc html htmlhelp htb hlp pdfrtf +} + +# TODO: Make PDF via Word, if Word and Adobe Acrobat are present. +# This has to be interactive at present. +build_pdf() { + echo "---------------------------------" + echo "Building wxWindows PDF documents" + if [ -e "$WORDEXE" ]; then + "$WORDEXE" "$WXWIN\\docs\\pdf\\wx.rtf" + "$WORDEXE" "$WXWIN\\docs\\pdf\\dialoged.rtf" + "$WORDEXE" "$WXWIN\\docs\\pdf\\tex2rtf.rtf" + "$WORDEXE" "$WXWIN\\contrib\\docs\\pdf\\ogl.rtf" + "$WORDEXE" "$WXWIN\\contrib\\docs\\mmedia\\ogl.rtf" + else + echo MS Word not present. Not doing PDF build. + fi } # Build wxWindows @@ -132,18 +173,41 @@ build_executables() { copy_files() { cp "$SRC/utils/dialoged/src/Release/dialoged.exe" "$SRC/bin" - cp "$SRC/docs/winhelp/dialoged.*" "$SRC/bin" + cp "$SRC/docs/winhelp/dialoged.hlp" "$SRC/docs/winhelp/dialoged.cnt" "$SRC/bin" cp "$SRC/utils/tex2rtf/src/Release/tex2rtf.exe" "$SRC/bin" - cp "$SRC/docs/winhelp/tex2rtf.*" "$SRC/bin" + cp "$SRC/docs/winhelp/tex2rtf.hlp" "$SRC/docs/winhelp/tex2rtf.cnt" "$SRC/bin" - cp "$SRC/demos/life/life.exe" "$SRC/demos/life/breeder.lif" "$SRC/bin" + cp "$SRC/demos/life/Release/life.exe" "$SRC/demos/life/breeder.lif" "$SRC/bin" } # Process command line options. for i in "$@"; do case "$i" in --wise) DOWISE=1 ;; + --pdf) DOPDF=1 ;; + --wise-only) + WISEONLY=1 + DOWISE=1 + DOALL=0 + ;; + --docs-only) + DOCSONLY=1 + DOALL=0 + ;; + --bin-only) + BINONLY=1 + DOALL=0 + ;; + --wxwin-only) + WXWINONLY=1 + DOALL=0 + ;; + --pdf-only) + PDFONLY=1 + DOPDF=1 + DOALL=0 + ;; *) echo Usage: $0 "[ options ]" echo Generates documentation and binaries for creating a distribution, @@ -152,7 +216,13 @@ for i in "$@"; do echo echo Options: echo " --help Display this help message" - echo " --wise Build zips and setup.exe after creating docs and binaries" + echo " --wise Additonally, build zips and setup.exe" + echo " --pdf Additionally, try to generate PDF" + echo " --wise-only Only do zip/setup phase" + echo " --wxwin-only Only do wxWin lib building phase" + echo " --docs-only Only do docs building phase" + echo " --pdf-only Only do PDF building phase" + echo " --bin-only Only do .exe building phase" exit 1 ;; esac @@ -162,28 +232,48 @@ mkdir -p $SRC/docs/pdf mkdir -p $SRC/docs/html mkdir -p $SRC/docs/htmlhelp mkdir -p $SRC/docs/htb +mkdir -p $SRC/docs/winhelp +mkdir -p $SRC/contrib/docs/pdf +mkdir -p $SRC/contrib/docs/html +mkdir -p $SRC/contrib/docs/htmlhelp +mkdir -p $SRC/contrib/docs/htb +mkdir -p $SRC/contrib/docs/winhelp setup_vars check_files -if [ "$OK" = "1" ]; then - build_docs +if [ "$OK" = "1" ]; then + if [ "$DOCSONLY" = "1" ] || [ "$DOALL" = "1" ]; then + build_docs + fi +fi + +if [ "$OK" = "1" ] && [ "$DOPDF" = "1" ]; then + if [ "$PDFONLY" = "1" ] || [ "$DOALL" = "1" ]; then + build_pdf + fi fi if [ "$OK" = "1" ]; then - build_wxwin_vc + if [ "$WXWINONLY" = "1" ] || [ "$DOALL" = "1" ]; then + build_wxwin_vc + fi fi if [ "$OK" = "1" ]; then - build_executables + if [ "$BINONLY" = "1" ] || [ "$DOALL" = "1" ]; then + build_executables + fi fi if [ "$OK" = "1" ]; then copy_files fi -if [ "$OK" = "1" && "$DOWISE" = "1" ]; then - $SRC/distrib/msw/zipdist.sh --wise +if [ "$OK" = "1" ] && [ "$DOWISE" = "1" ]; then + if [ "$WISEONLY" = "1" ] || [ "$DOALL" = "1" ]; then + $SRC/distrib/msw/zipdist.sh --wise + fi fi if [ "$OK" = "1" ]; then diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t index 2116b5e81d..637de7f22a 100644 --- a/distrib/msw/tmake/vc.t +++ b/distrib/msw/tmake/vc.t @@ -475,42 +475,11 @@ allhlp: wxhlp nmake -f makefile.vc hlp cd $(THISDIR) -# cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxbuild\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxgrid\src -# nmake -f makefile.vc hlp - allhtml: wxhtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc html cd $(THISDIR) -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\dialoged\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\hytext\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.vc html - allps: wxps referencps cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc ps @@ -521,18 +490,6 @@ allpdfrtf: pdfrtf nmake -f makefile.vc pdfrtf cd $(THISDIR) -# cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.vc ps -# cd $(THISDIR) - $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj cd $(DOCDIR)/latex/wx -erase wx.ph @@ -632,8 +589,8 @@ $(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm cd $(WXDIR)\docs\html\wx - -erase /Y wx.zip wx.htb - zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase wx.zip wx.htb + zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move wx.zip $(DOCDIR)\htb\wx.htb cd $(THISDIR) @@ -645,11 +602,14 @@ touchmanual: updatedocs: touchmanual alldocs cleandocs: - -erase /Y $(DOCDIR)\html\wx\wx.htm - -erase /Y $(DOCDIR)\pdf\wx.rtf - -erase /Y $(DOCDIR)\latex\wx\wx.rtf - -erase /Y $(DOCDIR)\htmlhelp\wx.chm - -erase /Y $(DOCDIR)\htb\wx.htb + -erase $(DOCDIR)\winhelp\wx.hlp + -erase $(DOCDIR)\winhelp\wx.cnt + -erase $(DOCDIR)\html\wx\*.htm + -erase $(DOCDIR)\pdf\wx.rtf + -erase $(DOCDIR)\latex\wx\wx.rtf + -erase $(DOCDIR)\latex\wx\WX.PH + -erase $(DOCDIR)\htmlhelp\wx.chm + -erase $(DOCDIR)\htb\wx.htb # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the # Office StartUp folder, and PDFMaker should be installed. diff --git a/docs/latex/book/makefile.vc b/docs/latex/book/makefile.vc index e66c865580..c53748c104 100644 --- a/docs/latex/book/makefile.vc +++ b/docs/latex/book/makefile.vc @@ -90,8 +90,8 @@ $(WXDIR)\docs\ps\book.ps: $(WXDIR)\docs\latex\book\book.dvi # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\book.htb: $(DOCDIR)\html\book\book.htm cd $(WXDIR)\docs\html\book - -erase /Y book.zip book.htb - zip32 book.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase book.zip book.htb + zip book.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move book.zip $(DOCDIR)\htb\book.htb cd $(THISDIR) diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj index 7d53311fdd..61fbe30de4 100644 --- a/docs/latex/wx/wx.hpj +++ b/docs/latex/wx/wx.hpj @@ -1,5 +1,5 @@ [OPTIONS] -BMROOT=. ; Assume that bitmaps are where the source is +BMROOT=d:\wx2dev\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is TITLE=wxWindows Manual CONTENTS=Contents COMPRESS=HIGH diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 70b958e5c4..d31e75f139 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -688,42 +688,11 @@ allhlp: wxhlp nmake -f makefile.vc hlp cd $(THISDIR) -# cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxbuild\src -# nmake -f makefile.vc hlp -# cd $(WXDIR)\utils\wxgrid\src -# nmake -f makefile.vc hlp - allhtml: wxhtml cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc html cd $(THISDIR) -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\dialoged\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\hytext\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.vc html -# cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.vc html - allps: wxps referencps cd $(WXDIR)\utils\dialoged\src nmake -f makefile.vc ps @@ -734,18 +703,6 @@ allpdfrtf: pdfrtf nmake -f makefile.vc pdfrtf cd $(THISDIR) -# cd $(WXDIR)\utils\wxhelp\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\tex2rtf\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\wxgraph\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\wxchart\src -# nmake -f makefile.vc ps -# cd $(WXDIR)\utils\wxtree\src -# nmake -f makefile.vc ps -# cd $(THISDIR) - $(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj cd $(DOCDIR)/latex/wx -erase wx.ph @@ -845,8 +802,8 @@ $(WXDIR)\docs\ps\referenc.ps: $(WXDIR)\docs\latex\wx\referenc.dvi # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\wx.htb: $(DOCDIR)\html\wx\wx.htm cd $(WXDIR)\docs\html\wx - -erase /Y wx.zip wx.htb - zip32 wx.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase wx.zip wx.htb + zip wx.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move wx.zip $(DOCDIR)\htb\wx.htb cd $(THISDIR) @@ -858,11 +815,14 @@ touchmanual: updatedocs: touchmanual alldocs cleandocs: - -erase /Y $(DOCDIR)\html\wx\wx.htm - -erase /Y $(DOCDIR)\pdf\wx.rtf - -erase /Y $(DOCDIR)\latex\wx\wx.rtf - -erase /Y $(DOCDIR)\htmlhelp\wx.chm - -erase /Y $(DOCDIR)\htb\wx.htb + -erase $(DOCDIR)\winhelp\wx.hlp + -erase $(DOCDIR)\winhelp\wx.cnt + -erase $(DOCDIR)\html\wx\*.htm + -erase $(DOCDIR)\pdf\wx.rtf + -erase $(DOCDIR)\latex\wx\wx.rtf + -erase $(DOCDIR)\latex\wx\WX.PH + -erase $(DOCDIR)\htmlhelp\wx.chm + -erase $(DOCDIR)\htb\wx.htb # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the # Office StartUp folder, and PDFMaker should be installed. diff --git a/utils/dialoged/src/makefile.vc b/utils/dialoged/src/makefile.vc index 83b6066167..b42c3a4315 100644 --- a/utils/dialoged/src/makefile.vc +++ b/utils/dialoged/src/makefile.vc @@ -130,8 +130,8 @@ $(DOCDIR)\htmlhelp\dialoged.chm : $(DOCDIR)\html\dialoged\dlged.htm $(DOCDIR)\ht # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\dialoged.htb: $(DOCDIR)\html\dialoged\dlged.htm cd $(DOCDIR)\html\dialoged - -erase /Y dialoged.zip dialoged.htb - zip32 dialoged.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase dialoged.zip dialoged.htb + zip dialoged.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move dialoged.zip $(DOCDIR)\htb\dialoged.htb cd $(THISDIR) diff --git a/utils/tex2rtf/docs/tex2rtf.hpj b/utils/tex2rtf/docs/tex2rtf.hpj index 5660611a26..c7d299f843 100644 --- a/utils/tex2rtf/docs/tex2rtf.hpj +++ b/utils/tex2rtf/docs/tex2rtf.hpj @@ -1,5 +1,5 @@ [OPTIONS] -BMROOT=. ; Assume that bitmaps are where the source is +BMROOT=d:\wx2dev\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is TITLE=Tex2RTF Manual CONTENTS=Contents COMPRESS=HIGH diff --git a/utils/tex2rtf/src/makefile.vc b/utils/tex2rtf/src/makefile.vc index 9552bd1bf8..5732870d0f 100644 --- a/utils/tex2rtf/src/makefile.vc +++ b/utils/tex2rtf/src/makefile.vc @@ -138,8 +138,8 @@ $(DOCDIR)\htmlhelp\tex2rtf.chm : $(DOCDIR)\html\tex2rtf\t2rtf.htm $(DOCDIR)\html # Optionally, a cached version of the .hhp file can be generated with hhp2cached. $(DOCDIR)\htb\tex2rtf.htb: $(DOCDIR)\html\tex2rtf\t2rtf.htm cd $(DOCDIR)\html\tex2rtf - -erase /Y tex2rtf.zip tex2rtf.htb - zip32 tex2rtf.zip *.htm *.gif *.hhp *.hhc *.hhk + -erase tex2rtf.zip tex2rtf.htb + zip tex2rtf.zip *.htm *.gif *.hhp *.hhc *.hhk -mkdir $(DOCDIR)\htb move tex2rtf.zip $(DOCDIR)\htb\tex2rtf.htb cd $(THISDIR) -- 2.45.2