thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.2128: renamed libvterm sources makes merging difficult

Browse Source 
Problem:    Renamed libvterm sources makes merging difficult.
Solution:   Rename back to the original name and only rename the .o files.
            Also clean the libvterm build artifacts. (James McCoy,
            closes #5027)
This commit is contained in:
Bram Moolenaar
2019-10-10 13:22:54 +02:00
parent 14c01f8348
commit 9326805442
8 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Make_cyg_ming.mak
View File

@@ -869,15 +869,15 @@ endif
ifeq ($(TERMINAL),yes)
OBJ += $(OUTDIR)/terminal.o \
$(OUTDIR)/encoding.o \
$(OUTDIR)/keyboard.o \
$(OUTDIR)/termmouse.o \
$(OUTDIR)/parser.o \
$(OUTDIR)/pen.o \
$(OUTDIR)/termscreen.o \
$(OUTDIR)/state.o \
$(OUTDIR)/unicode.o \
$(OUTDIR)/vterm.o
$(OUTDIR)/vterm_encoding.o \
$(OUTDIR)/vterm_keyboard.o \
$(OUTDIR)/vterm_mouse.o \
$(OUTDIR)/vterm_parser.o \
$(OUTDIR)/vterm_pen.o \
$(OUTDIR)/vterm_screen.o \
$(OUTDIR)/vterm_state.o \
$(OUTDIR)/vterm_unicode.o \
$(OUTDIR)/vterm_vterm.o
endif
ifeq ($(SOUND),yes)
@@ -1206,7 +1206,7 @@ CCCTERM = $(CC) -c $(CFLAGS) -Ilibvterm/include -DINLINE="" \
-DWCWIDTH_FUNCTION=utf_uint2cells \
-DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type
$(OUTDIR)/%.o : libvterm/src/%.c $(TERM_DEPS)
$(OUTDIR)/vterm_%.o : libvterm/src/%.c $(TERM_DEPS)
$(CCCTERM) $< -o $@

49
src/Make_mvc.mak
View File

@@ -363,15 +363,15 @@ TERMINAL = no
!if "$(TERMINAL)" == "yes"
TERM_OBJ = \
$(OBJDIR)/terminal.obj \
$(OBJDIR)/encoding.obj \
$(OBJDIR)/keyboard.obj \
$(OBJDIR)/termmouse.obj \
$(OBJDIR)/parser.obj \
$(OBJDIR)/pen.obj \
$(OBJDIR)/termscreen.obj \
$(OBJDIR)/state.obj \
$(OBJDIR)/unicode.obj \
$(OBJDIR)/vterm.obj
$(OBJDIR)/vterm_encoding.obj \
$(OBJDIR)/vterm_keyboard.obj \
$(OBJDIR)/vterm_mouse.obj \
$(OBJDIR)/vterm_parser.obj \
$(OBJDIR)/vterm_pen.obj \
$(OBJDIR)/vterm_screen.obj \
$(OBJDIR)/vterm_state.obj \
$(OBJDIR)/vterm_unicode.obj \
$(OBJDIR)/vterm_vterm.obj
TERM_DEFS = -DFEAT_TERMINAL
TERM_DEPS = \
libvterm/include/vterm.h \
@@ -1743,27 +1743,32 @@ CCCTERM = $(CC) $(CFLAGS) -Ilibvterm/include -DINLINE="" \
-DGET_SPECIAL_PTY_TYPE_FUNCTION=get_special_pty_type \
-D_CRT_SECURE_NO_WARNINGS
# Create a default rule for libvterm.
{libvterm/src/}.c{$(OUTDIR)/}.obj::
$(CCCTERM) -Fo$(OUTDIR)/ $<
$(OUTDIR)/vterm_encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/encoding.obj: $(OUTDIR) libvterm/src/encoding.c $(TERM_DEPS)
$(OUTDIR)/vterm_keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/keyboard.obj: $(OUTDIR) libvterm/src/keyboard.c $(TERM_DEPS)
$(OUTDIR)/vterm_mouse.obj: $(OUTDIR) libvterm/src/mouse.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/termmouse.obj: $(OUTDIR) libvterm/src/termmouse.c $(TERM_DEPS)
$(OUTDIR)/vterm_parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/parser.obj: $(OUTDIR) libvterm/src/parser.c $(TERM_DEPS)
$(OUTDIR)/vterm_pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/pen.obj: $(OUTDIR) libvterm/src/pen.c $(TERM_DEPS)
$(OUTDIR)/vterm_screen.obj: $(OUTDIR) libvterm/src/screen.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/termscreen.obj: $(OUTDIR) libvterm/src/termscreen.c $(TERM_DEPS)
$(OUTDIR)/vterm_state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/state.obj: $(OUTDIR) libvterm/src/state.c $(TERM_DEPS)
$(OUTDIR)/vterm_unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
$(OUTDIR)/unicode.obj: $(OUTDIR) libvterm/src/unicode.c $(TERM_DEPS)
$(OUTDIR)/vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS)
$(OUTDIR)/vterm_vterm.obj: $(OUTDIR) libvterm/src/vterm.c $(TERM_DEPS)
$(CCCTERM) /Fo$@ $<
# $CFLAGS may contain backslashes and double quotes, escape them both.

