Posted to tcl by venks at Sun Oct 02 19:32:02 GMT 2016view raw

  1. Index: win/makefile.vc
  2. ==================================================================
  3. --- win/makefile.vc
  4. +++ win/makefile.vc
  5. @@ -734,37 +734,39 @@
  6.  
  7.  
  8. # NOTE: you can define HHC on the command-line to override this
  9.  
  10. !ifndef HHC
  11.  
  12. HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
  13.  
  14. !endif
  15.  
  16. -HTMLDIR=$(ROOT)\html
  17.  
  18. +HTMLDIR=$(OUT_DIR)\html
  19.  
  20. HTMLBASE=TclTk$(VERSION)
  21.  
  22. HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
  23.  
  24. CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
  25.  
  26.  
  27.  
  28. htmlhelp: chmsetup $(CHMFILE)
  29.  
  30.  
  31.  
  32. $(CHMFILE): $(DOCDIR)\*
  33.  
  34. - @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
  35.  
  36. + @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
  37.  
  38. @echo Compiling HTML help project
  39.  
  40. - @$(HHC) <<$(HHPFILE) >NUL
  41.  
  42. + -$(HHC) <<$(HHPFILE) >NUL
  43.  
  44. [OPTIONS]
  45.  
  46. Compatibility=1.1 or later
  47.  
  48. Compiled file=$(HTMLBASE).chm
  49.  
  50. +Default topic=contents.htm
  51.  
  52. Display compile progress=no
  53.  
  54. Error log file=$(HTMLBASE).log
  55.  
  56. +Full-text search=Yes
  57.  
  58. Language=0x409 English (United States)
  59.  
  60. Title=Tcl/Tk $(DOT_VERSION) Help
  61.  
  62. [FILES]
  63.  
  64. contents.htm
  65.  
  66. docs.css
  67.  
  68. -Keywords
  69.  
  70. -TclCmd
  71.  
  72. -TclLib
  73.  
  74. -TkCmd
  75.  
  76. -TkLib
  77.  
  78. -UserCmd
  79.  
  80. +Keywords\*.htm
  81.  
  82. +TclCmd\*.htm
  83.  
  84. +TclLib\*.htm
  85.  
  86. +TkCmd\*.htm
  87.  
  88. +TkLib\*.htm
  89.  
  90. +UserCmd\*.htm
  91.  
  92. <<
  93.  
  94.  
  95.  
  96. chmsetup:
  97.  
  98. @if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
  99.  
  100.  
  101.  
  102.  
  103. Index: win/rules.vc
  104. ==================================================================
  105. --- win/rules.vc
  106. +++ win/rules.vc
  107. @@ -228,18 +228,23 @@
  108. !message *** Doing static
  109.  
  110. STATIC_BUILD = 1
  111.  
  112. !else
  113.  
  114. STATIC_BUILD = 0
  115.  
  116. !endif
  117.  
  118. +!if [nmakehlp -f $(OPTS) "nomsvcrt"]
  119.  
  120. +!message *** Doing nomsvcrt
  121.  
  122. +MSVCRT = 0
  123.  
  124. +!else
  125.  
  126. !if [nmakehlp -f $(OPTS) "msvcrt"]
  127.  
  128. !message *** Doing msvcrt
  129.  
  130. MSVCRT = 1
  131.  
  132. !else
  133.  
  134. !if !$(STATIC_BUILD)
  135.  
  136. MSVCRT = 1
  137.  
  138. !else
  139.  
  140. MSVCRT = 0
  141.  
  142. +!endif
  143.  
  144. !endif
  145.  
  146. !endif
  147.  
  148. !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
  149.  
  150. !message *** Doing staticpkg
  151.  
  152. TCL_USE_STATIC_PACKAGES = 1
  153.  
  154.  
  155.  
  156.