You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/07/01 06:44:53 UTC
[lucy-commits] svn commit: r1141796 - in /incubator/lucy/branches/0.1: ./
devel/bin/update_version perl/lib/Lucy.pm
Author: marvin
Date: Fri Jul 1 04:44:53 2011
New Revision: 1141796
URL: http://svn.apache.org/viewvc?rev=1141796&view=rev
Log:
LUCY-153 XSLoader version string mismatch
Fix bug where a version string was missed by update_version, causing older
XSLoader calls to fail.
(Merge changeset 1126586 to 0.1 branch.)
Modified:
incubator/lucy/branches/0.1/ (props changed)
incubator/lucy/branches/0.1/devel/bin/update_version
incubator/lucy/branches/0.1/perl/lib/Lucy.pm
Propchange: incubator/lucy/branches/0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 1 04:44:53 2011
@@ -1 +1 @@
-/incubator/lucy/trunk:1134011,1134355,1134472,1134843-1134848,1134953,1134956
+/incubator/lucy/trunk:1126586,1134011,1134355,1134472,1134843-1134848,1134953,1134956
Modified: incubator/lucy/branches/0.1/devel/bin/update_version
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/devel/bin/update_version?rev=1141796&r1=1141795&r2=1141796&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/devel/bin/update_version (original)
+++ incubator/lucy/branches/0.1/devel/bin/update_version Fri Jul 1 04:44:53 2011
@@ -49,6 +49,8 @@ my $buf;
$buf = read_file('perl/lib/Lucy.pm');
$buf =~ s/(our \$VERSION\ +=\ +)'.+?'/$1'$x_yyyzzz_version'/
or die "no match";
+$buf =~ s/XSLoader::load\( 'Lucy', '(.+?)'/XSLoader::load\( 'Lucy', '$x_yyyzzz_version'/
+ or die "no match";
write_file( 'perl/lib/Lucy.pm', $buf );
$buf = read_file('perl/lib/Lucy.pod');
$buf =~ s/(^=head1\s+VERSION\s+)([\d.]+)/$1$x_y_z_version/m
Modified: incubator/lucy/branches/0.1/perl/lib/Lucy.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/0.1/perl/lib/Lucy.pm?rev=1141796&r1=1141795&r2=1141796&view=diff
==============================================================================
--- incubator/lucy/branches/0.1/perl/lib/Lucy.pm (original)
+++ incubator/lucy/branches/0.1/perl/lib/Lucy.pm Fri Jul 1 04:44:53 2011
@@ -26,7 +26,7 @@ $VERSION = eval $VERSION;
use XSLoader;
# This loads a large number of disparate subs.
-BEGIN { XSLoader::load( 'Lucy', '0.001' ) }
+BEGIN { XSLoader::load( 'Lucy', '0.001000' ) }
BEGIN {
push our @ISA, 'Exporter';