Convert win/rules-ext.vc and win/targets.vc from lf to crlf line-endings. Also adapt .fossil-settings/crlf-glob accordingly

2 files changed, 215 insertions, 215 deletions

diff --git a/win/rules-ext.vc b/win/rules-ext.vc
index ab86876..58c70fa 100644
--- a/win/rules-ext.vc
+++ b/win/rules-ext.vc
@@ -1,118 +1,118 @@
-# This file should only be included in makefiles for Tcl extensions,
-# NOT in the makefile for Tcl itself.
-
-!ifndef _RULES_EXT_VC
-
-# We need to run from the directory the parent makefile is located in.
-# nmake does not tell us what makefile was used to invoke it so parent
-# makefile has to set the MAKEFILEVC macro or we just make a guess and
-# warn if we think that is not the case.
-!if "$(MAKEFILEVC)" == ""
-
-!if exist("$(PROJECT).vc")
-MAKEFILEVC = $(PROJECT).vc
-!elseif exist("makefile.vc")
-MAKEFILEVC = makefile.vc
-!endif
-!endif # "$(MAKEFILEVC)" == ""
-
-!if !exist("$(MAKEFILEVC)")
-MSG = ^
-You must run nmake from the directory containing the project makefile.^
-If you are doing that and getting this message, set the MAKEFILEVC^
-macro to the name of the project makefile.
-!message WARNING: $(MSG)
-!endif
-
-!if "$(PROJECT)" == "tcl"
-!error The rules-ext.vc file is not intended for Tcl itself.
-!endif
-
-# We extract version numbers using the nmakehlp program. For now use
-# the local copy of nmakehlp. Once we locate Tcl, we will use that
-# one if it is newer.
-!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]
-!endif
-
-# First locate the Tcl directory that we are working with.
-!ifdef TCLDIR
-
-_RULESDIR = $(TCLDIR:/=\)
-
-!else
-
-# If an installation path is specified, that is also the Tcl directory.
-# Also Tk never builds against an installed Tcl, it needs Tcl sources
-!if defined(INSTALLDIR) && "$(PROJECT)" != "tk"
-_RULESDIR=$(INSTALLDIR:/=\)
-!else
-# Locate Tcl sources
-!if [echo _RULESDIR = \> nmakehlp.out] \
-   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]
-_RULESDIR = ..\..\tcl
-!else
-!include nmakehlp.out
-!endif
-
-!endif # defined(INSTALLDIR)....
-
-!endif # ifndef TCLDIR
-
-# Now look for the targets.vc file under the Tcl root. Note we check this
-# file and not rules.vc because the latter also exists on older systems.
-!if exist("$(_RULESDIR)\lib\nmake\targets.vc") # Building against installed Tcl
-_RULESDIR = $(_RULESDIR)\lib\nmake
-!elseif exist("$(_RULESDIR)\win\targets.vc")   # Building against Tcl sources
-_RULESDIR = $(_RULESDIR)\win
-!else
-# If we have not located Tcl's targets file, most likely we are compiling
-# against an older version of Tcl and so must use our own support files.
-_RULESDIR = .
-!endif
-
-!if "$(_RULESDIR)" != "."
-# Potentially using Tcl's support files. If this extension has its own
-# nmake support files, need to compare the versions and pick newer.
-
-!if exist("rules.vc") # The extension has its own copy
-
-!if [echo TCL_RULES_MAJOR = \> versions.vc] \
-   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]
-!endif
-!if [echo TCL_RULES_MINOR = \>> versions.vc] \
-   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]
-!endif
-
-!if [echo OUR_RULES_MAJOR = \>> versions.vc] \
-   && [nmakehlp -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]
-!endif
-!if [echo OUR_RULES_MINOR = \>> versions.vc] \
-   && [nmakehlp -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]
-!endif
-!include versions.vc
-# We have a newer version of the support files, use them
-!if ($(TCL_RULES_MAJOR) != $(OUR_RULES_MAJOR)) || ($(TCL_RULES_MINOR) < $(OUR_RULES_MINOR))
-_RULESDIR = .
-!endif
-
-!endif # if exist("rules.vc")
-
-!endif # if $(_RULESDIR) != "."
-
-# Let rules.vc know what copy of nmakehlp.c to use.
-NMAKEHLPC = $(_RULESDIR)\nmakehlp.c
-
-# Get rid of our internal defines before calling rules.vc
-!undef TCL_RULES_MAJOR
-!undef TCL_RULES_MINOR
-!undef OUR_RULES_MAJOR
-!undef OUR_RULES_MINOR
-
-!if exist("$(_RULESDIR)\rules.vc")
-!message *** Using $(_RULESDIR)\rules.vc
-!include "$(_RULESDIR)\rules.vc"
-!else
-!error *** Could not locate rules.vc in $(_RULESDIR)
-!endif
-
+# This file should only be included in makefiles for Tcl extensions,

