From a8d30081432020a86dd8a519471002db19806743 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Fri, 15 Mar 2019 22:56:37 +0000 Subject: [PATCH] Stop shipping old WinHelp (.HLP) file. The executables were already ignoring it. This is a minimal change; PUTTY.HLP can still be built, and there's still all the context IDs lying around. Buildscr changes are untested. --- Buildscr | 16 ++++++---------- doc/Makefile | 10 ++++++---- windows/winhelp.c | 4 +--- windows/winhelp.h | 3 ++- windows/winstuff.h | 2 -- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Buildscr b/Buildscr index 4c4868d4..50a39ec8 100644 --- a/Buildscr +++ b/Buildscr @@ -141,7 +141,7 @@ ifneq "$(MAKEARGS)" "" set Makeargs $(Makeargs) $(MAKEARGS) in putty do ./mksrcarc.sh in putty do ./mkunxarc.sh '$(Autoconfver)' '$(Uxarcsuffix)' $(Docmakever) in putty do perl mkfiles.pl -in putty/doc do make $(Docmakever) putty.hlp putty.chm -j$(nproc) +in putty/doc do make $(Docmakever) putty.chm -j$(nproc) delegate - # Run the test suite, under self-delegation so that we don't leave any @@ -255,11 +255,11 @@ ifneq "$(cross_winsigncode)" "" in putty/windows do $(cross_winsigncode) -N -i h in putty/doc do make mostlyclean in putty/doc do make $(Docmakever) -j$(nproc) -in putty/windows/buildold do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt -in putty/windows/build32 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt -in putty/windows/build64 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt -in putty/windows/abuild32 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt -in putty/windows/abuild64 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm ../../doc/putty.hlp ../../doc/putty.cnt +in putty/windows/buildold do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm +in putty/windows/build32 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm +in putty/windows/build64 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm +in putty/windows/abuild32 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm +in putty/windows/abuild64 do zip -k -j putty.zip `ls *.exe | grep -v puttytel` ../../doc/putty.chm in putty/doc do zip puttydoc.zip *.html # Deliver the actual PuTTY release directory into a subdir `putty'. @@ -279,8 +279,6 @@ deliver putty/windows/abuild64/*.exe putty/wa64/$@ deliver putty/windows/abuild64/putty.zip putty/wa64/$@ deliver putty/doc/puttydoc.zip putty/$@ deliver putty/doc/putty.chm putty/$@ -deliver putty/doc/putty.hlp putty/$@ -deliver putty/doc/putty.cnt putty/$@ deliver putty/doc/puttydoc.txt putty/$@ deliver putty/doc/*.html putty/htmldoc/$@ deliver putty/putty-src.zip putty/$@ @@ -311,8 +309,6 @@ in-dest putty do a=`\find * -type f -print`; md5sum $$a > md5sums && sha1sum $$a # setting the MIME types for Windows help files and providing an # appropriate link to the source archive: in-dest putty do echo "AddType application/octet-stream .chm" >> .htaccess -in-dest putty do echo "AddType application/octet-stream .hlp" >> .htaccess -in-dest putty do echo "AddType application/octet-stream .cnt" >> .htaccess in-dest putty do set -- putty*.tar.gz; for k in '' .gpg; do echo RedirectMatch temp '(.*/)'putty.tar.gz$$k\$$ '$$1'"$$1$$k" >> .htaccess; done # And one in each binary directory, providing links for the installers. in-dest putty do for params in "w32 putty-installer" "w64 putty-64bit-installer" "wa32 putty-arm32-installer" "wa64 putty-arm64-installer"; do (set -- $$params; subdir=$$1; installername=$$2; cd $$subdir && for ext in msi exe; do set -- putty*installer.$$ext; if test -f $$1; then for k in '' .gpg; do echo RedirectMatch temp '(.*/)'$${installername}.$$ext$$k\$$ '$$1'"$$1$$k" >> .htaccess; done; fi; done); done diff --git a/doc/Makefile b/doc/Makefile index cb079fb5..fd5ca531 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -44,14 +44,16 @@ INPUTS = $(patsubst %,%.but,$(CHAPTERS)) HALIBUT = halibut index.html: $(INPUTS) - $(HALIBUT) --text --html --winhelp --chm $(INPUTS) + $(HALIBUT) --text --html --chm $(INPUTS) -# During formal builds it's useful to be able to build these ones alone. -putty.hlp: $(INPUTS) - $(HALIBUT) --winhelp $(INPUTS) +# During formal builds it's useful to be able to build this one alone. putty.chm: $(INPUTS) $(HALIBUT) --chm $(INPUTS) +# We don't ship this any more. +putty.hlp: $(INPUTS) + $(HALIBUT) --winhelp $(INPUTS) + putty.info: $(INPUTS) $(HALIBUT) --info $(INPUTS) diff --git a/windows/winhelp.c b/windows/winhelp.c index 17d6ad6f..0dca4513 100644 --- a/windows/winhelp.c +++ b/windows/winhelp.c @@ -1,7 +1,5 @@ /* - * winhelp.c: centralised functions to launch Windows help files, - * and to decide whether to use .HLP or .CHM help in any given - * situation. + * winhelp.c: centralised functions to launch Windows HTML Help files. */ #include diff --git a/windows/winhelp.h b/windows/winhelp.h index 2ecb537a..948cf73e 100644 --- a/windows/winhelp.h +++ b/windows/winhelp.h @@ -2,7 +2,8 @@ * winhelp.h - define Windows Help context names. * Each definition has the form "winhelp-topic:halibut-topic", where: * - "winhelp-topic" matches up with the \cfg{winhelp-topic} directives - * in the Halibut source, and is used for WinHelp; + * in the Halibut source, and was used for WinHelp (FIXME: this isn't + * used any more); * - "halibut-topic" matches up with the Halibut keywords in the source, * and is used for HTML Help. */ diff --git a/windows/winstuff.h b/windows/winstuff.h index 08d434c2..48bd4d43 100644 --- a/windows/winstuff.h +++ b/windows/winstuff.h @@ -181,9 +181,7 @@ struct FontSpec *fontspec_new( #define JUMPLISTREG_ERROR_VALUEWRITE_FAILURE 4 #define JUMPLISTREG_ERROR_INVALID_VALUE 5 -#define PUTTY_HELP_FILE "putty.hlp" #define PUTTY_CHM_FILE "putty.chm" -#define PUTTY_HELP_CONTENTS "putty.cnt" #define GETTICKCOUNT GetTickCount #define CURSORBLINK GetCaretBlinkTime()