summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorSteffen Mueller <smueller@cpan.org>2011-08-21 22:07:50 +0200
committerSteffen Mueller <smueller@cpan.org>2011-08-25 09:27:01 +0200
commit71a65ad3b4b0678fcf5bd6ac3b7ad394accc8079 (patch)
tree7310b9eb7b836f9b5dd17e96ef38b9b2ff744398 /dist
parentd200626516823df5560289ae997a71aa97108896 (diff)
downloadperl-71a65ad3b4b0678fcf5bd6ac3b7ad394accc8079.tar.gz
ExtUtils::ParseXS: Explicitly require current version of submodules
Since there have been certain problems with parts of ExtUtils::ParseXS being shadowed by older installations of the module, this commit adds an explicit $VERSION to all submodules and requires them to have the same version as the main module. This doesn't actually fix any problem, but makes them more apparent as early as possible instead of failing with obscure compile errors when bad C is generated from the original XS.
Diffstat (limited to 'dist')
-rw-r--r--dist/ExtUtils-ParseXS/Changes3
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm14
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm2
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm3
-rw-r--r--dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm2
5 files changed, 20 insertions, 4 deletions
diff --git a/dist/ExtUtils-ParseXS/Changes b/dist/ExtUtils-ParseXS/Changes
index 97a815b497..3b8d8af4fb 100644
--- a/dist/ExtUtils-ParseXS/Changes
+++ b/dist/ExtUtils-ParseXS/Changes
@@ -1,5 +1,8 @@
Revision history for Perl extension ExtUtils::ParseXS.
+ - Explicit versions in submodules to fail early if something
+ goes wrong.
+
3.03_02 - Sun Aug 21 13:19:00 CET 2011
- Properly strip trailing semicolons form inputmaps. These could
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
index 0f9dbfc39a..42e777eff8 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
@@ -8,8 +8,16 @@ use Exporter;
use File::Basename;
use File::Spec;
use Symbol;
-use ExtUtils::ParseXS::Constants ();
-use ExtUtils::ParseXS::CountLines;
+
+our $VERSION;
+BEGIN {
+ $VERSION = '3.03_02';
+}
+use ExtUtils::ParseXS::Constants $VERSION;
+use ExtUtils::ParseXS::CountLines $VERSION;
+use ExtUtils::ParseXS::Utilities $VERSION;
+$VERSION = eval $VERSION if $VERSION =~ /_/;
+
use ExtUtils::ParseXS::Utilities qw(
standard_typemap_locations
trim_whitespace
@@ -35,8 +43,6 @@ our @EXPORT_OK = qw(
process_file
report_error_count
);
-our $VERSION = '3.03_02';
-$VERSION = eval $VERSION if $VERSION =~ /_/;
# The scalars in the line below remain as 'our' variables because pulling
# them into $self led to build problems. In most cases, strings being
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
index 3788dce930..748f7e2ba0 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
@@ -3,6 +3,8 @@ use strict;
use warnings;
use Symbol;
+our $VERSION = '3.03_02';
+
=head1 NAME
ExtUtils::ParseXS::Constants - Initialization values for some globals
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm
index d576c09637..ba82a3882f 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/CountLines.pm
@@ -1,5 +1,8 @@
package ExtUtils::ParseXS::CountLines;
use strict;
+
+our $VERSION = '3.03_02';
+
our $SECTION_END_MARKER;
sub TIEHANDLE {
diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
index 7ff73d3fa2..ef31f6ec77 100644
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
@@ -6,6 +6,8 @@ use File::Spec;
use lib qw( lib );
use ExtUtils::ParseXS::Constants ();
+our $VERSION = '3.03_02';
+
our (@ISA, @EXPORT_OK);
@ISA = qw(Exporter);
@EXPORT_OK = qw(