r21676 - in /trunk/libextutils-parsexs-perl: Changes META.yml debian/changelog debian/control debian/copyright debian/rules lib/ExtUtils/ParseXS.pm t/XSTest.pm t/XSTest.xs

yvesago-guest at users.alioth.debian.org yvesago-guest at users.alioth.debian.org
Sun Jun 15 19:51:56 UTC 2008


Author: yvesago-guest
Date: Sun Jun 15 19:51:56 2008
New Revision: 21676

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=21676
Log:
* upgrade to new upstream 2.19 (Closes: #485441) (Closes: #485419)
* add me to uploaders
* Standards-Version: 3.8.0 (no changes)
* refresh rules with architecture independent rules
* debian/control: add libmodule-build-perl in Build-Depends
* debian/copyright: Proposals/CopyrightFormat rev=102, add Perl Group

Modified:
    trunk/libextutils-parsexs-perl/Changes
    trunk/libextutils-parsexs-perl/META.yml
    trunk/libextutils-parsexs-perl/debian/changelog
    trunk/libextutils-parsexs-perl/debian/control
    trunk/libextutils-parsexs-perl/debian/copyright
    trunk/libextutils-parsexs-perl/debian/rules
    trunk/libextutils-parsexs-perl/lib/ExtUtils/ParseXS.pm
    trunk/libextutils-parsexs-perl/t/XSTest.pm
    trunk/libextutils-parsexs-perl/t/XSTest.xs

Modified: trunk/libextutils-parsexs-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/Changes?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/Changes (original)
+++ trunk/libextutils-parsexs-perl/Changes Sun Jun 15 19:51:56 2008
@@ -1,4 +1,38 @@
 Revision history for Perl extension ExtUtils::ParseXS.
+
+ - Fixed the treatment of the OVERLOAD: keyword, which was causing a C
+   compile error. [Toshiyuki Yamato]
+
+2.18 - Mon Jan 29 20:56:36 2007
+
+ - Added some UNITCHECK stuff, which (I think) makes XS code able to
+   do UNITCHECK blocks. [Nicholas Clark]
+
+ - Changed 'use re "eval";' to 'BEGIN { $^H |= 0x00200000 };' so we
+   can compile re.xs in bleadperl. [Yves Orton]
+
+ - Fix an undefined-variable warning related to 'inout' parameter
+   processing.
+
+2.17 - Mon Nov 20 17:07:27 2006
+
+ - Stacked $filepathname to make #line directives in #INCLUDEs work.
+   [Nicholas Clark]
+
+ - Sprinked dVAR in with dXSARGS, for God-(Jarkko)-knows-what
+   reason. [Jarkko Hietaniemi]
+
+ - Use printf-style formats in Perl_croak() for some significant
+   savings in number of distinct constant strings in the linked
+   binaries we create. [Alexey Tourbin]
+
+ - Don't use 'class' as a variable name in the t/XSTest.xs module,
+   since that's a keyword in C++. [Jarkko Hietaniemi]
+
+2.16  Fri Sep 15 22:33:24 CDT 2006
+
+ - Fix a problem with PREFIX not working inside INTERFACE
+   sections. [Salvador Fandin~o]
 
 2.15  Mon Oct 10 11:02:13 EDT 2005
 

Modified: trunk/libextutils-parsexs-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/META.yml?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/META.yml (original)
+++ trunk/libextutils-parsexs-perl/META.yml Sun Jun 15 19:51:56 2008
@@ -1,8 +1,8 @@
---- #YAML:1.0
+---
 name: ExtUtils-ParseXS
-version: 2.15
+version: 2.19
 author:
-  - Maintained by Ken Williams, <ken at mathforum.org>
+  - 'Maintained by Ken Williams, <ken at mathforum.org>'
 abstract: converts Perl XS code into C code
 license: perl
 resources:
@@ -18,5 +18,8 @@
 provides:
   ExtUtils::ParseXS:
     file: lib/ExtUtils/ParseXS.pm
-    version: 2.15
-generated_by: Module::Build version 0.2702
+    version: 2.19
+generated_by: Module::Build version 0.2808
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2

Modified: trunk/libextutils-parsexs-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/debian/changelog?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/debian/changelog (original)
+++ trunk/libextutils-parsexs-perl/debian/changelog Sun Jun 15 19:51:56 2008
@@ -1,5 +1,6 @@
-libextutils-parsexs-perl (2.15-3) UNRELEASED; urgency=low
+libextutils-parsexs-perl (2.19-1) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * Take over for the Debian Perl Group with maintainer's permission
     (http://lists.debian.org/debian-perl/2008/06/msg00039.html)
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -10,7 +11,15 @@
     Uploaders.
   * Add debian/watch.
 
- -- gregor herrmann <gregoa at debian.org>  Sun, 15 Jun 2008 15:48:34 +0200
+  [ AGOSTINI Yves ]
+  * upgrade to new upstream 2.19 (Closes: #485441) (Closes: #485419)
+  * add me to uploaders
+  * Standards-Version: 3.8.0 (no changes)
+  * refresh rules with architecture independent rules
+  * debian/control: add libmodule-build-perl in Build-Depends
+  * debian/copyright: Proposals/CopyrightFormat rev=102, add Perl Group
+
+ -- AGOSTINI Yves <agostini at univ-metz.fr>  Sun, 15 Jun 2008 21:05:53 +0200
 
 libextutils-parsexs-perl (2.15-2) unstable; urgency=low
 

Modified: trunk/libextutils-parsexs-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/debian/control?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/debian/control (original)
+++ trunk/libextutils-parsexs-perl/debian/control Sun Jun 15 19:51:56 2008
@@ -1,11 +1,12 @@
 Source: libextutils-parsexs-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 5.0.0), libmodule-build-perl
 Build-Depends-Indep: perl (>= 5.8.0-7), libextutils-cbuilder-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Florian Ragwitz <rafl at debian.org>
-Standards-Version: 3.7.2
+Uploaders: Florian Ragwitz <rafl at debian.org>,
+ AGOSTINI Yves <agostini at univ-metz.fr>
+Standards-Version: 3.8.0
 Homepage: http://search.cpan.org/dist/ExtUtils-ParseXS/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libextutils-parsexs-perl/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/

Modified: trunk/libextutils-parsexs-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/debian/copyright?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/debian/copyright (original)
+++ trunk/libextutils-parsexs-perl/debian/copyright Sun Jun 15 19:51:56 2008
@@ -1,17 +1,26 @@
-This is the debian package for the ExtUtils::ParseXS module.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=102
+Debianized-By: AGOSTINI Yves <agostini at univ-metz.fr>
+Debianized-Date: Sun, 15 Jun 2008 21:41:06 +0200
+Original-Source-Location: http://search.cpan.org/dist/ExtUtils-ParseXS/
+Upstream-Author: Ken Williams, <ken at mathforum.org>
 
-Chip Salzenberg <chip at debian.org> created this Debian package using
-original sources found on the Comprehensive Perl Archive Network
-(CPAN) <URL:http://cpan.org/>.  The Debian Perl packaging tool
-"dh-make-perl" was of great help.
+Files: *
+Copyright: Copyright 2002-2003 Ken Williams. All rights reserved. 
+License: GPL-1+ | Artistic
+ This library is free software; you can redistribute it and/or modify it under
+ the same terms as Perl itself.
+ .
+ Based on the ExtUtils::xsubpp code by Larry Wall and the Perl 5 Porters, which
+ was released under the same license terms.
 
-It's now maintained by Florian Ragwitz <rafl at debian.org>
+Files: debian/*
+Copyright: Copyright 2003 - 2006 Chip Salzenberg <chip at debian.org>,
+ Copyright 2006 -2008  Florian Ragwitz <rafl at debian.org>,
+ Copyright 2008 Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+License: GPL-1+ | Artistic
+ The Debian packaging is put under the same terms as the module itself.
 
-Original code for ExtUtils::xsubpp script was written by Larry Wall.
-Adapted into ExtUtils::ParseXS module by Ken Williams, <ken at mathforum.org>.
-
-This package may be redistributed under the terms of either the GNU
-General Public License or the Artistic License.  On a Debian GNU/Linux
-systems, the complete text of these licenses may be found in the files
-/usr/share/common-licenses/{GPL,Artistic}.
-
+Perl is distributed under your choice of the GNU General Public License or
+the Artistic License.  On Debian GNU/Linux systems, the complete text of the
+GNU General Public License can be found in `/usr/share/common-licenses/GPL'
+and the Artistic Licence in `/usr/share/common-licenses/Artistic'.

Modified: trunk/libextutils-parsexs-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/debian/rules?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/debian/rules (original)
+++ trunk/libextutils-parsexs-perl/debian/rules Sun Jun 15 19:51:56 2008
@@ -1,57 +1,60 @@
 #!/usr/bin/make -f
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
+#
+# It was later modified by Jason Kohles <email at jasonkohles.com>
+# http://www.jasonkohles.com/ to support Module::Build installed modules
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP     =$(CURDIR)/debian/$(PACKAGE)
+PERL   ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor
-	$(MAKE)
-	touch build-stamp
+	$(PERL) Build.PL installdirs=vendor
+	$(PERL) Build
+	$(PERL) Build test
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	-$(MAKE) realclean
 	dh_clean build-stamp install-stamp
+	[ ! -f Build ] || $(PERL) Build --allow_mb_mismatch 1 distclean
 
-install: build install-stamp
-install-stamp:
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) test
-	$(MAKE) install DESTDIR=$(TMP)
-	touch install-stamp
+	$(PERL) Build install destdir=$(TMP) create_packlist=0
+	touch $@
 
-# Build architecture-independent files here.
+binary-arch:
+# We have nothing to do here for an architecture-independent package
+
 binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs 
+	dh_installdocs
 	dh_installchangelogs Changes
+	dh_perl
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl 
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+.PHONY: build clean binary-indep binary-arch binary install

Modified: trunk/libextutils-parsexs-perl/lib/ExtUtils/ParseXS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/lib/ExtUtils/ParseXS.pm?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/lib/ExtUtils/ParseXS.pm (original)
+++ trunk/libextutils-parsexs-perl/lib/ExtUtils/ParseXS.pm Sun Jun 15 19:51:56 2008
@@ -18,7 +18,7 @@
 my($XSS_work_idx, $cpp_next_tmp);
 
 use vars qw($VERSION);
-$VERSION = '2.15';
+$VERSION = '2.19';
 
 use vars qw(%input_expr %output_expr $ProtoUsed @InitFileCode $FH $proto_re $Overload $errors $Fallback
 	    $cplusplus $hiertype $WantPrototypes $WantVersionChk $except $WantLineNumbers
@@ -76,7 +76,7 @@
   $proto_re = "[" . quotemeta('\$%&*@;[]') . "]" ;
   $Overload = 0;
   $errors = 0;
-  $Fallback = 'PL_sv_undef';
+  $Fallback = '&PL_sv_undef';
 
   # Most of the 1500 lines below uses these globals.  We'll have to
   # clean this up sometime, probably.  For now, we just pull them out
@@ -203,7 +203,7 @@
   $size = qr[,\s* (??{ $bal }) ]x; # Third arg (to setpvn)
 
   foreach my $key (keys %output_expr) {
-    use re 'eval';
+    BEGIN { $^H |= 0x00200000 }; # Equivalent to: use re 'eval', but hardcoded so we can compile re.xs
 
     my ($t, $with_size, $arg, $sarg) =
       ($output_expr{$key} =~
@@ -456,7 +456,7 @@
 					     \b ( \w+ | length\( \s*\w+\s* \) )
 					     \s* $ /x);
 	  next unless defined($pre) && length($pre);
-	  my $out_type;
+	  my $out_type = '';
 	  my $inout_var;
 	  if ($process_inout and s/^(IN|IN_OUTLIST|OUTLIST|OUT|IN_OUT)\s+//) {
 	    my $type = $1;
@@ -565,7 +565,11 @@
 #XS(XS_${Full_func_name}); /* prototype to pass -Wmissing-prototypes */
 #XS(XS_${Full_func_name})
 #[[
+##ifdef dVAR
+#    dVAR; dXSARGS;
+##else
 #    dXSARGS;
+##endif
 EOF
     print Q(<<"EOF") if $ALIAS ;
 #    dXSI32;
@@ -589,12 +593,12 @@
     if ($ALIAS)
       { print Q(<<"EOF") if $cond }
 #    if ($cond)
-#       Perl_croak(aTHX_ "Usage: %s($report_args)", GvNAME(CvGV(cv)));
+#       Perl_croak(aTHX_ "Usage: %s(%s)", GvNAME(CvGV(cv)), "$report_args");
 EOF
     else
       { print Q(<<"EOF") if $cond }
 #    if ($cond)
-#	Perl_croak(aTHX_ "Usage: $pname($report_args)");
+#       Perl_croak(aTHX_ "Usage: %s(%s)", "$pname", "$report_args");
 EOF
     
      # cv doesn't seem to be used, in most cases unless we go in 
@@ -892,6 +896,7 @@
 #XS(XS_${Packid}_nil); /* prototype to pass -Wmissing-prototypes */
 #XS(XS_${Packid}_nil)
 #{
+#   dXSARGS;
 #   XSRETURN_EMPTY;
 #}
 #
@@ -919,7 +924,11 @@
 
   print Q(<<"EOF");
 #[[
+##ifdef dVAR
+#    dVAR; dXSARGS;
+##else
 #    dXSARGS;
+##endif
 EOF
 
   #-Wall: if there is no $Full_func_name there are no xsubs in this .xs
@@ -970,6 +979,13 @@
     @line = @BootCode;
     print_section();
     print "\n    /* End of Initialisation Section */\n\n" ;
+  }
+
+  if ($] >= 5.009) {
+    print <<'EOF';
+    if (PL_unitcheckav)
+         call_list(PL_scopestack_ix, PL_unitcheckav);
+EOF
   }
 
   print Q(<<"EOF");
@@ -1213,7 +1229,9 @@
   TrimWhitespace($in);
 
   foreach (split /[\s,]+/, $in) {
-    $Interfaces{$_} = $_;
+    my $name = $_;
+    $name =~ s/^$Prefix//;
+    $Interfaces{$name} = $_;
   }
   print Q(<<"EOF");
 #	XSFUNCTION = $interface_macro($ret_type,cv,XSANY.any_dptr);
@@ -1301,9 +1319,9 @@
   
   TrimWhitespace($_) ;
   my %map = (
-	     TRUE => "PL_sv_yes", 1 => "PL_sv_yes",
-	     FALSE => "PL_sv_no", 0 => "PL_sv_no",
-	     UNDEF => "PL_sv_undef",
+	     TRUE => "&PL_sv_yes", 1 => "&PL_sv_yes",
+	     FALSE => "&PL_sv_no", 0 => "&PL_sv_no",
+	     UNDEF => "&PL_sv_undef",
 	    ) ;
   
   # check for valid FALLBACK value
@@ -1438,6 +1456,7 @@
 		    Line            => \@line,
 		    LineNo          => \@line_no,
 		    Filename        => $filename,
+		    Filepathname    => $filepathname,
 		    Handle          => $FH,
 		   }) ;
 
@@ -1452,7 +1471,7 @@
 #
 EOF
 