+# NOT in the makefile for Tcl itself.

+

+!ifndef _RULES_EXT_VC

+

+# We need to run from the directory the parent makefile is located in.

+# nmake does not tell us what makefile was used to invoke it so parent

+# makefile has to set the MAKEFILEVC macro or we just make a guess and

+# warn if we think that is not the case.

+!if "$(MAKEFILEVC)" == ""

+

+!if exist("$(PROJECT).vc")

+MAKEFILEVC = $(PROJECT).vc

+!elseif exist("makefile.vc")

+MAKEFILEVC = makefile.vc

+!endif

+!endif # "$(MAKEFILEVC)" == ""

+

+!if !exist("$(MAKEFILEVC)")

+MSG = ^

+You must run nmake from the directory containing the project makefile.^

+If you are doing that and getting this message, set the MAKEFILEVC^

+macro to the name of the project makefile.

+!message WARNING: $(MSG)

+!endif

+

+!if "$(PROJECT)" == "tcl"

+!error The rules-ext.vc file is not intended for Tcl itself.

+!endif

+

+# We extract version numbers using the nmakehlp program. For now use

+# the local copy of nmakehlp. Once we locate Tcl, we will use that

+# one if it is newer.

+!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]

+!endif

+

+# First locate the Tcl directory that we are working with.

+!ifdef TCLDIR

+

+_RULESDIR = $(TCLDIR:/=\)

+

+!else

+

+# If an installation path is specified, that is also the Tcl directory.

+# Also Tk never builds against an installed Tcl, it needs Tcl sources

+!if defined(INSTALLDIR) && "$(PROJECT)" != "tk"

+_RULESDIR=$(INSTALLDIR:/=\)

+!else

+# Locate Tcl sources

+!if [echo _RULESDIR = \> nmakehlp.out] \

+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]

+_RULESDIR = ..\..\tcl

+!else

+!include nmakehlp.out

+!endif

+

+!endif # defined(INSTALLDIR)....

+

+!endif # ifndef TCLDIR

+

+# Now look for the targets.vc file under the Tcl root. Note we check this

+# file and not rules.vc because the latter also exists on older systems.

+!if exist("$(_RULESDIR)\lib\nmake\targets.vc") # Building against installed Tcl

+_RULESDIR = $(_RULESDIR)\lib\nmake

+!elseif exist("$(_RULESDIR)\win\targets.vc")   # Building against Tcl sources

+_RULESDIR = $(_RULESDIR)\win

+!else

+# If we have not located Tcl's targets file, most likely we are compiling

+# against an older version of Tcl and so must use our own support files.

+_RULESDIR = .

+!endif

+

+!if "$(_RULESDIR)" != "."

+# Potentially using Tcl's support files. If this extension has its own

+# nmake support files, need to compare the versions and pick newer.

+

+!if exist("rules.vc") # The extension has its own copy

+

+!if [echo TCL_RULES_MAJOR = \> versions.vc] \

+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]

+!endif

+!if [echo TCL_RULES_MINOR = \>> versions.vc] \

+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]

+!endif

+

+!if [echo OUR_RULES_MAJOR = \>> versions.vc] \

+   && [nmakehlp -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]

+!endif

+!if [echo OUR_RULES_MINOR = \>> versions.vc] \

+   && [nmakehlp -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]

+!endif

+!include versions.vc

+# We have a newer version of the support files, use them

