Diff
Not logged in

Differences From Artifact [9edfc30b69]:

To Artifact [c9c47f3e77]:


530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
tcltest:    setup $(TCLTEST) dlls $(CAT32)
install:    install-binaries install-libraries install-docs


test: setup $(TCLTEST) dlls $(CAT32)
	set TCL_LIBRARY=$(ROOT)/library
!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
	$(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
		set ::ddelib [file normalize $(TCLDDELIB:\=/)]
		set ::reglib [file normalize $(TCLREGLIB:\=/)]
<<
!else
	@echo Please wait while the tests are collected...
	$(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
		set ::ddelib [file normalize $(TCLDDELIB:\=/)]







|







530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
tcltest:    setup $(TCLTEST) dlls $(CAT32)
install:    install-binaries install-libraries install-docs


test: setup $(TCLTEST) dlls $(CAT32)
	set TCL_LIBRARY=$(ROOT)/library
!if "$(OS)" == "Windows_NT"  || "$(MSVCDIR)" == "IDE"
	$(DEBUGGER) $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
		set ::ddelib [file normalize $(TCLDDELIB:\=/)]
		set ::reglib [file normalize $(TCLREGLIB:\=/)]
<<
!else
	@echo Please wait while the tests are collected...
	$(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile << > tests.log
		set ::ddelib [file normalize $(TCLDDELIB:\=/)]
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
!endif

#---------------------------------------------------------------------
# Build the Windows HTML help file.
#---------------------------------------------------------------------

!ifndef HHC
HHC="C:\Program Files\HTML Help Workshop\hhc.exe"
!endif
HTMLDIR=$(ROOT)\html
HTMLBASE=TclTk$(VERSION)
HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm

htmlhelp: chmsetup $(HHPFILE)
	$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
	$(HHC) $(HHPFILE) >NUL

chmsetup:
	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)

$(HHPFILE):
	type << > $@
[OPTIONS]







|








|







659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
!endif

#---------------------------------------------------------------------
# Build the Windows HTML help file.
#---------------------------------------------------------------------

!ifndef HHC
HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
!endif
HTMLDIR=$(ROOT)\html
HTMLBASE=TclTk$(VERSION)
HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm

htmlhelp: chmsetup $(HHPFILE)
	$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
	"$(HHC)" $(HHPFILE) >NUL

chmsetup:
	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)

$(HHPFILE):
	type << > $@
[OPTIONS]
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
$(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

#"
#---------------------------------------------------------------------
# Build tclConfig.sh for the TEA build system.
#---------------------------------------------------------------------








|




<







757
758
759
760
761
762
763
764
765
766
767
768

769
770
771
772
773
774
775
$(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)\"
!endif
!if exist($(HELPFILE))
	@echo Installing Windows help
	@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
	@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"

!endif

#"
#---------------------------------------------------------------------
# Build tclConfig.sh for the TEA build system.
#---------------------------------------------------------------------