diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-26 09:08:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-26 09:08:13 (GMT) |
| commit | 098fae735aadcba5814ce789a31e46582366dee8 (patch) | |
| tree | f85bb98792c720e90346badc16cb7db5dd867027 | |
| parent | 3b786ffebeb7769d34099ea7064532501dc6aee5 (diff) | |
| parent | ae2f2b211d31070531913851b894e2665b544beb (diff) | |
| download | tcl-098fae735aadcba5814ce789a31e46582366dee8.zip tcl-098fae735aadcba5814ce789a31e46582366dee8.tar.gz tcl-098fae735aadcba5814ce789a31e46582366dee8.tar.bz2 | |
Fix the 'htmlhelp' target so that it compiles cleanly and includes all the appropriate HTML files.
Permit static linking to the MSVCRT as a stand-alone option.
Patch by Joe Mistachkin.
| -rw-r--r-- | win/makefile.vc | 20 | ||||
| -rw-r--r-- | win/rules.vc | 5 |
2 files changed, 16 insertions, 9 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index eb9a594..f401541 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -737,7 +737,7 @@ gentommath_h: !ifndef HHC
HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
!endif
-HTMLDIR=$(ROOT)\html
+HTMLDIR=$(OUT_DIR)\html
HTMLBASE=TclTk$(VERSION)
HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
@@ -745,25 +745,27 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm htmlhelp: chmsetup $(CHMFILE)
$(CHMFILE): $(DOCDIR)\*
- @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
+ @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
@echo Compiling HTML help project
- @$(HHC) <<$(HHPFILE) >NUL
+ -$(HHC) <<$(HHPFILE) >NUL
[OPTIONS]
Compatibility=1.1 or later
Compiled file=$(HTMLBASE).chm
+Default topic=contents.htm
Display compile progress=no
Error log file=$(HTMLBASE).log
+Full-text search=Yes
Language=0x409 English (United States)
Title=Tcl/Tk $(DOT_VERSION) Help
[FILES]
contents.htm
docs.css
-Keywords
-TclCmd
-TclLib
-TkCmd
-TkLib
-UserCmd
+Keywords\*.htm
+TclCmd\*.htm
+TclLib\*.htm
+TkCmd\*.htm
+TkLib\*.htm
+UserCmd\*.htm
<<
chmsetup:
diff --git a/win/rules.vc b/win/rules.vc index 30e8c2f..e12854d 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -230,6 +230,10 @@ STATIC_BUILD = 1 !else
STATIC_BUILD = 0
!endif
+!if [nmakehlp -f $(OPTS) "nomsvcrt"]
+!message *** Doing nomsvcrt
+MSVCRT = 0
+!else
!if [nmakehlp -f $(OPTS) "msvcrt"]
!message *** Doing msvcrt
MSVCRT = 1
@@ -240,6 +244,7 @@ MSVCRT = 1 MSVCRT = 0
!endif
!endif
+!endif
!if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
!message *** Doing staticpkg
TCL_USE_STATIC_PACKAGES = 1
|