patch 8.2.4270: generating nv_cmdidxs.h requires building Vim twice
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)
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 46e95b4..ab71b26 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1145,17 +1145,17 @@
# 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
- ./$(TARGET) --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) $(CFLAGS) -o create_nvcmdidxs.exe create_nvcmdidxs.c $(LIB)
+ vim --clean -N -X --not-a-term -u create_nvcmdidxs.vim -c quit
+ -$(DEL) create_nvcmdidxs.exe
###########################################################################
INCL = vim.h alloc.h ascii.h ex_cmds.h feature.h errors.h globals.h \
@@ -1219,7 +1219,7 @@
$(OUTDIR)/misc1.o: misc1.c $(INCL) version.h
-$(OUTDIR)/normal.o: normal.c $(INCL) nv_cmdidxs.h
+$(OUTDIR)/normal.o: normal.c $(INCL) nv_cmdidxs.h nv_cmds.h
$(OUTDIR)/netbeans.o: netbeans.c $(INCL) version.h