merge 8.5 - windows: eliminate overwriting of WINDIR env-variable in VS-makefiles (used WIN_DIR now similar to "makefile.in");

init.tcl: windows helper prefer SystemRoot if available.

1 files changed, 26 insertions, 28 deletions

diff --git a/win/rules.vc b/win/rules.vc
index 68e3b08..c766427 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -162,7 +162,7 @@ MKDIR   = mkdir
 # COMPATDIR - source directory that holds compatibility sources

 # DOCDIR - source directory containing documentation files

 # GENERICDIR - platform-independent source directory

-# WINDIR - Windows-specific source directory

+# WIN_DIR - Windows-specific source directory

 # TESTDIR - directory containing test files

 # TOOLSDIR - directory containing build tools

 # _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set

@@ -215,17 +215,15 @@ DEMODIR		= $(LIBDIR)\demos
 DEMODIR		= $(ROOT)\demos

 !endif

 !endif # ifndef DEMODIR

-# Do NOT enclose WINDIR in a !ifndef because Windows always defines

-# WINDIR env var to point to c:\windows!

-# TBD - This is a potentially dangerous conflict, rename WINDIR to

-# something else

-WINDIR		= $(ROOT)\win

+# Do NOT use WINDIR because it is Windows internal environment

+# variable to point to c:\windows!

+WIN_DIR		= $(ROOT)\win

 

 !ifndef RCDIR

-!if exist("$(WINDIR)\rc")

-RCDIR           = $(WINDIR)\rc

+!if exist("$(WIN_DIR)\rc")

+RCDIR           = $(WIN_DIR)\rc

 !else

-RCDIR           = $(WINDIR)

+RCDIR           = $(WIN_DIR)

 !endif

 !endif

 RCDIR = $(RCDIR:/=\)

@@ -1093,7 +1091,7 @@ TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
 

 TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib

 TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)

-TCL_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+TCL_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

 

 !else # ! $(DOING_TCL)

 

@@ -1168,7 +1166,7 @@ WISH 		= $(OUT_DIR)\$(WISHNAME)
 TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)

 TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)

 TKLIB		= $(OUT_DIR)\$(TKLIBNAME)

-TK_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"

+TK_INCLUDES    = -I"$(WIN_DIR)" -I"$(GENERICDIR)"

 

 !else # effectively NEED_TK

 

@@ -1417,7 +1415,7 @@ cwarn = $(cwarn) -WX
 

 INCLUDES = $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES)

 !if !$(DOING_TCL) && !$(DOING_TK)

-INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)"

+INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WIN_DIR)" -I"$(COMPATDIR)"

 !endif

 

 # These flags are defined roughly in the order of the pre-reform

@@ -1611,20 +1609,20 @@ default-install-demos:
 default-clean:

 	@echo Cleaning $(TMP_DIR)\* ...

 	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)

-	@echo Cleaning $(WINDIR)\nmakehlp.obj, nmakehlp.exe ...

-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj

-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe

-	@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out

-	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...

-	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt

-	@echo Cleaning $(WINDIR)\_junk.pch ...

-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch

-	@echo Cleaning $(WINDIR)\vercl.x, vercl.i ...

-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x

-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i

-	@echo Cleaning $(WINDIR)\versions.vc, version.vc ...

-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc

-	@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc

+	@echo Cleaning $(WIN_DIR)\nmakehlp.obj, nmakehlp.exe ...

+	@if exist $(WIN_DIR)\nmakehlp.obj del $(WIN_DIR)\nmakehlp.obj

+	@if exist $(WIN_DIR)\nmakehlp.exe del $(WIN_DIR)\nmakehlp.exe

+	@if exist $(WIN_DIR)\nmakehlp.out del $(WIN_DIR)\nmakehlp.out

+	@echo Cleaning $(WIN_DIR)\nmhlp-out.txt ...

+	@if exist $(WIN_DIR)\nmhlp-out.txt del $(WIN_DIR)\nmhlp-out.txt

+	@echo Cleaning $(WIN_DIR)\_junk.pch ...

+	@if exist $(WIN_DIR)\_junk.pch del $(WIN_DIR)\_junk.pch

+	@echo Cleaning $(WIN_DIR)\vercl.x, vercl.i ...

+	@if exist $(WIN_DIR)\vercl.x del $(WIN_DIR)\vercl.x

+	@if exist $(WIN_DIR)\vercl.i del $(WIN_DIR)\vercl.i

+	@echo Cleaning $(WIN_DIR)\versions.vc, version.vc ...

+	@if exist $(WIN_DIR)\versions.vc del $(WIN_DIR)\versions.vc

+	@if exist $(WIN_DIR)\version.vc del $(WIN_DIR)\version.vc

 

 default-hose: default-clean

 	@echo Hosing $(OUT_DIR)\* ...

@@ -1716,7 +1714,7 @@ DISABLE_IMPLICIT_RULES = 0
 $<

 <<

 

-{$(WINDIR)}.c{$(TMP_DIR)}.obj::

+{$(WIN_DIR)}.c{$(TMP_DIR)}.obj::

 	$(CCPKGCMD) @<<

 $<

 <<

@@ -1734,7 +1732,7 @@ $<
 {$(RCDIR)}.rc{$(TMP_DIR)}.res:

 	$(RESCMD) $<

 

-{$(WINDIR)}.rc{$(TMP_DIR)}.res:

+{$(WIN_DIR)}.rc{$(TMP_DIR)}.res:

 	$(RESCMD) $<

 

 {$(TMP_DIR)}.rc{$(TMP_DIR)}.res: