Mercurial > pidgin

changeset 29586:1d6b962dea92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use ExtUtils::ParseXS instead of the xsubpp script to generate C source for XS files on Windows (avoids us needing to know where Perl is installed)
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 12 Mar 2010 22:00:00 +0000
parents 63ef8a27aee5
children ff8e865bf524
files libpurple/plugins/perl/common/Makefile.mingw libpurple/win32/rules.mak pidgin/plugins/perl/common/Makefile.mingw
diffstat 3 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/perl/common/Makefile.mingw	Fri Mar 12 21:10:05 2010 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Fri Mar 12 22:00:00 2010 +0000
@@ -13,7 +13,6 @@
 
 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
-EXTUTILS ?= C:/perl/lib/ExtUtils
 PERL_PLUGIN_TOP := ..
 
 ##
--- a/libpurple/win32/rules.mak	Fri Mar 12 21:10:05 2010 +0000
+++ b/libpurple/win32/rules.mak	Fri Mar 12 22:00:00 2010 +0000
@@ -4,7 +4,7 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<
 
 %.c: %.xs
-	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(PURPLE_PERL_TOP)/common/typemap $< > $@
+	$(PERL) -MExtUtils::ParseXS -e 'ExtUtils::ParseXS::process_file(filename => "$<", output => "$@", typemap => "$(PURPLE_PERL_TOP)/common/typemap");'
 
 %.o: %.rc
 	$(WINDRES) -I$(PURPLE_TOP) -i $< -o $@
--- a/pidgin/plugins/perl/common/Makefile.mingw	Fri Mar 12 21:10:05 2010 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Fri Mar 12 22:00:00 2010 +0000
@@ -12,7 +12,6 @@
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = Pidgin
-EXTUTILS ?= C:/perl/lib/ExtUtils
 
 ##
 ## INCLUDE PATHS