44
src/Makefile
View File

@@ -2860,6 +2860,7 @@ clean celan: testclean
-rm -f runtime pixmaps
-rm -rf $(APPDIR)
-rm -rf mzscheme_base.c
-rm -rf libvterm/.libs libterm/t/.libs libvterm/src/*.o libvterm/src/*.lo libvterm/t/*.o libvterm/t/*.lo libvterm/t/harness libvterm/libvterm.la
if test -d $(PODIR); then \
cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \
fi
@@ -3453,36 +3454,39 @@ objects/channel.o: channel.c
Makefile:
@echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
# Build rules for libvterm. Putting them here allows for adding compilation
# options specific for Vim. Since the .o files go into objects/ we do need to
# prefix vterm_ to avoid name clashes.
CCCTERM = $(CCC_NF) $(VTERM_CFLAGS) $(ALL_CFLAGS) -DINLINE="" \
-DVSNPRINTF=vim_vsnprintf \
-DIS_COMBINING_FUNCTION=utf_iscomposing_uint \
-DWCWIDTH_FUNCTION=utf_uint2cells
objects/encoding.o: libvterm/src/encoding.c $(TERM_DEPS)
objects/vterm_encoding.o: libvterm/src/encoding.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/encoding.c
objects/keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS)
objects/vterm_keyboard.o: libvterm/src/keyboard.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/keyboard.c
objects/termmouse.o: libvterm/src/termmouse.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/termmouse.c
objects/vterm_mouse.o: libvterm/src/mouse.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/mouse.c
objects/parser.o: libvterm/src/parser.c $(TERM_DEPS)
objects/vterm_parser.o: libvterm/src/parser.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/parser.c
objects/pen.o: libvterm/src/pen.c $(TERM_DEPS)
objects/vterm_pen.o: libvterm/src/pen.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/pen.c
objects/termscreen.o: libvterm/src/termscreen.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/termscreen.c
objects/vterm_screen.o: libvterm/src/screen.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/screen.c
objects/state.o: libvterm/src/state.c $(TERM_DEPS)
objects/vterm_state.o: libvterm/src/state.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/state.c
objects/unicode.o: libvterm/src/unicode.c $(TERM_DEPS)
objects/vterm_unicode.o: libvterm/src/unicode.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/unicode.c
objects/vterm.o: libvterm/src/vterm.c $(TERM_DEPS)
objects/vterm_vterm.o: libvterm/src/vterm.c $(TERM_DEPS)
$(CCCTERM) -o $@ libvterm/src/vterm.c
CCCDIFF = $(CCC_NF) $(ALL_CFLAGS)
@@ -4111,27 +4115,27 @@ objects/channel.o: channel.c vim.h protodef.h auto/config.h feature.h os_unix.h
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h
objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
objects/encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \
objects/vterm_encoding.o: libvterm/src/encoding.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/encoding/DECdrawing.inc libvterm/src/encoding/uk.inc
objects/keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \
objects/vterm_keyboard.o: libvterm/src/keyboard.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/utf8.h
objects/termmouse.o: libvterm/src/termmouse.c libvterm/src/vterm_internal.h \
objects/vterm_mouse.o: libvterm/src/mouse.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/utf8.h
objects/parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \
objects/vterm_parser.o: libvterm/src/parser.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
objects/pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \
objects/vterm_pen.o: libvterm/src/pen.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
objects/state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \
objects/vterm_state.o: libvterm/src/state.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
objects/termscreen.o: libvterm/src/termscreen.c libvterm/src/vterm_internal.h \
objects/vterm_screen.o: libvterm/src/screen.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/rect.h libvterm/src/utf8.h
objects/unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \
objects/vterm_unicode.o: libvterm/src/unicode.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h
objects/vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \
objects/vterm_vterm.o: libvterm/src/vterm.c libvterm/src/vterm_internal.h \
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
libvterm/src/utf8.h
objects/xdiffi.o: xdiff/xdiffi.c xdiff/xinclude.h auto/config.h \

4
src/auto/configure vendored
View File

@@ -7907,9 +7907,9 @@ fi
if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
$as_echo "#define FEAT_TERMINAL 1" >>confdefs.h
TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/termscreen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/creen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
TERM_OBJ="objects/encoding.o objects/keyboard.o objects/termmouse.o objects/parser.o objects/pen.o objects/termscreen.o objects/state.o objects/unicode.o objects/vterm.o"
TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o"
fi

4
src/configure.ac
View File

@@ -2104,9 +2104,9 @@ else
fi
if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
AC_DEFINE(FEAT_TERMINAL)
TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/termscreen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/creen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
AC_SUBST(TERM_SRC)
TERM_OBJ="objects/encoding.o objects/keyboard.o objects/termmouse.o objects/parser.o objects/pen.o objects/termscreen.o objects/state.o objects/unicode.o objects/vterm.o"
TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o"
AC_SUBST(TERM_OBJ)
fi

0
src/libvterm/src/termmouse.c → src/libvterm/src/mouse.c
View File

0
src/libvterm/src/termscreen.c → src/libvterm/src/screen.c
View File

2
src/version.c
View File

@@ -753,6 +753,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2128,
/**/
2127,
/**/