-    $filename = $_ ;
+    $filepathname = $filename = $_ ;
 
     # Prime the pump by reading the first
     # non-blank line
@@ -1481,7 +1500,11 @@
     close $FH ;
 
     $FH         = $data->{Handle} ;
+    # $filename is the leafname, which for some reason isused for diagnostic
+    # messages, whereas $filepathname is the full pathname, and is used for
+    # #line directives.
     $filename   = $data->{Filename} ;
+    $filepathname = $data->{Filepathname} ;
     $lastline   = $data->{LastLine} ;
     $lastline_no = $data->{LastLineNo} ;
     @line       = @{ $data->{Line} } ;

Modified: trunk/libextutils-parsexs-perl/t/XSTest.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/t/XSTest.pm?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/t/XSTest.pm (original)
+++ trunk/libextutils-parsexs-perl/t/XSTest.pm Sun Jun 15 19:51:56 2008
@@ -5,4 +5,4 @@
 $VERSION = '0.01';
 bootstrap XSTest $VERSION;
 
-1;
+1;

Modified: trunk/libextutils-parsexs-perl/t/XSTest.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libextutils-parsexs-perl/t/XSTest.xs?rev=21676&op=diff
==============================================================================
--- trunk/libextutils-parsexs-perl/t/XSTest.xs (original)
+++ trunk/libextutils-parsexs-perl/t/XSTest.xs Sun Jun 15 19:51:56 2008
@@ -28,7 +28,7 @@
 	RETVAL
 
 void
-xstest_something (class, some_thing)
+xstest_something (myclass, some_thing)
 	char * some_thing
     C_ARGS:
 	some_thing
@@ -38,28 +38,28 @@
 	char * some_thing
 
 void
-xstest_something3 (class, some_thing)
-	SV   * class
+xstest_something3 (myclass, some_thing)
+	SV   * myclass
 	char * some_thing
     PREINIT:
     	int i = 0;
     PPCODE:
     	/* it's up to us clear these warnings */
-	class = class;
+	myclass = myclass;
 	some_thing = some_thing;
 	i = i;
 	XSRETURN_UNDEF;
 	
 int
-consts (class)
-	SV * class
+consts (myclass)
+	SV * myclass
     ALIAS:
 	const_one = 1
 	const_two = 2
 	const_three = 3
     CODE:
     	/* it's up to us clear these warnings */
-    	class = class;
+    	myclass = myclass;
 	ix = ix;
     	RETVAL = 1;
     OUTPUT:




More information about the Pkg-perl-cvs-commits mailing list