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

init.tcl: windows helper prefer SystemRoot if available.

3 files changed, 46 insertions, 44 deletions

diff --git a/library/init.tcl b/library/init.tcl
index aaf148b..eb6b04e 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -680,7 +680,9 @@ proc auto_execok name {
     }
 
     set path "[file dirname [info nameof]];.;"
-    if {[info exists env(WINDIR)]} {
+    if {[info exists env(SystemRoot)]} {
+	set windir $env(SystemRoot)
+    } elseif {[info exists env(WINDIR)]} {
 	set windir $env(WINDIR)
     }
     if {[info exists windir]} {
diff --git a/win/makefile.bc b/win/makefile.bc
index 8f337e3..7881e2c 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -271,10 +271,10 @@ TCLOBJS	= \
 

 TCLSTUBOBJS	= $(TMPDIR)\tclStubLib.obj

 

-WINDIR		= $(ROOT)\win

+WIN_DIR		= $(ROOT)\win

 GENERICDIR	= $(ROOT)\generic

 

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

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

 TCL_DEFINES	= $(DEBUGDEFINES) $(THREADDEFINES) $(SYMDEFINES) \

 			$(PROFDEFINES) $(OPTDEFINES) $(SIXFOURDEFINES) \

 			-DTCL_CFGVAL_ENCODING=${CFG_ENCODING}

@@ -379,8 +379,8 @@ $(TCLTEST): $(TCLTESTOBJS) $(TCLLIB) $(TMPDIR)\$(NAMEPREFIX)sh.res
 		$(TCLTESTOBJS), $@, -x, $(LNLIBS) $(TCLLIB),, $(TMPDIR)\$(NAMEPREFIX)sh.res

 !

 

-$(TCLPIPEDLL): $(WINDIR)\stub16.c

-	$(cc32) $(CFLAGS) -o$(TMPDIR)\stub16.obj $(WINDIR)\stub16.c

+$(TCLPIPEDLL): $(WIN_DIR)\stub16.c

+	$(cc32) $(CFLAGS) -o$(TMPDIR)\stub16.obj $(WIN_DIR)\stub16.c

 	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \

 		$(TMPDIR)\stub16.obj, $@, -x, $(LNLIBS),, $(TMPDIR)\$(NAMEPREFIX).res

 

@@ -394,7 +394,7 @@ $(TCLREGDLL): $(TMPDIR)\tclWinReg.obj $(TCLSTUBLIB)
 		$(TMPDIR)\tclWinReg.obj, $@, -x, $(LNLIBS) $(TCLSTUBLIB),, \

 		$(TMPDIR)\$(NAMEPREFIX).res

 

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

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

 	$(cc32) $(CONS_CFLAGS) -o$(TMPDIR)\cat.obj $?

 	$(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \

 		$(TMPDIR)\cat.obj, $@, -x, $(LNLIBS),,

@@ -499,10 +499,10 @@ $(TCLRTF): $(MAN2TCL).exe $(TCLSH)
 #

 # Special case object file targets

 #

-$(TMPDIR)\tclWinInit.obj: $(WINDIR)\tclWinInit.c

+$(TMPDIR)\tclWinInit.obj: $(WIN_DIR)\tclWinInit.c

 	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?

 

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

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

 	$(cc32) $(TCL_CFLAGS) -DTCL_TEST -o$(TMPDIR)\testMain.obj $?

 

 $(TMPDIR)\tclTest.obj: $(GENERICDIR)\tclTest.c

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

 	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?

 

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

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

 	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?

 

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

@@ -522,17 +522,17 @@ $(TMP_DIR)\tclPkgConfig.obj: $(GENERICDIR)\tclPkgConfig.c
 		-DCFG_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\"		\

 	 -o$(TMPDIR)\$@ $?

 

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

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

 	$(cc32) $(TCL_CFLAGS) -o$(TMPDIR)\$@ $?

 

 # The following objects should be built using the stub interfaces

 

 # tclWinReg: Produces errors in ANSI mode

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

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

 	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -o$(TMPDIR)\$@ $?

 

 # tclWinDde: Produces errors in ANSI mode

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

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

 	$(cc32) $(TCL_CFLAGS) -DUSE_TCL_STUBS -o$(TMPDIR)\$@ $?

 

 

@@ -571,7 +571,7 @@ $(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
 # Implicit rules

 #

 

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

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

 	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<

 

 {$(GENERICDIR)}.c{$(TMPDIR)}.obj:

@@ -580,7 +580,7 @@ $(GENERICDIR)\regguts.h: $(GENERICDIR)\regcustom.h
 {$(ROOT)\compat}.c{$(TMPDIR)}.obj:

 	$(cc32) -DBUILD_tcl $(TCL_CFLAGS) -o$@ $<

 

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

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

 	$(rc32) $(INCLUDEPATH) -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<

 

 clean:

diff --git a/win/makefile.vc b/win/makefile.vc
index fc6191f..e2ec8ab 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -413,7 +413,7 @@ DOCDIR		= $(ROOT)\doc
 GENERICDIR	= $(ROOT)\generic

 TOMMATHDIR	= $(ROOT)\libtommath

 TOOLSDIR	= $(ROOT)\tools

-WINDIR		= $(ROOT)\win

+WIN_DIR		= $(ROOT)\win

 

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

 # Compile flags

@@ -454,7 +454,7 @@ crt = -MT
 !endif

 !endif

 

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

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

 TCL_DEFINES	= -DTCL_PIPE_DLL=\"$(TCLPIPEDLLNAME)\" -DTCL_TOMMATH -DMP_PREC=4 -Dinline=__inline

 BASE_CFLAGS	= $(cflags) $(cdebug) $(crt) $(TCL_INCLUDES) $(TCL_DEFINES)

 CON_CFLAGS	= $(cflags) $(cdebug) $(crt) -DCONSOLE

@@ -574,7 +574,7 @@ $(TCLLIB): $(TCLOBJS)
 $**

 <<

 !else

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcl -out:$@ \

+	$(link32) $(dlllflags) -base:@$(WIN_DIR)\coffbase.txt,tcl -out:$@ \

 		$(baselibs) @<<

 $**

 <<

@@ -593,8 +593,8 @@ $(TCLTEST): $(TCLTESTOBJS) $(TCLSTUBLIB) $(TCLIMPLIB)
 	$(link32) $(conlflags) -stack:2300000 -out:$@ $(baselibs) $**

 	$(_VC_MANIFEST_EMBED_EXE)

 

-$(TCLPIPEDLL): $(WINDIR)\stub16.c

-	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $(WINDIR)\stub16.c

+$(TCLPIPEDLL): $(WIN_DIR)\stub16.c

+	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $(WIN_DIR)\stub16.c

 	$(link32) $(conlflags) -out:$@ $(TMP_DIR)\stub16.obj $(baselibs)

 	$(_VC_MANIFEST_EMBED_DLL)

 

@@ -603,7 +603,7 @@ $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**

 !else

 $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tcldde -out:$@ \

+	$(link32) $(dlllflags) -base:@$(WIN_DIR)\coffbase.txt,tcldde -out:$@ \

 		$** $(baselibs)

 	$(_VC_MANIFEST_EMBED_DLL)

 	-@del $*.exp

@@ -615,14 +615,14 @@ $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**

 !else

 $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)

-	$(link32) $(dlllflags) -base:@$(WINDIR)\coffbase.txt,tclreg -out:$@ \

+	$(link32) $(dlllflags) -base:@$(WIN_DIR)\coffbase.txt,tclreg -out:$@ \

 		$** $(baselibs)

 	$(_VC_MANIFEST_EMBED_DLL)

 	-@del $*.exp

 	-@del $*.lib

 !endif

 

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

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

 	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?

 	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj \

 		$(baselibs)

@@ -774,7 +774,7 @@ install-docs:
 

 tclConfig: $(OUT_DIR)\tclConfig.sh

 

-$(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)

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

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

 

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

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

 	$(cc32) $(TCL_CFLAGS) -DTCL_TEST \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

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

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

 

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

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

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

 

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

@@ -877,7 +877,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) $(TCL_CFLAGS) \

 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \

 	    -Fo$@ $?

@@ -885,7 +885,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) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -DUNICODE -D_UNICODE -Fo$@ $?

 !else

@@ -893,7 +893,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) $(TCL_CFLAGS) -DTCL_THREADS=1 -DSTATIC_BUILD -DUNICODE -D_UNICODE -Fo$@ $?

 !else

@@ -908,7 +908,7 @@ $(TMP_DIR)\tclWinDde.obj: $(WINDIR)\tclWinDde.c
 $(TMP_DIR)\tclStubLib.obj: $(GENERICDIR)\tclStubLib.c

 	$(cc32) $(STUB_CFLAGS) -Zl -DSTATIC_BUILD $(TCL_INCLUDES) -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

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

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

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

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

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

 $(TCLOBJS)

 <<

 !endif

@@ -952,7 +952,7 @@ $(TCLOBJS)
 # Implicit rules

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

 

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

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

 	$(cc32) $(TCL_CFLAGS) -DBUILD_tcl -Fo$(TMP_DIR)\ @<<

 $<

 <<

@@ -972,7 +972,7 @@ $<
 $<

 <<

 

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

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

 	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \

 	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \

 	    -d TCL_THREADS=$(TCL_THREADS) \

@@ -1122,18 +1122,18 @@ tidy:
 clean:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 realclean: hose