From bee19c22d569e54513a9c591441c7f411811dc81 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 04:10:58 +0200 Subject: Adding upstream version 2:9.1.0374. Signed-off-by: Daniel Baumann --- runtime/doc/Make_mvc.mak | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'runtime/doc/Make_mvc.mak') diff --git a/runtime/doc/Make_mvc.mak b/runtime/doc/Make_mvc.mak index 850d86b..f2fbc52 100644 --- a/runtime/doc/Make_mvc.mak +++ b/runtime/doc/Make_mvc.mak @@ -1,7 +1,7 @@ # # Makefile for the Vim documentation on Windows # -# 17.11.23, Restorer, +# 20.03.24, Restorer, # Common components !INCLUDE Make_all.mak @@ -23,7 +23,7 @@ ICONV_PATH = D:\Programs\GetText\bin # If the "touch" program is installed on the system, but it is not registered # in the %PATH% environment variable, then specify the full path to this file. !IF EXIST ("touch.exe") -TOUCH = "touch.exe" %1 +TOUCH = touch.exe %1 !ELSE TOUCH = if exist %1 ( copy /b %1+,, ) else ( type nul >%1 ) !ENDIF @@ -33,7 +33,7 @@ TOUCH = if exist %1 ( copy /b %1+,, ) else ( type nul >%1 ) # If the "iconv" program is installed on the system, but it is not registered # in the %PATH% environment variable, then specify the full path to this file. !IF EXIST ("iconv.exe") -ICONV = "iconv.exe" +ICONV = iconv.exe !ELSEIF EXIST ("$(ICONV_PATH)\iconv.exe") ICONV = "$(ICONV_PATH)\iconv.exe" !ENDIF @@ -53,8 +53,8 @@ all : tags perlhtml $(CONVERTED) tags : doctags $(DOCS) doctags.exe $(DOCS) | sort /L C /O tags $(PS) $(PSFLAGS) \ - (Get-Content -Raw tags ^| Get-Unique ^| %%{$$_ -replace \"`r\", \"\"})\ - ^| New-Item -Force -Path . -ItemType file -Name tags + (Get-Content -Raw tags ^| Get-Unique ^| %%{$$_ -replace \"`r\", \"\"}) \ + ^| New-Item -Path . -Force -ItemType file -Name tags doctags : doctags.c $(CC) doctags.c @@ -67,13 +67,12 @@ vimtags : $(DOCS) uganda.nsis.txt : uganda.??? - !@$(PS) $(PSFLAGS) $$ext=(Get-Item $?).Extension; (Get-Content $? ^| \ - %%{$$_ -replace '\s*\*[-a-zA-Z0-9.]*\*', '' -replace 'vim:tw=78:.*', ''})\ - ^| Set-Content $*$$ext - !@$(PS) $(PSFLAGS) $$ext=(Get-Item $?).Extension; \ - (Get-Content -Raw $(@B)$$ext).Trim() -replace '(\r\n){3,}', '$$1$$1' \ - ^| Set-Content $(@B)$$ext - + ! $(PS) $(PSFLAGS) (Get-Content $? -Encoding UTF8 \ + ^| %%{$$_ -replace '[\t\s]*\*.*\*', '' -replace 'vim:tw=\d\d:.*', ''}) \ + ^| Set-Content \"$(@B)$$((Get-Item $?).Extension)\" -Encoding Unicode + ! $(PS) $(PSFLAGS)\ + (Get-Content $(@B)$$((Get-Item $?).Extension) -Raw).Trim() -replace '(\r\n){3,}', '$$1$$1' \ + ^| Set-Content \"$(@B)$$((Get-Item $?).Extension)\" -Encoding Unicode # TODO: #html: noerrors tags $(HTMLS) -- cgit v1.2.3