projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 59ab3540 AM |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.304 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.304 | |
| 11 | Problem: Strawberry Perl doesn't work on MS-Windows. | |
| 12 | Solution: Use xsubpp if needed. (Yasuhiro Matsumoto) | |
| 13 | Files: src/Make_ming.mak, src/Make_mvc.mak | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.303/src/Make_ming.mak 2011-06-19 01:30:01.000000000 +0200 | |
| 17 | --- src/Make_ming.mak 2011-09-14 10:44:55.000000000 +0200 | |
| 18 | *************** | |
| 19 | *** 108,113 **** | |
| 20 | --- 108,120 ---- | |
| 21 | # on NT, it's here: | |
| 22 | PERLLIB=$(PERL)/lib | |
| 23 | PERLLIBS=$(PERLLIB)/Core | |
| 24 | + XSUBPP=$(PERLLIB)/ExtUtils/xsubpp | |
| 25 | + XSUBPP_EXISTS=$(shell perl -e "print 1 unless -e '$(XSUBPP)'") | |
| 26 | + ifeq "$(XSUBPP_EXISTS)" "" | |
| 27 | + XSUBPP=perl $(XSUBPP) | |
| 28 | + else | |
| 29 | + XSUBPP=xsubpp | |
| 30 | + endif | |
| 31 | endif | |
| 32 | ||
| 33 | # uncomment 'LUA' if you want a Lua-enabled version | |
| 34 | *************** | |
| 35 | *** 696,702 **** | |
| 36 | endif | |
| 37 | ||
| 38 | if_perl.c: if_perl.xs typemap | |
| 39 | ! perl $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \ | |
| 40 | $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@ | |
| 41 | ||
| 42 | $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) | |
| 43 | --- 703,709 ---- | |
| 44 | endif | |
| 45 | ||
| 46 | if_perl.c: if_perl.xs typemap | |
| 47 | ! $(XSUBPP) -prototypes -typemap \ | |
| 48 | $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@ | |
| 49 | ||
| 50 | $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) | |
| 51 | *** ../vim-7.3.303/src/Make_mvc.mak 2011-06-12 20:31:25.000000000 +0200 | |
| 52 | --- src/Make_mvc.mak 2011-09-14 10:46:08.000000000 +0200 | |
| 53 | *************** | |
| 54 | *** 785,790 **** | |
| 55 | --- 785,795 ---- | |
| 56 | PERL_INC = /I $(PERL_INCDIR) | |
| 57 | PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj | |
| 58 | XSUBPP = $(PERL)\lib\ExtUtils\xsubpp | |
| 59 | + !if exist($(XSUBPP) | |
| 60 | + XSUBPP = $(PERL_EXE) $(XSUBPP) | |
| 61 | + !else | |
| 62 | + XSUBPP = xsubpp | |
| 63 | + !endif | |
| 64 | XSUBPP_TYPEMAP = $(PERL)\lib\ExtUtils\typemap | |
| 65 | ||
| 66 | !endif | |
| 67 | *************** | |
| 68 | *** 1041,1047 **** | |
| 69 | $(CC) $(CFLAGS) $(LUA_INC) if_lua.c | |
| 70 | ||
| 71 | if_perl.c : if_perl.xs typemap | |
| 72 | ! $(PERL_EXE) $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \ | |
| 73 | -typemap typemap if_perl.xs > if_perl.c | |
| 74 | ||
| 75 | $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL) | |
| 76 | --- 1046,1052 ---- | |
| 77 | $(CC) $(CFLAGS) $(LUA_INC) if_lua.c | |
| 78 | ||
| 79 | if_perl.c : if_perl.xs typemap | |
| 80 | ! $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \ | |
| 81 | -typemap typemap if_perl.xs > if_perl.c | |
| 82 | ||
| 83 | $(OUTDIR)/if_perl.obj: $(OUTDIR) if_perl.c $(INCL) | |
| 84 | *** ../vim-7.3.303/src/version.c 2011-09-08 23:24:09.000000000 +0200 | |
| 85 | --- src/version.c 2011-09-14 10:47:41.000000000 +0200 | |
| 86 | *************** | |
| 87 | *** 711,712 **** | |
| 88 | --- 711,714 ---- | |
| 89 | { /* Add new patch number below this line */ | |
| 90 | + /**/ | |
| 91 | + 304, | |
| 92 | /**/ | |
| 93 | ||
| 94 | -- | |
| 95 | It's totally unfair to suggest - as many have - that engineers are socially | |
| 96 | inept. Engineers simply have different objectives when it comes to social | |
| 97 | interaction. | |
| 98 | (Scott Adams - The Dilbert principle) | |
| 99 | ||
| 100 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 101 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 102 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 103 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |