Mercurial > vim

changeset 35806:3835b742025e v9.1.0623

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0623: Mingw: errors when trying to delete non-existing files Commit: https://github.com/vim/vim/commit/325420ebe459e7f67b959ce189269b0e8ca9dc12 Author: Ken Takata <kentkt@csc.jp> Date: Fri Jul 26 19:02:11 2024 +0200 patch 9.1.0623: Mingw: errors when trying to delete non-existing files Problem: Mingw: warnings when trying to delete non-existing files Solution: Use "rm -f" instead of "rm" to suppress errors for non-existing files (Ken Takata) closes: #15350 Signed-off-by: Ken Takata <kentkt@csc.jp> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Fri, 26 Jul 2024 19:15:03 +0200
parents 34d7f08bad01
children fb7d911ae9b9
files src/GvimExt/Make_ming.mak src/Make_cyg_ming.mak src/version.c src/xxd/Make_ming.mak
diffstat 4 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/GvimExt/Make_ming.mak
+++ b/src/GvimExt/Make_ming.mak
@@ -29,7 +29,7 @@ LDFLAGS += -static-libgcc -static-libstd
 endif
 
 ifeq ($(CROSS),yes)
-DEL = rm
+DEL = rm -f
 ifeq ($(MINGWOLD),yes)
 CXXFLAGS := -O2 -fvtable-thunks
 else
@@ -38,7 +38,7 @@ endif
 else
 CXXFLAGS := -O2
 ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
 else
 DEL = del
 endif
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -184,7 +184,7 @@ ifeq ($(CROSS),yes)
  ifndef CROSS_COMPILE
 CROSS_COMPILE = i586-pc-mingw32msvc-
  endif
-DEL = rm
+DEL = rm -f
 MKDIR = mkdir -p
 DIRSLASH = /
 else
@@ -212,7 +212,7 @@ CROSS_COMPILE =
 # In this case, unix-like commands can be used.
 #
  ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
 MKDIR = mkdir -p
 DIRSLASH = /
  else
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    623,
+/**/
     622,
 /**/
     621,
--- a/src/xxd/Make_ming.mak
+++ b/src/xxd/Make_ming.mak
@@ -16,7 +16,7 @@ CC = gcc
 CFLAGS = -O2 -Wall -DWIN32 $(DEFINES)
 
 ifneq (sh.exe, $(SHELL))
-DEL = rm
+DEL = rm -f
 else
 DEL = del
 endif