Permalink
Browse files

Version 2.35 from Alexandr Ciornii

git-svn-id: svn://axkit.org/XML-Parser/trunk@20 2154792d-645b-41ca-96ca-efebb8c93226
  • Loading branch information...
1 parent c5f86e4 commit 35a72fecbe9f79a938b3353e2c4c53b5b2b46097 @chorny committed Nov 16, 2007
Showing with 33 additions and 10 deletions.
  1. +6 −0 Changes
  2. +1 −1 Expat/Expat.pm
  3. +3 −3 Expat/Expat.xs
  4. +1 −1 Expat/Makefile.PL
  5. +1 −0 MANIFEST
  6. +20 −4 Makefile.PL
  7. +1 −1 Parser.pm
View
@@ -1,5 +1,11 @@
Revision history for Perl extension XML::Parser.
+2.35
+ - Works in 5.10 (Andreas J. Koenig)
+ - Added license in Makefile.PL (Alexandr Ciornii)
+ - Makefile.PL also searches for expat in C:/lib/Expat-2.0.0 (Alexandr Ciornii)
+ - No longer uses variable named 'namespace' in Expat.xs (Jeff Hunter)
+
2.33
- Fixed Tree style (grantm)
- Fixed some non-utf8 stuff in DTDs (patch in XML::DOM tarball)
View
@@ -10,7 +10,7 @@ use Carp;
require DynaLoader;
@ISA = qw(DynaLoader);
-$VERSION = "2.34" ;
+$VERSION = "2.35" ;
$have_File_Spec = $INC{'File/Spec.pm'} || do 'File/Spec.pm';
View
@@ -1877,9 +1877,9 @@ XML_PositionContext(parser, lines)
PUSHs(sv_2mortal(newSViv(relpos)));
SV *
-GenerateNSName(name, namespace, table, list)
+GenerateNSName(name, xml_namespace, table, list)
SV * name
- SV * namespace
+ SV * xml_namespace
SV * table
SV * list
CODE:
@@ -1892,7 +1892,7 @@ GenerateNSName(name, namespace, table, list)
char * blim;
nmstr = SvPV(name, nmlen);
- nsstr = SvPV(namespace, nslen);
+ nsstr = SvPV(xml_namespace, nslen);
/* Form a namespace-name string that looks like expat's */
New(321, buff, nmlen + nslen + 2, char);
View
@@ -19,7 +19,7 @@ push(@extras,
push(@extras,
ABSTRACT => "Lowlevel access to James Clark's expat XML parser",
AUTHOR => 'Clark Cooper (coopercc@netheaven.com)')
- if ($ExtUtils::MakeMaker::Version >= 5.4301);
+ if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
WriteMakefile(
NAME => 'XML::Parser::Expat',
View
@@ -57,3 +57,4 @@ t/partial.t Test script
t/skip.t Test script
t/stream.t Test script
t/styles.t Test script
+META.yml Module meta-data (added by MakeMaker)
View
@@ -1,3 +1,4 @@
+use 5.004;
use ExtUtils::MakeMaker;
use Config;
@@ -21,8 +22,7 @@ foreach (@ARGV) {
}
@ARGV = @replacement_args;
-
-if (not $expat_libpath and $] >= 5.006001) {
+if (not $expat_libpath and $] >= 5.006001 and $^O ne 'MSWin32') {
require ExtUtils::Liblist; # Buggy before this
($expat_libpath) = ExtUtils::Liblist->ext('-lexpat');
}
@@ -37,6 +37,15 @@ unless ($expat_libpath) {
}
}
+ if (!$found and $^O eq 'MSWin32') {
+ if (-f 'C:/lib/Expat-2.0.0/Libs/libexpat.dll') {
+ $expat_libpath = 'C:/lib/Expat-2.0.0/Libs';
+ $expat_incpath = 'C:/lib/Expat-2.0.0/Source/lib';
+ $found = 1;
+ }
+
+ }
+
unless ($found) {
die <<'Expat_Not_Installed;';
@@ -86,13 +95,20 @@ push(@extras,
push(@extras,
ABSTRACT_FROM => 'Parser.pm',
AUTHOR => 'Clark Cooper (coopercc@netheaven.com)')
- if ($ExtUtils::MakeMaker::Version >= 5.4301);
-
+ if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
+
+push(@extras,
+ LICENSE => 'perl')
+ if ($ExtUtils::MakeMaker::VERSION gt '6.30');
+
WriteMakefile(
NAME => 'XML::Parser',
DIR => [qw(Expat)],
dist => {COMPRESS => 'gzip', SUFFIX => '.gz'},
VERSION_FROM => 'Parser.pm',
+ PREREQ_PM => {
+ LWP => 0, #for tests
+ },
@extras
);
View
@@ -12,7 +12,7 @@ use Carp;
BEGIN {
require XML::Parser::Expat;
- $VERSION = '2.34';
+ $VERSION = '2.35';
die "Parser.pm and Expat.pm versions don't match"
unless $VERSION eq $XML::Parser::Expat::VERSION;
}

0 comments on commit 35a72fe

Please sign in to comment.