rpms / vim

Clone
Source Code
GIT

Blame 7.3.304

c4 c5 c5-plus c6 c6-plus c7 c7-alt c7-beta c8 c8-beta c8s c9 c9-beta c9s-sig-hyperscale
  1.   80a1b0c0855321c7487451c3b31e41737d14edbb
  2.   7.3.304
Blob History Raw
Karsten Hopp d2a836 
To: vim_dev@googlegroups.com
Karsten Hopp d2a836 
Subject: Patch 7.3.304
Karsten Hopp d2a836 
Fcc: outbox
Karsten Hopp d2a836 
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp d2a836 
Mime-Version: 1.0
Karsten Hopp d2a836 
Content-Type: text/plain; charset=UTF-8
Karsten Hopp d2a836 
Content-Transfer-Encoding: 8bit
Karsten Hopp d2a836 
------------
Karsten Hopp d2a836
Karsten Hopp d2a836 
Patch 7.3.304
Karsten Hopp d2a836 
Problem:    Strawberry Perl doesn't work on MS-Windows.
Karsten Hopp d2a836 
Solution:   Use xsubpp if needed. (Yasuhiro Matsumoto)
Karsten Hopp d2a836 
Files:	    src/Make_ming.mak, src/Make_mvc.mak
Karsten Hopp d2a836
Karsten Hopp d2a836
Karsten Hopp d2a836 
*** ../vim-7.3.303/src/Make_ming.mak	2011-06-19 01:30:01.000000000 +0200
Karsten Hopp d2a836 
--- src/Make_ming.mak	2011-09-14 10:44:55.000000000 +0200
Karsten Hopp d2a836 
***************
Karsten Hopp d2a836 
*** 108,113 ****
Karsten Hopp d2a836 
--- 108,120 ----
Karsten Hopp d2a836 
  # on NT, it's here:
Karsten Hopp d2a836 
  PERLLIB=$(PERL)/lib
Karsten Hopp d2a836 
  PERLLIBS=$(PERLLIB)/Core
Karsten Hopp d2a836 
+ XSUBPP=$(PERLLIB)/ExtUtils/xsubpp
Karsten Hopp d2a836 
+ XSUBPP_EXISTS=$(shell perl -e "print 1 unless -e '$(XSUBPP)'")
Karsten Hopp d2a836 
+ ifeq "$(XSUBPP_EXISTS)" ""
Karsten Hopp d2a836 
+ XSUBPP=perl $(XSUBPP)
Karsten Hopp d2a836 
+ else
Karsten Hopp d2a836 
+ XSUBPP=xsubpp
Karsten Hopp d2a836 
+ endif
Karsten Hopp d2a836 
  endif
Karsten Hopp d2a836
Karsten Hopp d2a836 
  # uncomment 'LUA' if you want a Lua-enabled version
Karsten Hopp d2a836 
***************
Karsten Hopp d2a836 
*** 696,702 ****
Karsten Hopp d2a836 
  endif
Karsten Hopp d2a836
Karsten Hopp d2a836 
  if_perl.c: if_perl.xs typemap
Karsten Hopp d2a836 
! 	perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
Karsten Hopp d2a836 
  	     $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
Karsten Hopp d2a836
Karsten Hopp d2a836 
  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
Karsten Hopp d2a836 
--- 703,709 ----
Karsten Hopp d2a836 
  endif
Karsten Hopp d2a836
Karsten Hopp d2a836 
  if_perl.c: if_perl.xs typemap
Karsten Hopp d2a836 
! 	$(XSUBPP) -prototypes -typemap \
Karsten Hopp d2a836 
  	     $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
Karsten Hopp d2a836
Karsten Hopp d2a836 
  $(OUTDIR)/netbeans.o:	netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC)
Karsten Hopp d2a836 
*** ../vim-7.3.303/src/Make_mvc.mak	2011-06-12 20:31:25.000000000 +0200
Karsten Hopp d2a836 
--- src/Make_mvc.mak	2011-09-14 10:46:08.000000000 +0200
Karsten Hopp d2a836 
***************
Karsten Hopp d2a836 
*** 785,790 ****
Karsten Hopp d2a836 
--- 785,795 ----
Karsten Hopp d2a836 
  PERL_INC = /I $(PERL_INCDIR)
Karsten Hopp d2a836 
  PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
Karsten Hopp d2a836 
  XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
Karsten Hopp d2a836 
+ !if exist($(XSUBPP)
Karsten Hopp d2a836 
+ XSUBPP = $(PERL_EXE) $(XSUBPP)
Karsten Hopp d2a836 
+ !else
Karsten Hopp d2a836 
+ XSUBPP = xsubpp
Karsten Hopp d2a836 
+ !endif
Karsten Hopp d2a836 
  XSUBPP_TYPEMAP = $(PERL)\lib\ExtUtils\typemap
Karsten Hopp d2a836
Karsten Hopp d2a836 
  !endif
Karsten Hopp d2a836 
***************
Karsten Hopp d2a836 
*** 1041,1047 ****
Karsten Hopp d2a836 
  	$(CC) $(CFLAGS) $(LUA_INC) if_lua.c
Karsten Hopp d2a836
Karsten Hopp d2a836 
  if_perl.c : if_perl.xs typemap
Karsten Hopp d2a836 
! 	$(PERL_EXE) $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \
Karsten Hopp d2a836 
  		-typemap typemap if_perl.xs > if_perl.c
Karsten Hopp d2a836
Karsten Hopp d2a836 
  $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c  $(INCL)
Karsten Hopp d2a836 
--- 1046,1052 ----
Karsten Hopp d2a836 
  	$(CC) $(CFLAGS) $(LUA_INC) if_lua.c
Karsten Hopp d2a836
Karsten Hopp d2a836 
  if_perl.c : if_perl.xs typemap
Karsten Hopp d2a836 
! 	$(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \
Karsten Hopp d2a836 
  		-typemap typemap if_perl.xs > if_perl.c
Karsten Hopp d2a836
Karsten Hopp d2a836 
  $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c  $(INCL)
Karsten Hopp d2a836 
*** ../vim-7.3.303/src/version.c	2011-09-08 23:24:09.000000000 +0200
Karsten Hopp d2a836 
--- src/version.c	2011-09-14 10:47:41.000000000 +0200
Karsten Hopp d2a836 
***************
Karsten Hopp d2a836 
*** 711,712 ****
Karsten Hopp d2a836 
--- 711,714 ----
Karsten Hopp d2a836 
  {   /* Add new patch number below this line */
Karsten Hopp d2a836 
+ /**/
Karsten Hopp d2a836 
+     304,
Karsten Hopp d2a836 
  /**/
Karsten Hopp d2a836
Karsten Hopp d2a836 
--
Karsten Hopp d2a836 
It's totally unfair to suggest - as many have - that engineers are socially
Karsten Hopp d2a836 
inept.  Engineers simply have different objectives when it comes to social
Karsten Hopp d2a836 
interaction.
Karsten Hopp d2a836 
				(Scott Adams - The Dilbert principle)
Karsten Hopp d2a836
Karsten Hopp d2a836 
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp d2a836 
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp d2a836 
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp d2a836 
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Powered by Pagure 5.14.1

SSH Hostkey/Fingerprint | Documentation