Skip to content

Commit f6d49a7

Browse files
bryphebryphe
authored
Remove FEAT_PERL (#30)
1 parent dc4f4f0 commit f6d49a7

File tree

16 files changed

+3
-2506
lines changed

16 files changed

+3
-2506
lines changed

‎src/Make_cyg_ming.mak

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -211,39 +211,6 @@ ifndef ARCH
211211
ARCH := $(shell $(CC) -dumpmachine | sed -e 's/-.*//' -e 's/_/-/' -e 's/^mingw32$$/i686/')
212212
endif
213213

214-
215-
# Perl interface:
216-
# PERL=[Path to Perl directory] (Set inside Make_cyg.mak or Make_ming.mak)
217-
# DYNAMIC_PERL=yes (to load the Perl DLL dynamically)
218-
# PERL_VER=[Perl version, eg 56, 58, 510] (default is 524)
219-
ifdef PERL
220-
ifndef PERL_VER
221-
PERL_VER=524
222-
endif
223-
ifndef DYNAMIC_PERL
224-
DYNAMIC_PERL=yes
225-
endif
226-
# on Linux, for cross-compile, it's here:
227-
#PERLLIB=/home/ron/ActivePerl/lib
228-
# on NT, it's here:
229-
PERLEXE=$(PERL)/bin/perl
230-
PERLLIB=$(PERL)/lib
231-
PERLLIBS=$(PERLLIB)/Core
232-
ifeq ($(UNDER_CYGWIN),yes)
233-
PERLTYPEMAP:=$(shell cygpath -m $(PERLLIB)/ExtUtils/typemap)
234-
XSUBPPTRY:=$(shell cygpath -m $(PERLLIB)/ExtUtils/xsubpp)
235-
else
236-
PERLTYPEMAP=$(PERLLIB)/ExtUtils/typemap
237-
XSUBPPTRY=$(PERLLIB)/ExtUtils/xsubpp
238-
endif
239-
XSUBPP_EXISTS=$(shell $(PERLEXE) -e "print 1 unless -e '$(XSUBPPTRY)'")
240-
ifeq "$(XSUBPP_EXISTS)" ""
241-
XSUBPP=$(PERLEXE) $(XSUBPPTRY)
242-
else
243-
XSUBPP=xsubpp
244-
endif
245-
endif
246-
247214
# Lua interface:
248215
# LUA=[Path to Lua directory] (Set inside Make_cyg.mak or Make_ming.mak)
249216
# LUA_LIBDIR=[Path to Lua library directory] (default: $LUA/lib)
@@ -491,14 +458,6 @@ DEFINES += -DGETTEXT_DYNAMIC -DGETTEXT_DLL=\"$(GETTEXT_DYNAMIC)\"
491458
endif
492459
endif
493460

494-
ifdef PERL
495-
CFLAGS += -I$(PERLLIBS) -DFEAT_PERL -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS
496-
ifeq (yes, $(DYNAMIC_PERL))
497-
CFLAGS += -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\"
498-
EXTRA_LIBS += -L$(PERLLIBS) -lperl$(PERL_VER)
499-
endif
500-
endif
501-
502461
ifdef LUA
503462
LUA_INCDIR = $(LUA)/include
504463
CFLAGS += -I$(LUA_INCDIR) -I$(LUA) -DFEAT_LUA
@@ -683,9 +642,6 @@ else
683642
# OBJ += $(OUTDIR)/os_w32exe.o $(OUTDIR)/vimrc.o
684643
endif
685644

686-
ifdef PERL
687-
OBJ += $(OUTDIR)/if_perl.o
688-
endif
689645
ifdef LUA
690646
OBJ += $(OUTDIR)/if_lua.o
691647
endif
@@ -807,12 +763,6 @@ LIB += -L$(GETTEXTLIB) -lintl
807763
endif
808764
endif
809765

810-
ifdef PERL
811-
ifeq (no, $(DYNAMIC_PERL))
812-
LIB += -L$(PERLLIBS) -lperl$(PERL_VER)
813-
endif
814-
endif
815-
816766
ifeq (yes, $(OLE))
817767
LIB += -loleaut32
818768
OBJ += $(OUTDIR)/if_ole.o
@@ -935,10 +885,6 @@ clean:
935885
-rmdir $(OUTDIR)
936886
-$(DEL) $(MAIN_TARGET) vimrun.exe
937887
-$(DEL) pathdef.c
938-
ifdef PERL
939-
-$(DEL) if_perl.c
940-
-$(DEL) auto$(DIRSLASH)if_perl.c
941-
endif
942888
ifdef MZSCHEME
943889
-$(DEL) mzscheme_base.c
944890
endif
@@ -1015,14 +961,6 @@ mzscheme_base.c:
1015961
$(OUTDIR)/if_ole.o: if_ole.cpp $(INCL) if_ole.h
1016962
$(CC) -c $(CFLAGS) $(CXXFLAGS) if_ole.cpp -o $@
1017963

1018-
auto/if_perl.c: if_perl.xs typemap
1019-
$(XSUBPP) -prototypes -typemap \
1020-
$(PERLTYPEMAP) if_perl.xs -output $@
1021-
1022-
$(OUTDIR)/if_perl.o: auto/if_perl.c $(INCL)
1023-
$(CC) -c $(CFLAGS) auto/if_perl.c -o $@
1024-
1025-
1026964
$(OUTDIR)/if_ruby.o: if_ruby.c $(INCL)
1027965
ifeq (16, $(RUBY))
1028966
$(CC) $(CFLAGS) -U_WIN32 -c -o $@ if_ruby.c

‎src/Makefile

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ SRC = $(BASIC_SRC) \
15111511
$(TCL_SRC) \
15121512
$(RUBY_SRC)
15131513

1514-
EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
1514+
EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c \
15151515
if_python.c if_python3.c if_ruby.c \
15161516
channel.c \
15171517
$(GRESOURCE_SRC)
@@ -1920,11 +1920,6 @@ os_beos.pro: os_beos.c
19201920
$(CPROTO) -D__BEOS__ -UHAVE_CONFIG_H $< > proto/$@
19211921
echo "/* vim: set ft=c : */" >> proto/$@
19221922

1923-
# if_perl.pro is special: Use the generated if_perl.c for input and remove
1924-
# prototypes for local functions.
1925-
if_perl.pro: auto/if_perl.c
1926-
$(CPROTO) -DFEAT_GUI auto/if_perl.c | sed "/_VI/d" > proto/$@
1927-
19281923
gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
19291924
$(CPROTO) -DFEAT_GUI $< > proto/$@
19301925
echo "/* vim: set ft=c : */" >> proto/$@
@@ -2626,7 +2621,7 @@ uninstall_runtime:
26262621
clean celan: testclean
26272622
-rm -f *.o core $(VIMTARGET).core $(VIMTARGET) vim xxd/*.o
26282623
-rm -rf objects
2629-
-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c auto/gui_gtk_gresources.c auto/gui_gtk_gresources.h
2624+
-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c
26302625
-rm -f conftest* *~ auto/link.sed
26312626
-rm -f testdir/opt_test.vim
26322627
-rm -f $(UNITTEST_TARGETS)
@@ -2738,11 +2733,6 @@ lint:
27382733
.c.o:
27392734
$(CCC) $<
27402735

2741-
auto/if_perl.c: if_perl.xs
2742-
$(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
2743-
$(PERL) $(PERL_XSUBPP) -prototypes -typemap \
2744-
$(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
2745-
27462736
auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
27472737
CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
27482738

@@ -2865,12 +2855,6 @@ objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA)
28652855
mzscheme_base.c:
28662856
$(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base
28672857

2868-
objects/if_perl.o: auto/if_perl.c
2869-
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ auto/if_perl.c
2870-
2871-
objects/if_perlsfio.o: if_perlsfio.c
2872-
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ if_perlsfio.c
2873-
28742858
objects/if_python.o: if_python.c if_py_both.h
28752859
$(CCC_NF) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) $(ALL_CFLAGS) -o $@ if_python.c
28762860

@@ -3453,14 +3437,6 @@ objects/if_mzsch.o: if_mzsch.c vim.h protodef.h auto/config.h feature.h os_unix.
34533437
auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
34543438
structs.h regexp.h alloc.h ex_cmds.h \
34553439
proto.h globals.h if_mzsch.h
3456-
objects/if_perl.o: auto/if_perl.c vim.h protodef.h auto/config.h feature.h \
3457-
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
3458-
structs.h regexp.h alloc.h ex_cmds.h \
3459-
proto.h globals.h
3460-
objects/if_perlsfio.o: if_perlsfio.c vim.h protodef.h auto/config.h feature.h \
3461-
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
3462-
structs.h regexp.h alloc.h ex_cmds.h \
3463-
proto.h globals.h
34643440
objects/if_python.o: if_python.c vim.h protodef.h auto/config.h feature.h \
34653441
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h \
34663442
structs.h regexp.h alloc.h ex_cmds.h \

‎src/buffer.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -839,9 +839,6 @@ free_buffer(buf_T *buf)
839839
#ifdef FEAT_MZSCHEME
840840
mzscheme_buffer_free(buf);
841841
#endif
842-
#ifdef FEAT_PERL
843-
perl_buf_free(buf);
844-
#endif
845842
#ifdef FEAT_PYTHON
846843
python_buffer_free(buf);
847844
#endif

‎src/evalfunc.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,6 @@ static void f_nextnonblank(typval_T *argvars, typval_T *rettv);
293293
static void f_nr2char(typval_T *argvars, typval_T *rettv);
294294
static void f_or(typval_T *argvars, typval_T *rettv);
295295
static void f_pathshorten(typval_T *argvars, typval_T *rettv);
296-
#ifdef FEAT_PERL
297-
static void f_perleval(typval_T *argvars, typval_T *rettv);
298-
#endif
299296
#ifdef FEAT_FLOAT
300297
static void f_pow(typval_T *argvars, typval_T *rettv);
301298
#endif
@@ -791,9 +788,6 @@ static struct fst
791788
{"nr2char", 1, 2, f_nr2char},
792789
{"or", 2, 2, f_or},
793790
{"pathshorten", 1, 1, f_pathshorten},
794-
#ifdef FEAT_PERL
795-
{"perleval", 1, 1, f_perleval},
796-
#endif
797791
#ifdef FEAT_TEXT_PROP
798792
{"popup_atcursor", 2, 2, f_popup_atcursor},
799793
{"popup_close", 1, 2, f_popup_close},
@@ -6572,11 +6566,6 @@ f_has(typval_T *argvars, typval_T *rettv)
65726566
#ifdef FEAT_PATH_EXTRA
65736567
"path_extra",
65746568
#endif
6575-
#ifdef FEAT_PERL
6576-
#ifndef DYNAMIC_PERL
6577-
"perl",
6578-
#endif
6579-
#endif
65806569
#ifdef FEAT_PERSISTENT_UNDO
65816570
"persistent_undo",
65826571
#endif
@@ -8937,21 +8926,6 @@ f_pathshorten(typval_T *argvars, typval_T *rettv)
89378926
}
89388927
}
89398928

8940-
#ifdef FEAT_PERL
8941-
/*
8942-
* "perleval()" function
8943-
*/
8944-
static void
8945-
f_perleval(typval_T *argvars, typval_T *rettv)
8946-
{
8947-
char_u *str;
8948-
char_u buf[NUMBUFLEN];
8949-
8950-
str = tv_get_string_buf(&argvars[0], buf);
8951-
do_perleval(str, rettv);
8952-
}
8953-
#endif
8954-
89558929
#ifdef FEAT_FLOAT
89568930
/*
89578931
* "pow()" function

‎src/ex_docmd.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ static int getargopt(exarg_T *eap);
7474

7575
static linenr_T get_address(exarg_T *, char_u **, cmd_addr_T addr_type, int skip, int silent, int to_other_file, int address_count);
7676
static void get_flags(exarg_T *eap);
77-
#if !defined(FEAT_PERL) \
78-
|| !defined(FEAT_PYTHON) || !defined(FEAT_PYTHON3) \
77+
#if !defined(FEAT_PYTHON) || !defined(FEAT_PYTHON3) \
7978
|| !defined(FEAT_RUBY) \
8079
|| !defined(FEAT_LUA) \
8180
|| !defined(FEAT_MZSCHEME)
@@ -177,10 +176,8 @@ static void ex_nogui(exarg_T *eap);
177176
# define ex_mzscheme ex_script_ni
178177
# define ex_mzfile ex_ni
179178
#endif
180-
#ifndef FEAT_PERL
181179
# define ex_perl ex_script_ni
182180
# define ex_perldo ex_ni
183-
#endif
184181
#ifndef FEAT_PYTHON
185182
# define ex_python ex_script_ni
186183
# define ex_pydo ex_ni

0 commit comments

Comments
 (0)