+!if ($(TCL_RULES_MAJOR) != $(OUR_RULES_MAJOR)) || ($(TCL_RULES_MINOR) < $(OUR_RULES_MINOR))

+_RULESDIR = .

+!endif

+

+!endif # if exist("rules.vc")

+

+!endif # if $(_RULESDIR) != "."

+

+# Let rules.vc know what copy of nmakehlp.c to use.

+NMAKEHLPC = $(_RULESDIR)\nmakehlp.c

+

+# Get rid of our internal defines before calling rules.vc

+!undef TCL_RULES_MAJOR

+!undef TCL_RULES_MINOR

+!undef OUR_RULES_MAJOR

+!undef OUR_RULES_MINOR

+

+!if exist("$(_RULESDIR)\rules.vc")

+!message *** Using $(_RULESDIR)\rules.vc

+!include "$(_RULESDIR)\rules.vc"

+!else

+!error *** Could not locate rules.vc in $(_RULESDIR)

+!endif

+

 !endif # _RULES_EXT_VC
\ No newline at end of file
diff --git a/win/targets.vc b/win/targets.vc
index 312022d..7f1d388 100644
--- a/win/targets.vc
+++ b/win/targets.vc
@@ -1,98 +1,98 @@
-#------------------------------------------------------------- -*- makefile -*-
-# targets.vc --
-#
-# Part of the nmake based build system for Tcl and its extensions.
-# This file defines some standard targets for the convenience of extensions
-# and can be optionally included by the extension makefile.
-# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for docs.
-
-$(PROJECT): setup pkgindex $(PRJLIB)
-
-!ifdef PRJ_STUBOBJS
-$(PROJECT): $(PRJSTUBLIB)
-$(PRJSTUBLIB): $(PRJ_STUBOBJS)
-	$(LIBCMD) $**
-
-$(PRJ_STUBOBJS):
-	$(CCSTUBSCMD) %s
-!endif # PRJ_STUBOBJS
-
-!ifdef PRJ_MANIFEST
-$(PROJECT): $(PRJLIB).manifest
-$(PRJLIB).manifest: $(PRJ_MANIFEST)
-	@nmakehlp -s << $** >$@
-@MACHINE@	  $(MACHINE:IX86=X86)
-<<
-!endif
-
-!if "$(PROJECT)" != "tcl" && "$(PROJECT)" != "tk"
-$(PRJLIB): $(PRJ_OBJS) $(RESFILE)
-!if $(STATIC_BUILD)
-       $(LIBCMD) $**
-!else
-       $(DLLCMD) $**
-       $(_VC_MANIFEST_EMBED_DLL)
-!endif
-       -@del $*.exp
-!endif
-
-!if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != ""
-$(PRJ_OBJS): $(PRJ_HEADERS)
-!endif
-
-# If parent makefile has defined stub objects, add their installation
-# to the default install
-!if "$(PRJ_STUBOBJS)" != ""
-default-install: default-install-stubs
-!endif
-
-# Unlike the other default targets, these cannot be in rules.vc because
-# the executed command depends on existence of macro PRJ_HEADERS_PUBLIC
-# that the parent makefile will not define until after including rules-ext.vc
-!if "$(PRJ_HEADERS_PUBLIC)" != ""
-default-install: default-install-headers
-default-install-headers:
-	@echo Installing headers to '$(INCLUDE_INSTALL_DIR)'
-	@for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)"
-!endif
-
-!if "$(DISABLE_STANDARD_TARGETS)" == ""
-DISABLE_STANDARD_TARGETS = 0
-!endif
-
-!if "$(DISABLE_TARGET_setup)" == ""
-DISABLE_TARGET_setup = 0
-!endif
-!if "$(DISABLE_TARGET_install)" == ""
-DISABLE_TARGET_install = 0
-!endif
-!if "$(DISABLE_TARGET_clean)" == ""
-DISABLE_TARGET_clean = 0
-!endif
-!if "$(DISABLE_TARGET_test)" == ""
-DISABLE_TARGET_test = 0
-!endif
-!if "$(DISABLE_TARGET_shell)" == ""
-DISABLE_TARGET_shell = 0
-!endif
-
-!if !$(DISABLE_STANDARD_TARGETS)
-!if !$(DISABLE_TARGET_setup)
-setup: default-setup
-!endif
-!if !$(DISABLE_TARGET_install)
-install: default-install
-!endif
-!if !$(DISABLE_TARGET_clean)
-clean: default-clean
-realclean: hose
-hose: default-hose
-distclean: realclean default-distclean
-!endif
-!if !$(DISABLE_TARGET_test)
-test: default-test
-!endif
-!if !$(DISABLE_TARGET_shell)
-shell: default-shell
-!endif
-!endif # DISABLE_STANDARD_TARGETS
+#------------------------------------------------------------- -*- makefile -*-

