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 2009/12/10 19:50:59 UTC
svn commit: r889364 - in /lucene/lucy/trunk/perl: buildlib/Lucy/ lib/
lib/Lucy/ lib/Lucy/Object/ lib/Lucy/Store/ lib/Lucy/Util/
Author: marvin
Date: Thu Dec 10 18:50:57 2009
New Revision: 889364
URL: http://svn.apache.org/viewvc?rev=889364&view=rev
Log:
Change Perl bindings over from using Boilerplater to Clownfish.
(perl_bind_to_clownfish.diff from LUCY-86)
Modified:
lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm
lucene/lucy/trunk/perl/lib/Lucy.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/BitVector.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/ByteBuf.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/Err.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/Hash.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/Obj.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/VArray.pm
lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/FSFolder.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/FileHandle.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/Folder.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/InStream.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/OutStream.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFile.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFileHandle.pm
lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFolder.pm
lucene/lucy/trunk/perl/lib/Lucy/Test.pm
lucene/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm
lucene/lucy/trunk/perl/lib/Lucy/Util/PriorityQueue.pm
Modified: lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ lucene/lucy/trunk/perl/buildlib/Lucy/Build.pm Thu Dec 10 18:50:57 2009
@@ -1,8 +1,8 @@
use strict;
use warnings;
-use lib '../boilerplater/lib';
-use lib 'boilerplater/lib';
+use lib '../clownfish/lib';
+use lib 'clownfish/lib';
package Lucy::Build::CBuilder;
BEGIN { our @ISA = "ExtUtils::CBuilder"; }
@@ -198,15 +198,15 @@
}
}
-sub _compile_boilerplater {
+sub _compile_clownfish {
my $self = shift;
- require Boilerplater::Hierarchy;
- require Boilerplater::Binding::Perl;
- require Boilerplater::Binding::Perl::Class;
+ require Clownfish::Hierarchy;
+ require Clownfish::Binding::Perl;
+ require Clownfish::Binding::Perl::Class;
- # Compile Boilerplater.
- my $hierarchy = Boilerplater::Hierarchy->new(
+ # Compile Clownfish.
+ my $hierarchy = Clownfish::Hierarchy->new(
source => $CORE_SOURCE_DIR,
dest => $AUTOGEN_DIR,
);
@@ -228,7 +228,7 @@
}
}
- my $binding = Boilerplater::Binding::Perl->new(
+ my $binding = Clownfish::Binding::Perl->new(
parcel => 'Lucy',
hierarchy => $hierarchy,
lib_dir => 'lib',
@@ -245,7 +245,7 @@
sub _write_pod {
my ( $self, $binding ) = @_;
if ( !$binding ) {
- ( undef, $binding ) = $self->_compile_boilerplater;
+ ( undef, $binding ) = $self->_compile_clownfish;
}
my $pod_files = $binding->prepare_pod( lib_dir => 'lib' );
while ( my ( $filepath, $pod ) = each %$pod_files ) {
@@ -258,7 +258,7 @@
}
}
-sub ACTION_boilerplater {
+sub ACTION_clownfish {
my $self = shift;
my $xs_filepath = $self->xs_filepath;
@@ -273,7 +273,7 @@
my $pm_filepaths = $self->rscan_dir( 'lib', qr/\.pm$/ );
my $bp_filepaths = $self->rscan_dir( $CORE_SOURCE_DIR, qr/\.bp$/ );
- # Don't bother parsing Boilerplater files if everything's up to date.
+ # Don't bother parsing Clownfish files if everything's up to date.
return
if $self->up_to_date(
[ @$bp_filepaths, @$pm_filepaths ],
@@ -282,9 +282,9 @@
# Write out all autogenerated files.
my ( $hierarchy, $perl_binding, $pm_filepaths_with_xs )
- = $self->_compile_boilerplater;
- require Boilerplater::Binding::Core;
- my $core_binding = Boilerplater::Binding::Core->new(
+ = $self->_compile_clownfish;
+ require Clownfish::Binding::Core;
+ my $core_binding = Clownfish::Binding::Core->new(
hierarchy => $hierarchy,
dest => $AUTOGEN_DIR,
header => $self->autogen_header,
@@ -539,7 +539,7 @@
sub ACTION_code {
my $self = shift;
- $self->dispatch('boilerplater');
+ $self->dispatch('clownfish');
$self->dispatch('compile_custom_xs');
$self->SUPER::ACTION_code;
Modified: lucene/lucy/trunk/perl/lib/Lucy.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy.pm Thu Dec 10 18:50:57 2009
@@ -283,13 +283,13 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Util::Toolset",
xs_code => $toolset_xs_code,
);
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy",
xs_code => $lucy_xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/BitVector.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/BitVector.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/BitVector.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/BitVector.pm Thu Dec 10 18:50:57 2009
@@ -20,7 +20,7 @@
);
END_CONSTRUCTOR
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::BitVector",
bind_methods => [
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/ByteBuf.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/ByteBuf.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/ByteBuf.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/ByteBuf.pm Thu Dec 10 18:50:57 2009
@@ -34,7 +34,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::ByteBuf",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm Thu Dec 10 18:50:57 2009
@@ -65,7 +65,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::CharBuf",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/Err.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/Err.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/Err.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/Err.pm Thu Dec 10 18:50:57 2009
@@ -6,7 +6,7 @@
__BINDING__
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::Err",
bind_methods => [qw( Cat_Mess Get_Mess )],
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/Hash.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/Hash.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/Hash.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/Hash.pm Thu Dec 10 18:50:57 2009
@@ -59,7 +59,7 @@
}
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::Hash",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/I32Array.pm Thu Dec 10 18:50:57 2009
@@ -68,7 +68,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::I32Array",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/Obj.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/Obj.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/Obj.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/Obj.pm Thu Dec 10 18:50:57 2009
@@ -105,7 +105,7 @@
Lucy_Obj_Destroy(self);
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::Obj",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/VArray.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/VArray.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/VArray.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/VArray.pm Thu Dec 10 18:50:57 2009
@@ -74,7 +74,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::VArray",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Object/VTable.pm Thu Dec 10 18:50:57 2009
@@ -18,7 +18,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Object::VTable",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/FSFolder.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/FSFolder.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/FSFolder.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/FSFolder.pm Thu Dec 10 18:50:57 2009
@@ -6,7 +6,7 @@
__BINDING__
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::FSFolder",
bind_constructors => ["new"],
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/FileHandle.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/FileHandle.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/FileHandle.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/FileHandle.pm Thu Dec 10 18:50:57 2009
@@ -41,7 +41,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::FileHandle",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/Folder.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/Folder.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/Folder.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/Folder.pm Thu Dec 10 18:50:57 2009
@@ -6,7 +6,7 @@
__BINDING__
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::Folder",
bind_methods => [
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/InStream.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/InStream.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/InStream.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/InStream.pm Thu Dec 10 18:50:57 2009
@@ -63,7 +63,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::InStream",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/OutStream.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/OutStream.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/OutStream.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/OutStream.pm Thu Dec 10 18:50:57 2009
@@ -40,7 +40,7 @@
$outstream->write_u64($file_position);
END_SYNOPSIS
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::OutStream",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFile.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFile.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFile.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFile.pm Thu Dec 10 18:50:57 2009
@@ -6,7 +6,7 @@
__BINDING__
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::RAMFile",
bind_methods => [qw( Get_Contents )],
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFileHandle.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFileHandle.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFileHandle.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFileHandle.pm Thu Dec 10 18:50:57 2009
@@ -6,7 +6,7 @@
__BINDING__
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::RAMFileHandle",
bind_methods => [qw( Get_File )],
Modified: lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFolder.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFolder.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFolder.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Store/RAMFolder.pm Thu Dec 10 18:50:57 2009
@@ -21,7 +21,7 @@
);
END_CONSTRUCTOR
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Store::RAMFolder",
bind_constructors => ["new"],
Modified: lucene/lucy/trunk/perl/lib/Lucy/Test.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Test.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Test.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Test.pm Thu Dec 10 18:50:57 2009
@@ -139,13 +139,13 @@
}
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Test",
xs_code => $xs_code,
);
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Test::TestCharmonizer",
xs_code => $charm_xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Util/IndexFileNames.pm Thu Dec 10 18:50:57 2009
@@ -28,7 +28,7 @@
OUTPUT: RETVAL
END_XS_CODE
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Util::IndexFileNames",
xs_code => $xs_code,
Modified: lucene/lucy/trunk/perl/lib/Lucy/Util/PriorityQueue.pm
URL: http://svn.apache.org/viewvc/lucene/lucy/trunk/perl/lib/Lucy/Util/PriorityQueue.pm?rev=889364&r1=889363&r2=889364&view=diff
==============================================================================
--- lucene/lucy/trunk/perl/lib/Lucy/Util/PriorityQueue.pm (original)
+++ lucene/lucy/trunk/perl/lib/Lucy/Util/PriorityQueue.pm Thu Dec 10 18:50:57 2009
@@ -6,7 +6,7 @@
__BINDING__
-Boilerplater::Binding::Perl::Class->register(
+Clownfish::Binding::Perl::Class->register(
parcel => "Lucy",
class_name => "Lucy::Util::PriorityQueue",
bind_methods => [