Suggested follow-on to patches 474 and 478 (if_perl)

31 views
Skip to first unread message

Michael Soyka

unread,
Oct 15, 2018, 6:05:57 PM10/15/18
to vim...@googlegroups.com
Since patch 474 places if_perl.c in "auto", the following patch is
suggested.  I can't test the Visual C changes but it looks like it
should work.


diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index e213b803d..05725e988 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -972,7 +972,10 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp
GvimExt/gvimext.rc GvimExt/gvimext.h
        $(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS)
CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)'
STATIC_STDCPLUS=$(STATIC_STDCPLUS)

 tags: notags
-       $(CTAGS) *.c *.cpp *.h if_perl.xs
+       $(CTAGS) *.c *.cpp *.h
+ifdef PERL
+       $(CTAGS) --append=yes auto$(DIRSLASH)if_perl.c
+endif

 notags:
        -$(DEL) tags
@@ -984,7 +987,6 @@ clean:
        -$(DEL) *.exe
        -$(DEL) pathdef.c
 ifdef PERL
-       -$(DEL) if_perl.c
        -$(DEL) auto$(DIRSLASH)if_perl.c
 endif
 ifdef MZSCHEME


diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 89b1d1624..8e228d398 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1269,7 +1269,8 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp
GvimExt/gvimext.rc GvimExt/gvimext.h


 tags: notags
-       $(CTAGS) *.c *.cpp *.h if_perl.xs
+       $(CTAGS) *.c *.cpp *.h
+       if exist auto\if_perl.c $(CTAGS) --append=yes auto\if_perl.c

 notags:
        - if exist tags del tags
@@ -1285,7 +1286,6 @@ clean:
        - if exist vimrun.exe del vimrun.exe
        - if exist install.exe del install.exe
        - if exist uninstal.exe del uninstal.exe
-       - if exist if_perl.c del if_perl.c
        - if exist auto\if_perl.c del auto\if_perl.c
        - if exist dimm.h del dimm.h
        - if exist dimm_i.c del dimm_i.c


-mike

Ken Takata

unread,
Oct 15, 2018, 6:43:57 PM10/15/18
to vim_dev
Hi,
I keep the following lines intentionally:

Make_cyg_ming.mak:
> - -$(DEL) if_perl.c

Make_mvc.mak:
> - - if exist if_perl.c del if_perl.c

If someone build Vim before 8.1.0474, then update the source to 8.1.0474 or
later without run make clean, src/if_perl.c won't be deleted.

I'm not sure whether adding auto/if_perl.c to the tags is the right thing.
Need to keep discussion in https://github.com/vim/vim/issues/3526 .

Regards,
Ken Takata

Bram Moolenaar

unread,
Oct 16, 2018, 4:13:26 PM10/16/18
to vim...@googlegroups.com, Michael Soyka

Michael Soyka wrote:

> Since patch 474 places if_perl.c in "auto", the following patch is
> suggested.  I can't test the Visual C changes but it looks like it
> should work.

Yeah, that makes sense.

Deleting src/if_perl.c still makes sense for a while, it may still exist
when updating to newer version.


--
How do I set the laser printer to stun?

/// Bram Moolenaar -- Br...@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 ///
Reply all
Reply to author
Forward
0 new messages