summaryrefslogtreecommitdiffstats
path: root/src/Make_mvc.mak
diff options
context:
space:
mode:
authorichizok <gclient.gaap@gmail.com>2022-01-31 12:27:18 +0000
committerBram Moolenaar <Bram@vim.org>2022-01-31 12:27:18 +0000
commit672776dbe8427876ef4bfce84520712df87b6eb1 (patch)
tree96bd350e3654192104bfa9480fa2056a2e94c40f /src/Make_mvc.mak
parent48a604845e33399893d6bf293e71bcd2a412800d (diff)
patch 8.2.4270: generating nv_cmdidxs.h requires building Vim twicev8.2.4270
Problem: Generating nv_cmdidxs.h requires building Vim twice. Solution: Move the table into a separate file and use a separate executable to extract the command characters. (Ozaki Kiichi, closes #9669)
Diffstat (limited to 'src/Make_mvc.mak')
-rw-r--r--src/Make_mvc.mak16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 7852150563..2725e74370 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1444,17 +1444,17 @@ clean: testclean
# If this fails because you don't have Vim yet, first build and install Vim
# without changes.
cmdidxs: ex_cmds.h
- vim --clean -X --not-a-term -u create_cmdidxs.vim
+ vim --clean -N -X --not-a-term -u create_cmdidxs.vim -c quit
# Run vim script to generate the normal/visual mode command lookup table.
# This only needs to be run when a new normal/visual mode command has been
# added. If this fails because you don't have Vim yet:
-# - change nv_cmds[] in normal.c to add the new normal/visual mode command.
-# - build Vim
-# - run "make nvcmdidxs" using the new Vim to generate nv_cmdidxs.h
-# - rebuild Vim to use the newly generated nv_cmdidxs.h file.
-nvcmdidxs: normal.c
- .\$(VIM) --clean -X --not-a-term -u create_nvcmdidxs.vim
+# - change nv_cmds[] in nv_cmds.h to add the new normal/visual mode command.
+# - run "make nvcmdidxs" to generate nv_cmdidxs.h
+nvcmdidxs: nv_cmds.h
+ $(CC) /nologo -I. -Iproto -DNDEBUG create_nvcmdidxs.c -link -subsystem:$(SUBSYSTEM_TOOLS)
+ vim --clean -N -X --not-a-term -u create_nvcmdidxs.vim -c quit
+ -del create_nvcmdidxs.exe
test:
cd testdir
@@ -1719,7 +1719,7 @@ $(OUTDIR)/netbeans.obj: $(OUTDIR) netbeans.c $(NBDEBUG_SRC) $(INCL) version.h
$(OUTDIR)/channel.obj: $(OUTDIR) channel.c $(INCL)
-$(OUTDIR)/normal.obj: $(OUTDIR) normal.c $(INCL) nv_cmdidxs.h
+$(OUTDIR)/normal.obj: $(OUTDIR) normal.c $(INCL) nv_cmdidxs.h nv_cmds.h
$(OUTDIR)/option.obj: $(OUTDIR) option.c $(INCL) optiondefs.h