pidgin: 997227c2: Use ExtUtils::ParseXS instead of the xsu...

datallah at pidgin.im datallah at pidgin.im
Fri Mar 12 17:05:49 EST 2010


-----------------------------------------------------------------
Revision: 997227c2f1377349ccdaa38e45303d06bb893fdf
Ancestor: b53d0e5b76d91b4f4a38218131d4398b6be9d4e8
Author: datallah at pidgin.im
Date: 2010-03-12T22:00:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/997227c2f1377349ccdaa38e45303d06bb893fdf

Modified files:
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/win32/rules.mak
        pidgin/plugins/perl/common/Makefile.mingw

ChangeLog: 

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)

-------------- next part --------------
============================================================
--- libpurple/plugins/perl/common/Makefile.mingw	459d052ff8711a4d76ced257b51a6985336fb57a
+++ libpurple/plugins/perl/common/Makefile.mingw	944f1ff5bc280f5effb2916a1049e1fd4023d653
@@ -13,7 +13,6 @@ AUTOSPLIT = lib/auto/Purple/autosplit.ix
 
 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
-EXTUTILS ?= C:/perl/lib/ExtUtils
 PERL_PLUGIN_TOP := ..
 
 ##
============================================================
--- libpurple/win32/rules.mak	f9869497a15873472135a0670dc257546907071a
+++ libpurple/win32/rules.mak	530dbbf1480cd14cad98759721eb858384f47654
@@ -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 $@
============================================================
--- pidgin/plugins/perl/common/Makefile.mingw	2ea5e5d54d85b6ce17bda6fa5729a15c4b269c23
+++ pidgin/plugins/perl/common/Makefile.mingw	533cfd1227c6cf47fd02a20df0386da77ad10b58
@@ -12,7 +12,6 @@ TARGET = Pidgin
 DEFINES := $(subst -DWIN32_LEAN_AND_MEAN,,$(DEFINES))
 
 TARGET = Pidgin
-EXTUTILS ?= C:/perl/lib/ExtUtils
 
 ##
 ## INCLUDE PATHS


More information about the Commits mailing list