r25473 - in /branches/upstream/libxml-sablot-perl/current: MANIFEST META.yml Makefile.PL Processor/Processor.h Sablotron.pm t/dom.t

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Fri Sep 19 22:12:13 UTC 2008


Author: gregoa
Date: Fri Sep 19 22:12:11 2008
New Revision: 25473

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=25473
Log:
[svn-upgrade] Integrating new upstream version, libxml-sablot-perl (1.01)

Added:
    branches/upstream/libxml-sablot-perl/current/META.yml
Modified:
    branches/upstream/libxml-sablot-perl/current/MANIFEST
    branches/upstream/libxml-sablot-perl/current/Makefile.PL
    branches/upstream/libxml-sablot-perl/current/Processor/Processor.h
    branches/upstream/libxml-sablot-perl/current/Sablotron.pm
    branches/upstream/libxml-sablot-perl/current/t/dom.t

Modified: branches/upstream/libxml-sablot-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-sablot-perl/current/MANIFEST?rev=25473&op=diff
==============================================================================
--- branches/upstream/libxml-sablot-perl/current/MANIFEST (original)
+++ branches/upstream/libxml-sablot-perl/current/MANIFEST Fri Sep 19 22:12:11 2008
@@ -33,3 +33,4 @@
 t/dom.t
 t/domHandler.t
 t/sablot.t
+META.yml                                 Module meta-data (added by MakeMaker)

Added: branches/upstream/libxml-sablot-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-sablot-perl/current/META.yml?rev=25473&op=file
==============================================================================
--- branches/upstream/libxml-sablot-perl/current/META.yml (added)
+++ branches/upstream/libxml-sablot-perl/current/META.yml Fri Sep 19 22:12:11 2008
@@ -1,0 +1,10 @@
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+name:         XML-Sablotron
+version:      1.01
+version_from: Sablotron.pm
+installdirs:  site
+requires:
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.17

Modified: branches/upstream/libxml-sablot-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-sablot-perl/current/Makefile.PL?rev=25473&op=diff
==============================================================================
--- branches/upstream/libxml-sablot-perl/current/Makefile.PL (original)
+++ branches/upstream/libxml-sablot-perl/current/Makefile.PL Fri Sep 19 22:12:11 2008
@@ -65,12 +65,18 @@
 unless ($expat_libpath) {
   # Test for existence of libexpat
   my $found = 0;
+ if ($] >= 5.008001) {
+    require ExtUtils::Liblist;		# Buggy before this
+    my ($list) = ExtUtils::Liblist->ext('-lexpat');
+    $found = 1 if $list =~ /-lexpat\b/;
+ } else {
   foreach (split(/\s+/, $Config{libpth})) {
     if (-f "$_/libexpat." . $Config{so}) {
       $found = 1;
       last;
     }
   }
+ }
 
   unless ($found) {
       die <<'Expat_Not_Installed;';
@@ -122,12 +128,18 @@
 unless ($sablot_libpath) {
   # Test for existence of libexpat
   my $found = 0;
+ if ($] >= 5.008001) {
+    require ExtUtils::Liblist;		# Buggy before this
+    my ($list) = ExtUtils::Liblist->ext('-lsablot');
+    $found = 1 if $list =~ /-lsablot\b/;
+ } else {
   foreach (split(/\s+/, $Config{libpth})) {
     if (-f "$_/libsablot." . $Config{so}) {
       $found = 1;
       last;
     }
   }
+ }
 
   unless ($found) {
     die <<'Sablot_Not_Installed;';
@@ -177,12 +189,18 @@
 my $js_found = undef;
 unless ($js_libpath) {
     # Test for existence of libexpat
+ if ($] >= 5.008001) {
+    require ExtUtils::Liblist;		# Buggy before this
+    my ($list) = ExtUtils::Liblist->ext("-l$js_libname");
+    $js_found = 1 if $list =~ /-l\Q$js_libname\E\b/;
+ } else {
     foreach (split(/\s+/, $Config{libpth})) {
 	if (-f "$_/lib$js_libname." . $Config{so}) {
 	    $js_found = 1;
 	    last;
 	}
     }
+ }
 }
 
 our $libs = ' ';
@@ -225,7 +243,7 @@
 }
 @ARGV = @replacement_args;
 
