Tcl Source Code: Diff

Differences From Artifact [bc723c310f]:

File win/rules.vc — part of check-in [63b06948ef] at 2015-06-25 08:02:17 on branch trunk — Fix bug in "make dist" when system-encoding is UTF-8: eolFix will then translate some windows-specific files to UTF-8 too. Solution: commit those files with CRLF line-ending, which eliminates the need for eolFix altgether. See als: [495120] for the reason why eolFix was introduced in the first place. No longer needed with fossil. (user: jan.nijtmans size: 19237) [more...]

To Artifact [290c616292]:

File win/rules.vc — part of check-in [32379be1ed] at 2015-12-11 08:43:28 on branch semver — Experiments with [http://semver.org/|Semantic Versioning] in Tcl. (Don't look!) (user: jan.nijtmans size: 18405)

︙
305 306 307 308 309 310 311 ~~312 313 314 315 316 317 318 319 320 321 322 323~~ 324 325 326 327 328 329 330 331 332 333 334 335 336 ~~337 338 339 340~~ 341 342 343 344 ~~345~~ 346 347 ~~348~~ 349 350 351 352 353 ~~354~~ 355 356 357 358 359 ~~360~~ 361 362 363 364 365 366 367	305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347	- - - - - - - - - - - - - - - - - - - -	#---------------------------------------------------------- # Figure-out how to name our intermediate and output directories. # We wouldn't want different builds to use the same .obj files # by accident. #---------------------------------------------------------- ~~#----------------------------------------~~ ~~# Naming convention:~~ ~~# t = full thread support.~~ ~~# s = static library (as opposed to an~~ ~~# import library)~~ ~~# g = linked to the debug enabled C~~ ~~# run-time.~~ ~~# x = special static build when it~~ ~~# links to the dynamic C run-time.~~ ~~#----------------------------------------~~ ~~SUFX = tsgx~~ !if $(DEBUG) BUILDDIRTOP = Debug !else BUILDDIRTOP = Release !endif !if "$(MACHINE)" != "IX86" BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE) !endif !if $(VCVER) > 6 BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER) !endif ~~!if !$(DEBUG) \|\| $(DEBUG) && $(UNCHECKED)~~ ~~SUFX = $(SUFX:g=)~~ ~~!endif~~ TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX !if !$(STATIC_BUILD) TMP_DIRFULL = $(TMP_DIRFULL:Static=) ~~SUFX = $(SUFX:s=)~~ EXT = dll TMP_DIRFULL = $(TMP_DIRFULL:X=) ~~SUFX = $(SUFX:x=)~~ !else TMP_DIRFULL = $(TMP_DIRFULL:Dynamic=) EXT = lib !if !$(MSVCRT) TMP_DIRFULL = $(TMP_DIRFULL:X=) ~~SUFX = $(SUFX:x=)~~ !endif !endif !if !$(TCL_THREADS) TMP_DIRFULL = $(TMP_DIRFULL:Threaded=) ~~SUFX = $(SUFX:t=)~~ !endif !ifndef TMP_DIR TMP_DIR = $(TMP_DIRFULL) !ifndef OUT_DIR OUT_DIR = .\$(BUILDDIRTOP) !endif
︙
574 575 576 577 578 579 580 ~~581~~ ~~582 583 584 585 586~~ 587 ~~588 589~~ 590 591 592 593 ~~594~~ ~~595 596 597 598 599~~ 600 ~~601 602~~ 603 604 605 606 607 608 609	554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583	- + - - - - - + + - - + + - + - - - - - + + - - + +	#-------------------------------------------------------------- !if "$(PROJECT)" != "tcl" TCL_VERSION = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION) !if $(TCLINSTALL) ~~TCLSH = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION~~)$(SUFX~~).exe"~~ TCLSH = "$(_TCLDIR)\bin\tclsh$(TCL_MAJOR_VERSION).exe" ~~!if !exist($(TCLSH)) && $(TCL_THREADS)~~ ~~TCLSH = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX).exe"~~ ~~!endif~~ TCLSTUBLIB = "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib" TCLIMPLIB = "$(_TCLDIR)\lib\tcl$(TCL_VERSION~~)$(SUFX~~).lib" TCLSTUBLIB = "$(_TCLDIR)\lib\tclstub$(TCL_MAJOR_VERSION).lib" TCLIMPLIB = "$(_TCLDIR)\lib\tcl$(TCL_MAJOR_VERSION).lib" TCL_LIBRARY = $(_TCLDIR)\lib ~~TCLREGLIB = "$(_TCLDIR)\lib\tclreg13~~$(SUFX:t=)~~.lib" TCLDDELIB = "$(_TCLDIR)\lib\tcldde14~~$(SUFX:t=)~~.lib"~~ TCLREGLIB = "$(_TCLDIR)\lib\tclreg13.lib" TCLDDELIB = "$(_TCLDIR)\lib\tcldde14.lib" COFFBASE = \must\have\tcl\sources\to\build\this\target TCLTOOLSDIR = \must\have\tcl\sources\to\build\this\target TCL_INCLUDES = -I"$(_TCLDIR)\include" !else ~~TCLSH = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION~~)$(SUFX~~).exe"~~ TCLSH = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_MAJOR_VERSION).exe" ~~!if !exist($(TCLSH)) && $(TCL_THREADS)~~ ~~TCLSH = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX).exe"~~ ~~!endif~~ TCLSTUBLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib" TCLIMPLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)~~$(SUFX)~~.lib" TCLSTUBLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_MAJOR_VERSION).lib" TCLIMPLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION).lib" TCL_LIBRARY = $(_TCLDIR)\library ~~TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13~~$(SUFX:t=)~~.lib" TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14~~$(SUFX:t=)~~.lib"~~ TCLREGLIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13.lib" TCLDDELIB = "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14.lib" COFFBASE = "$(_TCLDIR)\win\coffbase.txt" TCLTOOLSDIR = $(_TCLDIR)\tools TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win" !endif !endif
︙
664 665 666 667 668 669 670 ~~671 672 673~~ 674 675 ~~676 677 678~~ 679 680 681 682 683 684 685 686 687 688 689 690 ~~691~~ 692 693 694 695 696 697 698	638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671	- - - + + + - - - + + + -	!include versions.vc TK_DOTVERSION = $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION) TK_VERSION = $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION) !if "$(PROJECT)" != "tk" !if $(TKINSTALL) ~~WISH = "$(_TKDIR)\bin\wish$(TK_VERSION~~)$(SUFX~~).exe" TKSTUBLIB = "$(_TKDIR)\lib\tkstub$(TK_VERSION).lib" TKIMPLIB = "$(_TKDIR)\lib\tk$(TK_VERSION~~)$(SUFX~~).lib"~~ WISH = "$(_TKDIR)\bin\wish$(TK_MAJOR_VERSION).exe" TKSTUBLIB = "$(_TKDIR)\lib\tkstub$(TK_MAJOR_VERSION).lib" TKIMPLIB = "$(_TKDIR)\lib\tk$(TK_MAJOR_VERSION).lib" TK_INCLUDES = -I"$(_TKDIR)\include" !else WISH = "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION~~)$(SUFX~~).exe" TKSTUBLIB = "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib" TKIMPLIB = "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION~~)$(SUFX~~).lib" WISH = "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_MAJOR_VERSION).exe" TKSTUBLIB = "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_MAJOR_VERSION).lib" TKIMPLIB = "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_MAJOR_VERSION).lib" TK_INCLUDES = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib" !endif !endif !endif #---------------------------------------------------------- # Display stats being used. #---------------------------------------------------------- !message * Intermediate directory will be '$(TMP_DIR)' !message * Output directory will be '$(OUT_DIR)' ~~!message * Suffix for binaries will be '$(SUFX)'~~ !message * Optional defines are '$(OPTDEFINES)' !message * Compiler version $(VCVER). Target machine is $(MACHINE) !message * Host architecture is $(NATIVE_ARCH) !message * Compiler options '$(COMPILERFLAGS) $(OPTIMIZATIONS) $(DEBUGFLAGS) $(WARNINGS)' !message * Link options '$(LINKERFLAGS)' !endif