# HG changeset patch # User Bram Moolenaar # Date 1591453804 -7200 # Node ID 8b2d3cd55f97c933bcdb698876d22481d536aa0b # Parent 815649381f0f4277b6a2bc04c5501ddfeeaef464 patch 8.2.0914: MS-Windows: cannot specify a "modified by" text Commit: https://github.com/vim/vim/commit/d8df304c59040ef6689a1e4af1dac27ce566909e Author: Bram Moolenaar Date: Sat Jun 6 16:18:46 2020 +0200 patch 8.2.0914: MS-Windows: cannot specify a "modified by" text Problem: MS-Windows: cannot specify a "modified by" text. Solution: Add MODIFIED_BY in the MSVC build file. (Chen Lei, closes https://github.com/vim/vim/issues/1275) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -23,6 +23,8 @@ # # Feature Set: FEATURES=[TINY, SMALL, NORMAL, BIG, HUGE] (default is HUGE) # +# Name to add to the version: MODIFIED_BY=[name of modifier] +# # GUI interface: GUI=yes (default is no) # # GUI with DirectWrite (DirectX): DIRECTX=yes @@ -1245,6 +1247,13 @@ CFLAGS = $(CFLAGS) -DMSWINPS CFLAGS = $(CFLAGS) -DFEAT_$(FEATURES) # +# MODIFIED_BY - Name of who modified a release version +# +!if "$(MODIFIED_BY)" != "" +CFLAGS = $(CFLAGS) -DMODIFIED_BY=\"$(MODIFIED_BY)\" +!endif + +# # Always generate the .pdb file, so that we get debug symbols that can be used # on a crash (doesn't add overhead to the executable). # Generate edit-and-continue debug info when no optimization - allows to @@ -1852,14 +1861,18 @@ CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/inc $(CCCTERM) /Fo$@ libvterm/src/vterm.c -# $CFLAGS may contain backslashes and double quotes, escape them both. +# $CFLAGS may contain backslashes, quotes and chevrons, escape them all. E0_CFLAGS = $(CFLAGS:\=\\) -E_CFLAGS = $(E0_CFLAGS:"=\") +E00_CFLAGS = $(E0_CFLAGS:"=\") # ") stop the string -# $LINKARGS2 may contain backslashes and double quotes, escape them both. +E000_CFLAGS = $(E00_CFLAGS:<=^^<) +E_CFLAGS = $(E000_CFLAGS:>=^^>) +# $LINKARGS2 may contain backslashes, quotes and chevrons, escape them all. E0_LINKARGS2 = $(LINKARGS2:\=\\) -E_LINKARGS2 = $(E0_LINKARGS2:"=\") +E00_LINKARGS2 = $(E0_LINKARGS2:"=\") # ") stop the string +E000_LINKARGS2 = $(E00_LINKARGS2:<=^^<) +E_LINKARGS2 = $(E000_LINKARGS2:>=^^>) $(PATHDEF_SRC): Make_mvc.mak @echo creating $(PATHDEF_SRC) diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 914, +/**/ 913, /**/ 912,