-my $O_FILES = 'common.o';
+my $O_FILES = "common$Config{obj_ext}";
 
 WriteMakefile(
 	      NAME	=> 'XML::Sablotron',
@@ -238,8 +256,8 @@
 	      DIR       => [qw( DOM Situation SXP Processor )],
 	      LIBS      => $libs, 
 	      OBJECT	=> q( $(O_FILES) ),
-              OPTIMIZE  => ' ',
-     CCFLAGS => '-g',
+#              OPTIMIZE  => ' ',
+#     CCFLAGS => '-g',
 	      depend => { 'Sablotron.c' => q(DOM/DOM.h DOM/DOM.xsh Processor/Processor.h Processor/Processor.xsh Processor/Handler_stubs.h SXP/SXP.h SXP/SXP.xsh Situation/Situation.h Situation/Situation.xsh Situation/DOMhandler_stubs.h ) },
 	      @extras,
 );

Modified: branches/upstream/libxml-sablot-perl/current/Processor/Processor.h
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-sablot-perl/current/Processor/Processor.h?rev=25473&op=diff
==============================================================================
--- branches/upstream/libxml-sablot-perl/current/Processor/Processor.h (original)
+++ branches/upstream/libxml-sablot-perl/current/Processor/Processor.h Fri Sep 19 22:12:11 2008
@@ -397,7 +397,7 @@
     else
       XPUSHs(&sv_undef);
     XPUSHs((SV*)handle);
-    XPUSHs(sv_2mortal(newSViv(*byteCount - 1)));
+    XPUSHs(sv_2mortal(newSViv(*byteCount)));
     PUTBACK;
 
     perl_call_sv((SV*)GvCV(gv), G_SCALAR);
@@ -409,7 +409,7 @@
       char *aux;
       aux = SvPV(value, len);
       *byteCount = len < *byteCount ? len : *byteCount;
-      strncpy(buffer, aux, *byteCount + 1);
+      strncpy(buffer, aux, *byteCount);
     } else {
       *byteCount = 0;
     }

Modified: branches/upstream/libxml-sablot-perl/current/Sablotron.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-sablot-perl/current/Sablotron.pm?rev=25473&op=diff
==============================================================================
--- branches/upstream/libxml-sablot-perl/current/Sablotron.pm (original)
+++ branches/upstream/libxml-sablot-perl/current/Sablotron.pm Fri Sep 19 22:12:11 2008
@@ -47,7 +47,7 @@
 
 @ISA = qw( Exporter DynaLoader );
 
-$VERSION = '1.0';
+$VERSION = '1.01';
 
 my @functions = qw (
 SablotProcessStrings 

Modified: branches/upstream/libxml-sablot-perl/current/t/dom.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libxml-sablot-perl/current/t/dom.t?rev=25473&op=diff
==============================================================================
--- branches/upstream/libxml-sablot-perl/current/t/dom.t (original)
+++ branches/upstream/libxml-sablot-perl/current/t/dom.t Fri Sep 19 22:12:11 2008
@@ -313,6 +313,7 @@
 $e->appendChild($doc->createElementNS("uri_a","a:name"));
 print ($e->lastChild()->nodeName() eq "a:name" ? "ok $test\n" : "not ok $test\n");
 
+
 # test namespaceURI
 $test++;
 print ($e->lastChild()->namespaceURI() eq "uri_a" ? "ok $test\n" : "not ok $test\n");
@@ -430,7 +431,7 @@
 
 
 # cleanup code
-print $doc->toString($sit), "\n";
+#print $doc->toString($sit), "\n";
 $doc->freeDocument();
 undef $doc;
 undef $doc1;




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