diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2009-07-11 08:57:08 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2009-07-11 08:57:08 (GMT) |
| commit | d59b9d14e5d9e802eade0803b8d120e00923a59e (patch) | |
| tree | d0574dca892a0eeaae84c1373b03d7195a577d9a /win | |
| parent | e399f035d3e7643dee420ed549aab4e3c38da4ff (diff) | |
| download | tcl-d59b9d14e5d9e802eade0803b8d120e00923a59e.zip tcl-d59b9d14e5d9e802eade0803b8d120e00923a59e.tar.gz tcl-d59b9d14e5d9e802eade0803b8d120e00923a59e.tar.bz2 | |
Added optional script option to runtest and a runshell target. Silence output from html help compiler
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 42ca196..0d4117f 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.199 2009/04/10 14:19:45 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.200 2009/07/11 08:57:08 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -573,7 +573,11 @@ test-core: setup $(TCLTEST) dlls $(CAT32) runtest: setup $(TCLTEST) dlls $(CAT32) set TCL_LIBRARY=$(ROOT)/library - $(DEBUGGER) $(TCLTEST) + $(DEBUGGER) $(TCLTEST) $(SCRIPT) + +runshell: setup $(TCLSH) dlls + set TCL_LIBRARY=$(ROOT)/library + $(DEBUGGER) $(TCLSH) $(SCRIPT) setup: @if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR) @@ -713,6 +717,7 @@ gentommath_h: # Build the Windows HTML help file. #--------------------------------------------------------------------- +# NOTE: you can define HHC on the command-line to override this !ifndef HHC HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe" !endif @@ -724,8 +729,9 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm htmlhelp: chmsetup $(CHMFILE) $(CHMFILE): $(DOCDIR)\* - $(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl - $(HHC) <<$(HHPFILE) + @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl + @echo Compiling html help project + @$(HHC) <<$(HHPFILE) >NUL [OPTIONS] Compatibility=1.1 or later Compiled file=$(HTMLBASE).chm |