+# targets.vc --

+#

+# Part of the nmake based build system for Tcl and its extensions.

+# This file defines some standard targets for the convenience of extensions

+# and can be optionally included by the extension makefile.

+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for docs.

+

+$(PROJECT): setup pkgindex $(PRJLIB)

+

+!ifdef PRJ_STUBOBJS

+$(PROJECT): $(PRJSTUBLIB)

+$(PRJSTUBLIB): $(PRJ_STUBOBJS)

+	$(LIBCMD) $**

+

+$(PRJ_STUBOBJS):

+	$(CCSTUBSCMD) %s

+!endif # PRJ_STUBOBJS

+

+!ifdef PRJ_MANIFEST

+$(PROJECT): $(PRJLIB).manifest

+$(PRJLIB).manifest: $(PRJ_MANIFEST)

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

+@MACHINE@	  $(MACHINE:IX86=X86)

+<<

+!endif

+

+!if "$(PROJECT)" != "tcl" && "$(PROJECT)" != "tk"

+$(PRJLIB): $(PRJ_OBJS) $(RESFILE)

+!if $(STATIC_BUILD)

+       $(LIBCMD) $**

+!else

+       $(DLLCMD) $**

+       $(_VC_MANIFEST_EMBED_DLL)

+!endif

+       -@del $*.exp

+!endif

+

+!if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != ""

+$(PRJ_OBJS): $(PRJ_HEADERS)

+!endif

+

+# If parent makefile has defined stub objects, add their installation

+# to the default install

+!if "$(PRJ_STUBOBJS)" != ""

+default-install: default-install-stubs

+!endif

+

+# Unlike the other default targets, these cannot be in rules.vc because

+# the executed command depends on existence of macro PRJ_HEADERS_PUBLIC

+# that the parent makefile will not define until after including rules-ext.vc

+!if "$(PRJ_HEADERS_PUBLIC)" != ""

+default-install: default-install-headers

+default-install-headers:

+	@echo Installing headers to '$(INCLUDE_INSTALL_DIR)'

+	@for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)"

+!endif

+

+!if "$(DISABLE_STANDARD_TARGETS)" == ""

+DISABLE_STANDARD_TARGETS = 0

+!endif

+

+!if "$(DISABLE_TARGET_setup)" == ""

+DISABLE_TARGET_setup = 0

+!endif

+!if "$(DISABLE_TARGET_install)" == ""

+DISABLE_TARGET_install = 0

+!endif

+!if "$(DISABLE_TARGET_clean)" == ""

+DISABLE_TARGET_clean = 0

+!endif

+!if "$(DISABLE_TARGET_test)" == ""

+DISABLE_TARGET_test = 0

+!endif

+!if "$(DISABLE_TARGET_shell)" == ""

+DISABLE_TARGET_shell = 0

+!endif

+

+!if !$(DISABLE_STANDARD_TARGETS)

+!if !$(DISABLE_TARGET_setup)

+setup: default-setup

+!endif

+!if !$(DISABLE_TARGET_install)

+install: default-install

+!endif

+!if !$(DISABLE_TARGET_clean)

+clean: default-clean

+realclean: hose

+hose: default-hose

+distclean: realclean default-distclean

+!endif

+!if !$(DISABLE_TARGET_test)

+test: default-test

+!endif

+!if !$(DISABLE_TARGET_shell)

+shell: default-shell

+!endif

+!endif # DISABLE_STANDARD_TARGETS