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, 14 insertions, 14 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 4e0bdae..04dcbcb 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -546,7 +546,7 @@ clean-pkgs:
 	    popd \

 	  )

 

-$(CAT32): $(WINDIR)\cat.c

+$(CAT32): $(WIN_DIR)\cat.c

 	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?

 	$(CONEXECMD) -stack:16384 $(TMP_DIR)\cat.obj

 	$(_VC_MANIFEST_EMBED_EXE)

@@ -656,7 +656,7 @@ CORE_USE_WIDECHAR_API = $(USE_WIDECHAR_API)
 tclConfig: $(OUT_DIR)\tclConfig.sh

 

 # TBD - is this tclConfig.sh file ever used? The values are incorrect!

-$(OUT_DIR)\tclConfig.sh: $(WINDIR)\tclConfig.sh.in

+$(OUT_DIR)\tclConfig.sh: $(WIN_DIR)\tclConfig.sh.in

 	@echo Creating tclConfig.sh

         @nmakehlp -s << $** >$@

 @TCL_DLL_FILE@       $(TCLLIBNAME)

@@ -732,7 +732,7 @@ gendate:
 # Special case object file targets

 #---------------------------------------------------------------------

 

-$(TMP_DIR)\testMain.obj: $(WINDIR)\tclAppInit.c

+$(TMP_DIR)\testMain.obj: $(WIN_DIR)\tclAppInit.c

 	$(cc32) $(appcflags) -DTCL_TEST \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -747,7 +747,7 @@ $(TMP_DIR)\tclTest.obj: $(GENERICDIR)\tclTest.c
 $(TMP_DIR)\tclTestObj.obj: $(GENERICDIR)\tclTestObj.c

 	$(cc32) $(appcflags) -Fo$@ $?

 

-$(TMP_DIR)\tclWinTest.obj: $(WINDIR)\tclWinTest.c

+$(TMP_DIR)\tclWinTest.obj: $(WIN_DIR)\tclWinTest.c

 	$(CCAPPCMD) $?

 

 $(TMP_DIR)\tclZlib.obj: $(GENERICDIR)\tclZlib.c

@@ -767,7 +767,7 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
 	-DCFG_RUNTIME_DOCDIR="\"$(DOC_INSTALL_DIR:\=\\)\""     \

 	-Fo$@ $?

 

-$(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c

+$(TMP_DIR)\tclAppInit.obj: $(WIN_DIR)\tclAppInit.c

 	$(cc32) $(appcflags) \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -775,7 +775,7 @@ $(TMP_DIR)\tclAppInit.obj: $(WINDIR)\tclAppInit.c
 ### The following objects should be built using the stub interfaces

 ### *ALL* extensions need to built with -DTCL_THREADS=1

 

-$(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c

+$(TMP_DIR)\tclWinReg.obj: $(WIN_DIR)\tclWinReg.c

 !if $(STATIC_BUILD)

 	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

 !else

@@ -783,7 +783,7 @@ $(TMP_DIR)\tclWinReg.obj: $(WINDIR)\tclWinReg.c
 !endif

 

 

-$(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c

+$(TMP_DIR)\tclWinDde.obj: $(WIN_DIR)\tclWinDde.c

 !if $(STATIC_BUILD)

 	$(cc32) $(appcflags) -DSTATIC_BUILD -Fo$@ $?

 !else

@@ -804,7 +804,7 @@ $(TMP_DIR)\tclTomMathStubLib.obj: $(GENERICDIR)\tclTomMathStubLib.c
 $(TMP_DIR)\tclOOStubLib.obj: $(GENERICDIR)\tclOOStubLib.c

 	$(cc32) $(stubscflags) -Fo$@ $?

 

-$(TMP_DIR)\tclsh.exe.manifest: $(WINDIR)\tclsh.exe.manifest.in

+$(TMP_DIR)\tclsh.exe.manifest: $(WIN_DIR)\tclsh.exe.manifest.in

 	@nmakehlp -s << $** >$@

 @MACHINE@	  $(MACHINE:IX86=X86)

 @TCL_WIN_VERSION@  $(DOTVERSION).0.0

@@ -824,7 +824,7 @@ depend:
 !else

 	$(TCLSH) $(TOOLSDIR:\=/)/mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \

 		-passthru:"-DBUILD_tcl $(TCL_INCLUDES) $(PRJ_INCLUDES)" $(GENERICDIR),$$(GENERICDIR) \

-		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WINDIR),$$(WINDIR) @<<

+		$(COMPATDIR),$$(COMPATDIR) $(TOMMATHDIR),$$(TOMMATHDIR) $(WIN_DIR),$$(WIN_DIR) @<<

 $(TCLOBJS)

 <<

 !endif

@@ -861,7 +861,7 @@ $<
 $<

 <<

 

-$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WINDIR)\tclsh.rc

+$(TMP_DIR)\tclsh.res: $(TMP_DIR)\tclsh.exe.manifest $(WIN_DIR)\tclsh.rc

 

 

 #---------------------------------------------------------------------

@@ -919,10 +919,10 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
 	@$(CPY) "$(ROOT)\library\word.tcl"        "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(ROOT)\library\auto.tcl"        "$(SCRIPT_INSTALL_DIR)\"

 	@$(CPY) "$(OUT_DIR)\tclConfig.sh"         "$(LIB_INSTALL_DIR)\"

-	@$(CPY) "$(WINDIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"

-	@$(CPY) "$(WINDIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"

-	@$(CPY) "$(WINDIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"

-	@$(CPY) "$(WINDIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WIN_DIR)\tclooConfig.sh"        "$(LIB_INSTALL_DIR)\"

+	@$(CPY) "$(WIN_DIR)\rules.vc"              "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WIN_DIR)\targets.vc"              "$(LIB_INSTALL_DIR)\nmake\"

+	@$(CPY) "$(WIN_DIR)\nmakehlp.c"            "$(LIB_INSTALL_DIR)\nmake\"

 	@$(CPY) "$(OUT_DIR)\tcl.nmake"            "$(LIB_INSTALL_DIR)\nmake\"

 	@echo Installing library http1.0 directory

 	@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \