Remove obsolete winhelp targets. They weren't supported and didn't work.

3 files changed, 16 insertions, 105 deletions

diff --git a/ChangeLog b/ChangeLog
index b295620..c41cc16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,21 +1,26 @@
+2008-05-26  Donal K. Fellows  <dkf@users.sf.net>
+
+	* win/makefile.bc: Remove deprecated winhelp target. It didn't work
+	* win/makefile.vc: correctly anyway.
+
 2008-05-23  Andreas Kupries  <andreask@activestate.com>
 
-	* win/tclWinChan.c (FileWideSeekProc): Accepted a patch by
-	Alexandre Ferrieux <ferrieux@users.sourceforge.net> to fix the
-	[Bug 1965787]. 'tell' now works for locations > 2 GB as well
-	instead of going negative.
+	* win/tclWinChan.c (FileWideSeekProc): Accepted a patch by Alexandre
+	Ferrieux <ferrieux@users.sourceforge.net> to fix the [Bug 1965787].
+	'tell' now works for locations > 2 GB as well instead of going
+	negative.
 
 	* generic/tclIO.c (Tcl_SetChannelBufferSize): Accepted a patch by
 	* tests/io.test: Alexandre Ferrieux <ferrieux@users.sourceforge.net>
-	* tests/chanio.test: to fix the [Bug 1969953]. Buffersize outside
-	of the supported range are now clipped to nearest boundary instead
-	of ignored.
+	* tests/chanio.test: to fix the [Bug 1969953]. Buffersize outside of
+	the supported range are now clipped to nearest boundary instead of
+	ignored.
 
 2008-05-22  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclNamesp.c (Tcl_LogCommandInfo):     Restored ability to
-	handle the argument value length = -1.  Thanks to Chris Darroch for
-	discovering the bug and providing the fix.  [Bug 1968245].
+	handle the argument value length = -1. Thanks to Chris Darroch for
+	discovering the bug and providing the fix. [Bug 1968245]
 
 2008-05-21  Don Porter	<dgp@users.sourceforge.net>
 
@@ -23,7 +28,7 @@
 	* tests/parse.test (parse-15.60):	routine has no mechanism to
 	return the "incomplete" status of "\\\n" so calling this routine
 	anywhere that can be reached within a Tcl_ParseCommand() call is a
-	mistake.  In particular, ParseComment() must not use it.  [Bug 1968882].
+	mistake. In particular, ParseComment() must not use it. [Bug 1968882]
 
 2008-05-20  Donal K. Fellows  <dkf@users.sf.net>
 
diff --git a/win/makefile.bc b/win/makefile.bc
index 481ecd3..59a0232 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -50,7 +50,6 @@
 #
 # Not yet modified:
 #   - The 'plug-in-DLL' and the associated shell.
-#   - The programs to create the windows help files.
 #
 # Suggestions and / or improvements are always welcome.
 #
@@ -473,29 +472,6 @@ genstubs:
 		$(GENERICDIR)\tcl.decls $(GENERICDIR)\tclInt.decls
 
 #
-# Regenerate the windows help files.
-#
-
-TCLTOOLS	= $(ROOT)/tools
-MAN2TCL		= $(TCLTOOLS)/man2tcl
-TCLRTF		= $(TCLTOOLS)/tcl.rtf
-TCLHPJ		= $(TCLTOOLS)/tcl.hpj
-MAN2HELP	= $(TCLTOOLS)/man2help.tcl
-HCRTF		= $(TOOLS32)/bin/hcrtf.exe
-
-winhelp: $(TCLRTF)
-	cd $(TCLTOOLS)
-	start /wait $(HCRTF) -xn $(TCLHPJ)
-
-$(MAN2TCL).exe: $(MAN2TCL).obj
-	cd $(TCLTOOLS)
-	$(cc32) /nologo /G4 /ML /O2 $(MAN2TCL).c
-
-$(TCLRTF): $(MAN2TCL).exe $(TCLSH)
-	cd $(TCLTOOLS)
-	..\win\$(TCLSH) $(MAN2HELP) $(NAMEPREFIX) $(VERSION) $(ROOT)/doc ../../tk$(DOTVERSION)/doc
-
-#
 # Special case object file targets
 #
 $(TMPDIR)\tclWinInit.obj: $(WINDIR)\tclWinInit.c
diff --git a/win/makefile.vc b/win/makefile.vc
index ef914ac..b6fd03f 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
 # Copyright (c) 2003-2008 Pat Thoyts.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.179 2008/05/15 00:04:10 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.180 2008/05/26 10:02:00 dkf Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -66,10 +66,6 @@ the build instructions.
 #		    troff manual pages found in $(ROOT)\doc. You need to
 #		    have installed the HTML Help Compiler package from Microsoft
 #		    to produce the .chm file.
-#	winhelp  -- (deprecated) Builds the windows .hlp file for Tcl from
-#		    the troff man files found in $(ROOT)\doc. This type of
-#		    help file is deprecated by Microsoft in favour of html
-#		    help files (.chm)
 #
 # 4)  Macros usable on the commandline:
 #	INSTALLDIR=<path>
@@ -675,76 +671,10 @@ TkLib
 UserCmd
 <<
 
-#-------------------------------------------------------------------------
-# Build the old-style Windows .hlp file
-#-------------------------------------------------------------------------
-
-TCLHLPBASE	= $(PROJECT)$(VERSION)
-HELPFILE	= $(OUT_DIR)\$(TCLHLPBASE).hlp
-HELPCNT		= $(OUT_DIR)\$(TCLHLPBASE).cnt
-DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
-HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
-MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
-MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
-INDEX		= $(DOCTMP_DIR)\index.tcl
-BMP		= $(DOCTMP_DIR)\feather.bmp
-BMP_NOPATH	= feather.bmp
-MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe
-
-winhelp: docsetup $(HELPFILE)
-
-docsetup:
-	@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)
-
-$(MAN2HELP) $(MAN2HELP2) $(INDEX) $(BMP): $(TOOLSDIR)\$$(@F)
-	@$(CPY) $(TOOLSDIR)\$(@F) $(@D)
-
-$(HELPFILE): $(HELPRTF) $(BMP)
-	cd $(DOCTMP_DIR)
-	start /wait hcrtf.exe -x <<$(PROJECT).hpj
-[OPTIONS]
-COMPRESS=12 Hall Zeck
-LCID=0x409 0x0 0x0 ; English (United States)
-TITLE=Tcl/Tk Reference Manual
-BMROOT=.
-CNT=$(@B).cnt
-HLP=$(@B).hlp
-
-[FILES]
-$(PROJECT).rtf
-
-[WINDOWS]
-main="Tcl/Tk Reference Manual",,27648,(r15263976),(r65535)
-
-[CONFIG]
-BrowseButtons()
-CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
-CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
-CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
-CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
-<<
-	cd $(MAKEDIR)
-	@$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
-	@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
-
-$(MAN2TCL): $(TOOLSDIR)\$$(@B).c
-	$(cc32) $(TCL_CFLAGS) -Fo$(@D)\ $(TOOLSDIR)\$(@B).c
-	$(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
-	$(_VC_MANIFEST_EMBED_EXE)
-
-$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*
-	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
-
 install-docs:
 !if exist($(CHMFILE))
 	@echo Installing compiled html help
 	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
-!else
-!if exist($(HELPFILE))
-	@echo Installing Windows help
-	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
-	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
-!endif
 !endif
 
 #"