summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authordavygrvy <davygrvy>2002-03-29 01:18:36 (GMT)
committerdavygrvy <davygrvy>2002-03-29 01:18:36 (GMT)
commitb5afb47a15e2c0629e6fe595ce99898e8b6d3ee0 (patch)
tree18cc8709a169e8982f7e7cf9ceeca84c600773d9 /win/makefile.vc
parentf2a15c89a04d01f1ab1ddaad00cc9861c82b434a (diff)
downloadtk-b5afb47a15e2c0629e6fe595ce99898e8b6d3ee0.zip
tk-b5afb47a15e2c0629e6fe595ce99898e8b6d3ee0.tar.gz
tk-b5afb47a15e2c0629e6fe595ce99898e8b6d3ee0.tar.bz2
* win/makefile.vc: Tk helpfile is now installing itself into Tcl's
contents file as part of the install target and rebuilding the contents table as desired. [Bug 527941]
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc34
1 files changed, 26 insertions, 8 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 48be7d1..d0e8bbe 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.54 2002/03/28 23:29:44 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.55 2002/03/29 01:18:36 davygrvy Exp $
#------------------------------------------------------------------------------
!if "$(MSVCDIR)" == ""
@@ -200,7 +200,7 @@ TKSTUBLIBNAME = $(STUBPREFIX)$(VERSION).lib
TKSTUBLIB = $(OUT_DIR)\$(TKSTUBLIBNAME)
!if $(TCLINSTALL)
-TCLSH = $(INSTALLDIR)\bin\$(TCLNAMEPREFIX)sh$(VERSION)$(SUFX).exe
+TCLSH = $(INSTALLDIR)\bin\tclsh$(VERSION)$(SUFX).exe
TCLSTUBLIB = $(INSTALLDIR)\lib\$(TCLSTUBLIBNAME)
TCLIMPLIB = $(INSTALLDIR)\lib\$(TCLIMPLIBNAME)
TCL_LIBRARY = $(INSTALLDIR)\lib
@@ -232,7 +232,7 @@ RM = del
LIB_INSTALL_DIR = $(INSTALLDIR)\lib
BIN_INSTALL_DIR = $(INSTALLDIR)\bin
DOC_INSTALL_DIR = $(INSTALLDIR)\doc
-SCRIPT_INSTALL_DIR = $(INSTALLDIR)\lib\tk$(DOTVERSION)
+SCRIPT_INSTALL_DIR = $(INSTALLDIR)\lib\$(PROJECT)$(DOTVERSION)
INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include
WISHOBJS = \
@@ -476,7 +476,7 @@ TESTFLAGS = -file $(TESTPAT)
release: setup $(TKSTUBLIB) $(WISH)
all: release $(CAT32)
core: setup $(TKSTUBLIB) $(TKLIB)
-install: install-binaries install-libraries
+install: install-binaries install-libraries install-docs
tktest: setup $(TKTEST) $(CAT32)
@@ -578,16 +578,16 @@ CVS
genstubs:
$(TCLSH) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
- $(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
+ $(GENERICDIR)\$(PROJECT).decls $(GENERICDIR)\$(PROJECT)Int.decls
#---------------------------------------------------------------------
# Regenerate the windows help files.
#---------------------------------------------------------------------
-TCLHLPBASE = $(PROJECT)$(VERSION)
-HELPFILE = $(OUT_DIR)\$(TCLHLPBASE).hlp
-HELPCNT = $(OUT_DIR)\$(TCLHLPBASE).cnt
+HLPBASE = $(PROJECT)$(VERSION)
+HELPFILE = $(OUT_DIR)\$(HLPBASE).hlp
+HELPCNT = $(OUT_DIR)\$(HLPBASE).cnt
DOCTMP_DIR = $(OUT_DIR)\$(PROJECT)_docs
HELPRTF = $(DOCTMP_DIR)\$(PROJECT).rtf
MAN2HELP = $(DOCTMP_DIR)\man2help.tcl
@@ -646,6 +646,24 @@ install-docs:
!if exist($(HELPFILE))
@xcopy /i /y "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
@xcopy /i /y "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
+ @echo :Include $(HLPBASE).cnt >> $(DOC_INSTALL_DIR)\tcl$(VERSION).cnt
+ $(TCLSH) <<
+puts "Installing Tk's helpfile contents into Tcl's ..."
+set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt" r]
+while {![eof $$f]} {
+ if {[regexp {:Include tk([0-9]{2}).cnt} [gets $$f] dummy ver]} {
+ if {$$ver == $(VERSION)} {
+ puts "Already installed."
+ exit
+ }
+ }
+}
+close $$f
+set f [open $(DOC_INSTALL_DIR:\=/)/tcl$(VERSION).cnt a]
+puts $$f {:Include $(HLPBASE).cnt}
+close $$f
+<<
+ start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(VERSION).hlp
!endif
#---------------------------------------------------------------------