To: vim_dev@googlegroups.com Subject: Patch 8.2.0914 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0914 Problem: MS-Windows: cannot specify a "modified by" text. Solution: Add MODIFIED_BY in the MSVC build file. (Chen Lei, closes #1275) Files: src/Make_mvc.mak *** ../vim-8.2.0913/src/Make_mvc.mak 2020-06-01 14:34:22.023462275 +0200 --- src/Make_mvc.mak 2020-06-06 16:17:38.708014681 +0200 *************** *** 23,28 **** --- 23,30 ---- # # 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,1250 **** --- 1247,1259 ---- 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,1865 **** $(CCCTERM) /Fo$@ libvterm/src/vterm.c ! # $CFLAGS may contain backslashes and double quotes, escape them both. E0_CFLAGS = $(CFLAGS:\=\\) ! E_CFLAGS = $(E0_CFLAGS:"=\") # ") stop the string ! # $LINKARGS2 may contain backslashes and double quotes, escape them both. E0_LINKARGS2 = $(LINKARGS2:\=\\) ! E_LINKARGS2 = $(E0_LINKARGS2:"=\") # ") stop the string $(PATHDEF_SRC): Make_mvc.mak @echo creating $(PATHDEF_SRC) --- 1861,1878 ---- $(CCCTERM) /Fo$@ libvterm/src/vterm.c ! # $CFLAGS may contain backslashes, quotes and chevrons, escape them all. E0_CFLAGS = $(CFLAGS:\=\\) ! E00_CFLAGS = $(E0_CFLAGS:"=\") # ") stop the string ! E000_CFLAGS = $(E00_CFLAGS:<=^^<) ! E_CFLAGS = $(E000_CFLAGS:>=^^>) ! # $LINKARGS2 may contain backslashes, quotes and chevrons, escape them all. E0_LINKARGS2 = $(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) *** ../vim-8.2.0913/src/version.c 2020-06-06 15:57:59.087088319 +0200 --- src/version.c 2020-06-06 16:11:52.921040126 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 914, /**/ -- From "know your smileys": (\___/) (+'.'+) Bunny (")_(") /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///