You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by lo...@apache.org on 2012/01/18 06:52:31 UTC
[lucy-commits] svn commit: r1232752 - /incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
Author: logie
Date: Wed Jan 18 05:52:31 2012
New Revision: 1232752
URL: http://svn.apache.org/viewvc?rev=1232752&view=rev
Log:
LUCY-208
Removed the usage of Module::Build - instead using require.
Modified:
incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1232752&r1=1232751&r2=1232752&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm Wed Jan 18 05:52:31 2012
@@ -222,7 +222,6 @@ sub _compile_clownfish {
require Clownfish::CFC::Hierarchy;
require Clownfish::CFC::Binding::Perl;
require Clownfish::CFC::Binding::Perl::Class;
- use Module::Load;
# Compile Clownfish.
my $hierarchy = Clownfish::CFC::Hierarchy->new(
@@ -236,7 +235,7 @@ sub _compile_clownfish {
my @pm_filepaths_with_xs;
for my $pm_filepath (@$pm_filepaths) {
next unless $pm_filepath =~ /Binding/;
- load $pm_filepath;
+ require $pm_filepath;
my $package_name = $pm_filepath;
$package_name =~ s/buildlib\/(Lucy.*)\.pm$/$1/;
$package_name =~ s/\//::/g;
@@ -402,6 +401,7 @@ sub ACTION_suppressions {
$suppressions =~ s/^==.*?\n//mg;
$suppressions =~ s/^--.*?\n//mg;
my $rule_number = 1;
+
while ( $suppressions =~ /<insert.a.*?>/ ) {
$suppressions =~ s/^\s*<insert.a.*?>/{\n <core_perl_$rule_number>/m;
$rule_number++;