Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Version 2.35 from Alexandr Ciornii

git-svn-id: svn://axkit.org/XML-Parser/trunk@20 2154792d-645b-41ca-96ca-efebb8c93226
  • Loading branch information...
commit 35a72fecbe9f79a938b3353e2c4c53b5b2b46097 1 parent c5f86e4
Alexandr Ciornii authored November 16, 2007
6  Changes
... ...
@@ -1,5 +1,11 @@
1 1
 Revision history for Perl extension XML::Parser.
2 2
 
  3
+2.35
  4
+    - Works in 5.10 (Andreas J. Koenig)
  5
+    - Added license in Makefile.PL (Alexandr Ciornii)
  6
+    - Makefile.PL also searches for expat in C:/lib/Expat-2.0.0 (Alexandr Ciornii)
  7
+    - No longer uses variable named 'namespace' in Expat.xs (Jeff Hunter)
  8
+
3 9
 2.33
4 10
     - Fixed Tree style (grantm)
5 11
     - Fixed some non-utf8 stuff in DTDs (patch in XML::DOM tarball)
2  Expat/Expat.pm
@@ -10,7 +10,7 @@ use Carp;
10 10
 require DynaLoader;
11 11
 
12 12
 @ISA = qw(DynaLoader);
13  
-$VERSION = "2.34" ;
  13
+$VERSION = "2.35" ;
14 14
 
15 15
 $have_File_Spec = $INC{'File/Spec.pm'} || do 'File/Spec.pm';
16 16
 
6  Expat/Expat.xs
@@ -1877,9 +1877,9 @@ XML_PositionContext(parser, lines)
1877 1877
 	  PUSHs(sv_2mortal(newSViv(relpos)));
1878 1878
 
1879 1879
 SV *
1880  
-GenerateNSName(name, namespace, table, list)
  1880
+GenerateNSName(name, xml_namespace, table, list)
1881 1881
 	SV *				name
1882  
-	SV *				namespace
  1882
+	SV *				xml_namespace
1883 1883
 	SV *				table
1884 1884
 	SV *				list
1885 1885
     CODE:
@@ -1892,7 +1892,7 @@ GenerateNSName(name, namespace, table, list)
1892 1892
 	  char *	blim;
1893 1893
 
1894 1894
 	  nmstr = SvPV(name, nmlen);
1895  
-	  nsstr = SvPV(namespace, nslen);
  1895
+	  nsstr = SvPV(xml_namespace, nslen);
1896 1896
 
1897 1897
 	  /* Form a namespace-name string that looks like expat's */
1898 1898
 	  New(321, buff, nmlen + nslen + 2, char);
2  Expat/Makefile.PL
@@ -19,7 +19,7 @@ push(@extras,
19 19
 push(@extras,
20 20
      ABSTRACT => "Lowlevel access to James Clark's expat XML parser",
21 21
      AUTHOR        => 'Clark Cooper (coopercc@netheaven.com)')
22  
-    if ($ExtUtils::MakeMaker::Version >= 5.4301);
  22
+    if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
23 23
      
24 24
 WriteMakefile(
25 25
               NAME	=> 'XML::Parser::Expat',
1  MANIFEST
@@ -57,3 +57,4 @@ t/partial.t                     Test script
57 57
 t/skip.t                        Test script
58 58
 t/stream.t                      Test script
59 59
 t/styles.t                      Test script
  60
+META.yml                                 Module meta-data (added by MakeMaker)
24  Makefile.PL
... ...
@@ -1,3 +1,4 @@
  1
+use 5.004;
1 2
 use ExtUtils::MakeMaker;
2 3
 use Config;
3 4
 
@@ -21,8 +22,7 @@ foreach (@ARGV) {
21 22
 }
22 23
 
23 24
 @ARGV = @replacement_args;
24  
-
25  
-if (not $expat_libpath and $] >= 5.006001) {
  25
+if (not $expat_libpath and $] >= 5.006001 and $^O ne 'MSWin32') {
26 26
   require ExtUtils::Liblist;		# Buggy before this
27 27
   ($expat_libpath) = ExtUtils::Liblist->ext('-lexpat');
28 28
 }
@@ -37,6 +37,15 @@ unless ($expat_libpath) {
37 37
     }
38 38
   }
39 39
 
  40
+  if (!$found and $^O eq 'MSWin32') {
  41
+    if (-f 'C:/lib/Expat-2.0.0/Libs/libexpat.dll') {
  42
+      $expat_libpath = 'C:/lib/Expat-2.0.0/Libs';
  43
+      $expat_incpath = 'C:/lib/Expat-2.0.0/Source/lib';
  44
+      $found = 1;
  45
+    }
  46
+
  47
+  }
  48
+
40 49
   unless ($found) {
41 50
     die <<'Expat_Not_Installed;';
42 51
 
@@ -86,13 +95,20 @@ push(@extras,
86 95
 push(@extras,
87 96
      ABSTRACT_FROM => 'Parser.pm',
88 97
      AUTHOR        => 'Clark Cooper (coopercc@netheaven.com)')
89  
-    if ($ExtUtils::MakeMaker::Version >= 5.4301);
90  
-     
  98
+    if ($ExtUtils::MakeMaker::VERSION >= 5.4301);
  99
+
  100
+push(@extras,
  101
+     LICENSE => 'perl')
  102
+    if ($ExtUtils::MakeMaker::VERSION gt '6.30');
  103
+
91 104
 WriteMakefile(
92 105
               NAME	=> 'XML::Parser',
93 106
 	      DIR	=> [qw(Expat)],
94 107
               dist      => {COMPRESS => 'gzip', SUFFIX => '.gz'},
95 108
               VERSION_FROM => 'Parser.pm',
  109
+              PREREQ_PM    => {
  110
+                LWP => 0, #for tests
  111
+              },
96 112
 	      @extras
97 113
              );
98 114
 
2  Parser.pm
@@ -12,7 +12,7 @@ use Carp;
12 12
 
13 13
 BEGIN {
14 14
   require XML::Parser::Expat;
15  
-  $VERSION = '2.34';
  15
+  $VERSION = '2.35';
16 16
   die "Parser.pm and Expat.pm versions don't match"
17 17
     unless $VERSION eq $XML::Parser::Expat::VERSION;
18 18
 }

0 notes on commit 35a72fe

Please sign in to comment.
Something went wrong with that request. Please try again.